From 58b74f576bce1e33b82446dfc90da5fcd6f64096 Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Fri, 8 Dec 2023 15:12:14 -0500 Subject: [PATCH 1/3] shadow tests --- .gitignore | 5 +++-- shadow-tests | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) create mode 160000 shadow-tests diff --git a/.gitignore b/.gitignore index 975b8bd8..09b48f18 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -/target -perf* \ No newline at end of file +perf* +**/shadow.data/ +**/target/ \ No newline at end of file diff --git a/shadow-tests b/shadow-tests new file mode 160000 index 00000000..ba223422 --- /dev/null +++ b/shadow-tests @@ -0,0 +1 @@ +Subproject commit ba223422743ee3d2ec1fd069670c57c7e911cba3 From df0bfadc81709af6b60100909c0203729a3c0da8 Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Sat, 9 Dec 2023 10:32:19 -0500 Subject: [PATCH 2/3] shadow tests --- Cargo.lock | 526 +++++++++++++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 11 +- 2 files changed, 510 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee89287a..2219c825 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,6 +209,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "async-dup" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c2886ab563af5038f79ec016dd7b87947ed138b794e8dd64992962c9cca0411" +dependencies = [ + "async-lock 3.1.1", + "futures-io", +] + [[package]] name = "async-event" version = "0.1.0" @@ -275,7 +285,7 @@ dependencies = [ "polling 2.8.0", "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", ] @@ -328,6 +338,18 @@ dependencies = [ "event-listener 2.5.3", ] +[[package]] +name = "async-native-tls" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe" +dependencies = [ + "futures-util", + "native-tls", + "thiserror", + "url", +] + [[package]] name = "async-net" version = "1.8.0" @@ -766,32 +788,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "bitflags 1.3.2", - "textwrap", + "textwrap 0.11.0", "unicode-width", ] [[package]] name = "clap" -version = "4.4.8" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "atty", + "bitflags 1.3.2", + "clap_derive 3.2.25", + "clap_lex 0.2.4", + "indexmap 1.9.3", + "once_cell", + "strsim", + "termcolor", + "textwrap 0.16.0", +] + +[[package]] +name = "clap" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", - "clap_derive", + "clap_derive 4.4.7", ] [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", - "clap_lex", + "clap_lex 0.6.0", "strsim", ] +[[package]] +name = "clap_derive" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "clap_derive" version = "4.4.7" @@ -804,6 +856,15 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "clap_lex" version = "0.6.0" @@ -846,6 +907,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -1187,7 +1258,7 @@ dependencies = [ "blake3", "bytemuck", "bytes", - "clap 4.4.8", + "clap 4.4.11", "clone-macro", "concurrent-queue 2.3.0", "dashmap", @@ -1201,7 +1272,7 @@ dependencies = [ "itertools 0.11.0", "log", "lru 0.12.0", - "moka", + "moka 0.12.1", "moro", "nanorpc", "nanorpc-http", @@ -1218,7 +1289,7 @@ dependencies = [ "smol-timeout", "smolscale", "socksv5", - "sosistab2", + "sosistab2 0.10.18", "sosistab2-obfsudp", "stdcode", "thiserror", @@ -1424,6 +1495,30 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + [[package]] name = "funty" version = "2.0.0" @@ -1570,6 +1665,34 @@ dependencies = [ "slab", ] +[[package]] +name = "gen-earendil-shadow" +version = "0.1.0" +dependencies = [ + "anyhow", + "bip39", + "blake3", + "clap 4.4.11", + "earendil_crypt", + "hex", + "rand 0.8.5", + "serde", + "serde_json", + "serde_with 3.4.0", + "serde_yaml", + "sosistab2 0.9.11", + "stdcode", +] + +[[package]] +name = "gen-topo" +version = "0.1.0" +dependencies = [ + "clap 4.4.11", + "petname", + "rand 0.8.5", +] + [[package]] name = "generator" version = "0.7.5" @@ -1801,6 +1924,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -1964,6 +2097,15 @@ dependencies = [ "hashbrown 0.12.3", ] +[[package]] +name = "lru" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +dependencies = [ + "hashbrown 0.12.3", +] + [[package]] name = "lru" version = "0.12.0" @@ -2024,6 +2166,29 @@ dependencies = [ "adler", ] +[[package]] +name = "moka" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28455ac4363046076054a7e9cfbd7f168019c29dba32a625f59fc0aeffaaea4" +dependencies = [ + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "num_cpus", + "once_cell", + "parking_lot 0.12.1", + "quanta", + "rustc_version", + "scheduled-thread-pool", + "skeptic", + "smallvec", + "tagptr", + "thiserror", + "triomphe", + "uuid", +] + [[package]] name = "moka" version = "0.12.1" @@ -2110,6 +2275,24 @@ dependencies = [ "smol", ] +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2166,6 +2349,66 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.0+3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1ebed1d188c4cd64c2bcd73d6c1fe1092f3d98c111831923cc1b706c3859fca" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + [[package]] name = "overload" version = "0.1.1" @@ -2243,6 +2486,23 @@ dependencies = [ "subtle", ] +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "petname" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce4164d60963550beb856b011fdf32b03b0e8bc0c3fce023c7b0ccecddf7950" +dependencies = [ + "clap 3.2.25", + "itertools 0.10.5", + "rand 0.8.5", +] + [[package]] name = "pin-project" version = "1.1.3" @@ -2292,6 +2552,12 @@ dependencies = [ "futures-io", ] +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + [[package]] name = "platforms" version = "3.2.0" @@ -2400,14 +2666,48 @@ dependencies = [ "indexmap 1.9.3", ] +[[package]] +name = "probability" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01935a29f0dd293b7d0254144168084cc8ada317b107635c777fb7d0fb5120e5" +dependencies = [ + "random 0.12.2", + "special 0.8.1", +] + [[package]] name = "probability" version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42746b805e424b759d46c22c65dc66ccca057a2db96e9db4fda6c337a287e485" dependencies = [ - "random", - "special", + "random 0.13.2", + "special 0.10.2", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", ] [[package]] @@ -2532,6 +2832,12 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "random" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d13a3485349981c90c79112a11222c3e6e75de1d52b87a7525b3bf5361420f" + [[package]] name = "random" version = "0.13.2" @@ -2763,6 +3069,24 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "scheduled-thread-pool" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" +dependencies = [ + "parking_lot 0.12.1", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -2775,6 +3099,29 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "semver" version = "1.0.20" @@ -2953,6 +3300,17 @@ dependencies = [ "autocfg", ] +[[package]] +name = "sluice" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" +dependencies = [ + "async-channel 1.9.0", + "futures-core", + "futures-io", +] + [[package]] name = "smallvec" version = "1.11.2" @@ -2986,6 +3344,15 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "smol_str" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" +dependencies = [ + "serde", +] + [[package]] name = "smolscale" version = "0.4.1" @@ -3026,6 +3393,17 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "socket2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" +dependencies = [ + "cfg-if", + "libc", + "winapi", +] + [[package]] name = "socket2" version = "0.4.10" @@ -3047,6 +3425,68 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sosistab2" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0df197a1df5e933e861f59762be138ded208859d415727b8fe43f8d2d8e8e1ce" +dependencies = [ + "ahash 0.8.6", + "anyhow", + "arc-swap", + "arrayref", + "async-dup", + "async-event", + "async-native-tls", + "async-trait", + "blake3", + "bytes", + "cached", + "concurrent-queue 1.2.4", + "dashmap", + "derivative", + "diatomic-waker", + "event-listener 2.5.3", + "fastrand 1.9.0", + "futures-intrusive 0.5.0", + "futures-util", + "hex", + "indexmap 1.9.3", + "itertools 0.10.5", + "log", + "lru 0.8.1", + "moka 0.9.9", + "native-tls", + "num_cpus", + "once_cell", + "parking_lot 0.12.1", + "pin-project", + "priority-queue", + "probability 0.17.0", + "rand 0.7.3", + "rand_chacha 0.2.2", + "recycle-box", + "reed-solomon-erasure", + "replay_filter", + "ring 0.16.20", + "scopeguard", + "serde", + "slab", + "sluice", + "smallvec", + "smol", + "smol-timeout", + "smol_str", + "smolscale", + "socket2 0.3.19", + "stdcode", + "subtle", + "tachyonix", + "thiserror", + "tracing", + "x25519-dalek 1.1.1", +] + [[package]] name = "sosistab2" version = "0.10.18" @@ -3113,11 +3553,11 @@ dependencies = [ "itertools 0.11.0", "log", "lru 0.12.0", - "moka", + "moka 0.12.1", "once_cell", "parking_lot 0.12.1", "priority-queue", - "probability", + "probability 0.20.3", "rand 0.7.3", "reed-solomon-erasure", "replay_filter", @@ -3127,11 +3567,20 @@ dependencies = [ "smol", "smol-timeout", "smolscale", - "sosistab2", + "sosistab2 0.10.18", "stdcode", "x25519-dalek 1.1.1", ] +[[package]] +name = "special" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24a65e074159b75dcf173a4733ab2188baac24967b5c8ec9ed87ae15fcbc7636" +dependencies = [ + "libc", +] + [[package]] name = "special" version = "0.10.2" @@ -3245,6 +3694,19 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "tachyonix" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e0bf82be3359dbefbfea621d6365db00e1d7846561daad2ea74cc4cb4c9604" +dependencies = [ + "async-event", + "crossbeam-utils", + "diatomic-waker", + "futures-core", + "loom", +] + [[package]] name = "tagptr" version = "0.2.0" @@ -3288,6 +3750,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + [[package]] name = "thiserror" version = "1.0.50" @@ -3388,6 +3856,7 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite 0.2.13", "tracing-attributes", "tracing-core", @@ -3466,7 +3935,7 @@ name = "udp-spammer" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.4.8", + "clap 4.4.11", "smol", "smolscale", ] @@ -3480,6 +3949,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + [[package]] name = "unicode-ident" version = "1.0.12" @@ -3535,6 +4010,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + [[package]] name = "utf8parse" version = "0.2.1" @@ -3556,6 +4042,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 7b40ad6d..ed385148 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,11 @@ [workspace] -members = ["libraries/*", "utilities/*"] +members = ["libraries/*", "utilities/*", "shadow-tests/gen-earendil-shadow", "shadow-tests/gen-topo"] [package] name = "earendil" version = "0.0.1" edition = "2021" -# [lib] -# name = "earendil" -# path = "src/lib.rs" - -# [[bin]] -# name = "earendil" -# path = "src/main.rs" - - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From a2e99edf1cb690f302ef1f0286bd64f2c9f778b3 Mon Sep 17 00:00:00 2001 From: thisbefruit Date: Sun, 10 Dec 2023 16:08:09 -0500 Subject: [PATCH 3/3] removed shadow-tests programs from earendil workspace --- Cargo.lock | 514 +--------------------------- Cargo.toml | 2 +- src/daemon/control_protocol_impl.rs | 2 +- 3 files changed, 13 insertions(+), 505 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2219c825..27f934a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,16 +209,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "async-dup" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2886ab563af5038f79ec016dd7b87947ed138b794e8dd64992962c9cca0411" -dependencies = [ - "async-lock 3.1.1", - "futures-io", -] - [[package]] name = "async-event" version = "0.1.0" @@ -285,7 +275,7 @@ dependencies = [ "polling 2.8.0", "rustix 0.37.27", "slab", - "socket2 0.4.10", + "socket2", "waker-fn", ] @@ -338,18 +328,6 @@ dependencies = [ "event-listener 2.5.3", ] -[[package]] -name = "async-native-tls" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57d4cec3c647232e1094dc013546c0b33ce785d8aeb251e1f20dfaf8a9a13fe" -dependencies = [ - "futures-util", - "native-tls", - "thiserror", - "url", -] - [[package]] name = "async-net" version = "1.8.0" @@ -788,27 +766,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "bitflags 1.3.2", - "textwrap 0.11.0", + "textwrap", "unicode-width", ] -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive 3.2.25", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", - "textwrap 0.16.0", -] - [[package]] name = "clap" version = "4.4.11" @@ -816,7 +777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive", ] [[package]] @@ -827,23 +788,10 @@ checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", + "clap_lex", "strsim", ] -[[package]] -name = "clap_derive" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "clap_derive" version = "4.4.7" @@ -856,15 +804,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "clap_lex" version = "0.6.0" @@ -907,16 +846,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -1272,7 +1201,7 @@ dependencies = [ "itertools 0.11.0", "log", "lru 0.12.0", - "moka 0.12.1", + "moka", "moro", "nanorpc", "nanorpc-http", @@ -1289,7 +1218,7 @@ dependencies = [ "smol-timeout", "smolscale", "socksv5", - "sosistab2 0.10.18", + "sosistab2", "sosistab2-obfsudp", "stdcode", "thiserror", @@ -1495,30 +1424,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - [[package]] name = "funty" version = "2.0.0" @@ -1665,34 +1570,6 @@ dependencies = [ "slab", ] -[[package]] -name = "gen-earendil-shadow" -version = "0.1.0" -dependencies = [ - "anyhow", - "bip39", - "blake3", - "clap 4.4.11", - "earendil_crypt", - "hex", - "rand 0.8.5", - "serde", - "serde_json", - "serde_with 3.4.0", - "serde_yaml", - "sosistab2 0.9.11", - "stdcode", -] - -[[package]] -name = "gen-topo" -version = "0.1.0" -dependencies = [ - "clap 4.4.11", - "petname", - "rand 0.8.5", -] - [[package]] name = "generator" version = "0.7.5" @@ -1924,16 +1801,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -2097,15 +1964,6 @@ dependencies = [ "hashbrown 0.12.3", ] -[[package]] -name = "lru" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" -dependencies = [ - "hashbrown 0.12.3", -] - [[package]] name = "lru" version = "0.12.0" @@ -2166,29 +2024,6 @@ dependencies = [ "adler", ] -[[package]] -name = "moka" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28455ac4363046076054a7e9cfbd7f168019c29dba32a625f59fc0aeffaaea4" -dependencies = [ - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "num_cpus", - "once_cell", - "parking_lot 0.12.1", - "quanta", - "rustc_version", - "scheduled-thread-pool", - "skeptic", - "smallvec", - "tagptr", - "thiserror", - "triomphe", - "uuid", -] - [[package]] name = "moka" version = "0.12.1" @@ -2275,24 +2110,6 @@ dependencies = [ "smol", ] -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2349,66 +2166,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "openssl" -version = "0.10.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.2.0+3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ebed1d188c4cd64c2bcd73d6c1fe1092f3d98c111831923cc1b706c3859fca" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.97" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "overload" version = "0.1.1" @@ -2486,23 +2243,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petname" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce4164d60963550beb856b011fdf32b03b0e8bc0c3fce023c7b0ccecddf7950" -dependencies = [ - "clap 3.2.25", - "itertools 0.10.5", - "rand 0.8.5", -] - [[package]] name = "pin-project" version = "1.1.3" @@ -2552,12 +2292,6 @@ dependencies = [ "futures-io", ] -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - [[package]] name = "platforms" version = "3.2.0" @@ -2666,48 +2400,14 @@ dependencies = [ "indexmap 1.9.3", ] -[[package]] -name = "probability" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01935a29f0dd293b7d0254144168084cc8ada317b107635c777fb7d0fb5120e5" -dependencies = [ - "random 0.12.2", - "special 0.8.1", -] - [[package]] name = "probability" version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42746b805e424b759d46c22c65dc66ccca057a2db96e9db4fda6c337a287e485" dependencies = [ - "random 0.13.2", - "special 0.10.2", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "random", + "special", ] [[package]] @@ -2832,12 +2532,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "random" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d13a3485349981c90c79112a11222c3e6e75de1d52b87a7525b3bf5361420f" - [[package]] name = "random" version = "0.13.2" @@ -3069,24 +2763,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" -dependencies = [ - "parking_lot 0.12.1", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -3099,29 +2775,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "1.0.20" @@ -3300,17 +2953,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "sluice" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" -dependencies = [ - "async-channel 1.9.0", - "futures-core", - "futures-io", -] - [[package]] name = "smallvec" version = "1.11.2" @@ -3344,15 +2986,6 @@ dependencies = [ "pin-project-lite 0.1.12", ] -[[package]] -name = "smol_str" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad6c857cbab2627dcf01ec85a623ca4e7dcb5691cbaa3d7fb7653671f0d09c9" -dependencies = [ - "serde", -] - [[package]] name = "smolscale" version = "0.4.1" @@ -3393,17 +3026,6 @@ dependencies = [ "waker-fn", ] -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if", - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.4.10" @@ -3425,68 +3047,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sosistab2" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df197a1df5e933e861f59762be138ded208859d415727b8fe43f8d2d8e8e1ce" -dependencies = [ - "ahash 0.8.6", - "anyhow", - "arc-swap", - "arrayref", - "async-dup", - "async-event", - "async-native-tls", - "async-trait", - "blake3", - "bytes", - "cached", - "concurrent-queue 1.2.4", - "dashmap", - "derivative", - "diatomic-waker", - "event-listener 2.5.3", - "fastrand 1.9.0", - "futures-intrusive 0.5.0", - "futures-util", - "hex", - "indexmap 1.9.3", - "itertools 0.10.5", - "log", - "lru 0.8.1", - "moka 0.9.9", - "native-tls", - "num_cpus", - "once_cell", - "parking_lot 0.12.1", - "pin-project", - "priority-queue", - "probability 0.17.0", - "rand 0.7.3", - "rand_chacha 0.2.2", - "recycle-box", - "reed-solomon-erasure", - "replay_filter", - "ring 0.16.20", - "scopeguard", - "serde", - "slab", - "sluice", - "smallvec", - "smol", - "smol-timeout", - "smol_str", - "smolscale", - "socket2 0.3.19", - "stdcode", - "subtle", - "tachyonix", - "thiserror", - "tracing", - "x25519-dalek 1.1.1", -] - [[package]] name = "sosistab2" version = "0.10.18" @@ -3553,11 +3113,11 @@ dependencies = [ "itertools 0.11.0", "log", "lru 0.12.0", - "moka 0.12.1", + "moka", "once_cell", "parking_lot 0.12.1", "priority-queue", - "probability 0.20.3", + "probability", "rand 0.7.3", "reed-solomon-erasure", "replay_filter", @@ -3567,20 +3127,11 @@ dependencies = [ "smol", "smol-timeout", "smolscale", - "sosistab2 0.10.18", + "sosistab2", "stdcode", "x25519-dalek 1.1.1", ] -[[package]] -name = "special" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a65e074159b75dcf173a4733ab2188baac24967b5c8ec9ed87ae15fcbc7636" -dependencies = [ - "libc", -] - [[package]] name = "special" version = "0.10.2" @@ -3694,19 +3245,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "tachyonix" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e0bf82be3359dbefbfea621d6365db00e1d7846561daad2ea74cc4cb4c9604" -dependencies = [ - "async-event", - "crossbeam-utils", - "diatomic-waker", - "futures-core", - "loom", -] - [[package]] name = "tagptr" version = "0.2.0" @@ -3750,12 +3288,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.50" @@ -3856,7 +3388,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite 0.2.13", "tracing-attributes", "tracing-core", @@ -3949,12 +3480,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "unicode-bidi" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" - [[package]] name = "unicode-ident" version = "1.0.12" @@ -4010,17 +3535,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - [[package]] name = "utf8parse" version = "0.2.1" @@ -4042,12 +3556,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index ed385148..c4359cf3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["libraries/*", "utilities/*", "shadow-tests/gen-earendil-shadow", "shadow-tests/gen-topo"] +members = ["libraries/*", "utilities/*"] [package] name = "earendil" diff --git a/src/daemon/control_protocol_impl.rs b/src/daemon/control_protocol_impl.rs index 1b3b7589..485030e2 100644 --- a/src/daemon/control_protocol_impl.rs +++ b/src/daemon/control_protocol_impl.rs @@ -1,4 +1,4 @@ -use std::{collections::BTreeMap, str::Chars, sync::Arc, time::Duration}; +use std::{collections::BTreeMap, sync::Arc, time::Duration}; use async_trait::async_trait; use bytes::Bytes;