cleaned project structure

This commit is contained in:
17ms 2023-05-01 01:40:14 +03:00
parent db388dc013
commit be7ac79ab1
8 changed files with 4 additions and 122 deletions

116
Cargo.lock generated
View File

@ -144,7 +144,6 @@ version = "0.3.0"
dependencies = [ dependencies = [
"aes-gcm", "aes-gcm",
"base64 0.21.0", "base64 0.21.0",
"inquire",
"ntest", "ntest",
"rand", "rand",
"sha256", "sha256",
@ -172,31 +171,6 @@ dependencies = [
"cfg-if", "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]] [[package]]
name = "crypto-common" name = "crypto-common"
version = "0.1.6" version = "0.1.6"
@ -239,12 +213,6 @@ dependencies = [
"generic-array", "generic-array",
] ]
[[package]]
name = "dyn-clone"
version = "1.0.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
[[package]] [[package]]
name = "flate2" name = "flate2"
version = "1.0.25" version = "1.0.25"
@ -362,22 +330,6 @@ dependencies = [
"generic-array", "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]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.61" version = "0.3.61"
@ -387,12 +339,6 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.140" version = "0.2.140"
@ -445,15 +391,6 @@ dependencies = [
"windows-sys", "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]] [[package]]
name = "ntest" name = "ntest"
version = "0.8.1" version = "0.8.1"
@ -723,27 +660,6 @@ dependencies = [
"sha2", "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]] [[package]]
name = "signal-hook-registry" name = "signal-hook-registry"
version = "1.4.1" version = "1.4.1"
@ -803,26 +719,6 @@ dependencies = [
"unicode-ident", "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]] [[package]]
name = "tinyvec" name = "tinyvec"
version = "1.6.0" version = "1.6.0"
@ -936,18 +832,6 @@ dependencies = [
"tinyvec", "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]] [[package]]
name = "universal-hash" name = "universal-hash"
version = "0.5.0" version = "0.5.0"

View File

@ -13,7 +13,6 @@ x25519-dalek = "1.2.0"
aes-gcm = "0.10.1" aes-gcm = "0.10.1"
base64 = "0.21.0" base64 = "0.21.0"
sha256 = "1.1.2" sha256 = "1.1.2"
inquire = "0.6.1"
ureq = "2.6.2" ureq = "2.6.2"
[dev-dependencies] [dev-dependencies]

View File

@ -1,4 +1,4 @@
use super::crypto; use crate::crypto;
use aes_gcm::{aead::consts::U12, aes::Aes256, AesGcm}; use aes_gcm::{aead::consts::U12, aes::Aes256, AesGcm};
use rand::rngs::OsRng; use rand::rngs::OsRng;
use std::{collections::HashMap, error::Error, net::SocketAddr, path::PathBuf}; use std::{collections::HashMap, error::Error, net::SocketAddr, path::PathBuf};

View File

@ -1,4 +1,4 @@
use super::{ use crate::{
common::{Connection, Message}, common::{Connection, Message},
comms, crypto, comms, crypto,
}; };

1
src/error.rs Normal file
View File

@ -0,0 +1 @@
// placeholder

View File

@ -1 +0,0 @@
// placeholder for now

View File

@ -2,5 +2,4 @@ pub mod common;
pub mod comms; pub mod comms;
pub mod connector; pub mod connector;
pub mod crypto; pub mod crypto;
pub mod gui;
pub mod listener; pub mod listener;

View File

@ -1,4 +1,4 @@
use super::{ use crate::{
common::{Connection, Message}, common::{Connection, Message},
comms, crypto, comms, crypto,
}; };