diff --git a/Cargo.lock b/Cargo.lock index c9ec836..1b8424a 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,7 +144,6 @@ version = "0.3.0" dependencies = [ "aes-gcm", "base64 0.21.0", - "inquire", "ntest", "rand", "sha256", @@ -172,31 +171,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" -dependencies = [ - "winapi", -] - [[package]] name = "crypto-common" version = "0.1.6" @@ -239,12 +213,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "dyn-clone" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" - [[package]] name = "flate2" version = "1.0.25" @@ -362,22 +330,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "inquire" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4bf420bd01f298a3ed8f57af9babedb296b4edfc1dbd8b159cee883aa90edaa" -dependencies = [ - "bitflags", - "crossterm", - "dyn-clone", - "lazy_static", - "newline-converter", - "thiserror", - "unicode-segmentation", - "unicode-width", -] - [[package]] name = "js-sys" version = "0.3.61" @@ -387,12 +339,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - [[package]] name = "libc" version = "0.2.140" @@ -445,15 +391,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "newline-converter" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "ntest" version = "0.8.1" @@ -723,27 +660,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -803,26 +719,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.12", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -936,18 +832,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "universal-hash" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index 2023b80..661d060 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ x25519-dalek = "1.2.0" aes-gcm = "0.10.1" base64 = "0.21.0" sha256 = "1.1.2" -inquire = "0.6.1" ureq = "2.6.2" [dev-dependencies] diff --git a/src/common.rs b/src/common.rs index 5c90d00..f3beeea 100644 --- a/src/common.rs +++ b/src/common.rs @@ -1,4 +1,4 @@ -use super::crypto; +use crate::crypto; use aes_gcm::{aead::consts::U12, aes::Aes256, AesGcm}; use rand::rngs::OsRng; use std::{collections::HashMap, error::Error, net::SocketAddr, path::PathBuf}; diff --git a/src/connector.rs b/src/connector.rs index fe36d16..01ff126 100755 --- a/src/connector.rs +++ b/src/connector.rs @@ -1,4 +1,4 @@ -use super::{ +use crate::{ common::{Connection, Message}, comms, crypto, }; diff --git a/src/error.rs b/src/error.rs new file mode 100644 index 0000000..ff7bd09 --- /dev/null +++ b/src/error.rs @@ -0,0 +1 @@ +// placeholder diff --git a/src/gui.rs b/src/gui.rs deleted file mode 100644 index 55b1071..0000000 --- a/src/gui.rs +++ /dev/null @@ -1 +0,0 @@ -// placeholder for now diff --git a/src/lib.rs b/src/lib.rs index 46bf991..d6d8481 100755 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,5 +2,4 @@ pub mod common; pub mod comms; pub mod connector; pub mod crypto; -pub mod gui; pub mod listener; diff --git a/src/listener.rs b/src/listener.rs index 64f94d8..7fc3899 100755 --- a/src/listener.rs +++ b/src/listener.rs @@ -1,4 +1,4 @@ -use super::{ +use crate::{ common::{Connection, Message}, comms, crypto, };