From d173e70afc5fee0c24ee8b8441bf41ac2b9b4fca Mon Sep 17 00:00:00 2001 From: Ryan Daum Date: Sat, 10 Feb 2024 09:39:03 -0500 Subject: [PATCH] Dependency pruning and rationalization Pruned out unused/stale dependencies. Alphabetized. Moved things into dev-dependencies that were mistakenly in dependencies. Moved db test code around. --- Cargo.lock | 166 -------------------------- Cargo.toml | 4 +- crates/compiler/Cargo.toml | 4 +- crates/console-host/Cargo.toml | 12 +- crates/daemon/Cargo.toml | 10 +- crates/db/Cargo.toml | 9 +- crates/db/benches/tb_single_thread.rs | 5 +- crates/db/src/lib.rs | 3 - crates/db/src/testing/jepsen.rs | 51 -------- crates/db/src/testing/mod.rs | 17 --- crates/db/tests/jepsen.rs | 29 +---- crates/db/tests/rdb_restore.rs | 4 +- crates/db/tests/test-support.rs | 60 ++++++++++ crates/db/tests/worldstate_restore.rs | 15 ++- crates/kernel/Cargo.toml | 4 +- crates/rpc-sync-client/Cargo.toml | 3 +- crates/telnet-host/Cargo.toml | 10 +- crates/values/Cargo.toml | 1 - crates/web-host/Cargo.toml | 10 +- 19 files changed, 98 insertions(+), 319 deletions(-) delete mode 100644 crates/db/src/testing/jepsen.rs delete mode 100644 crates/db/src/testing/mod.rs create mode 100644 crates/db/tests/test-support.rs diff --git a/Cargo.lock b/Cargo.lock index 1d92ee976..9ae2f9d53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,21 +38,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - [[package]] name = "allocator-api2" version = "0.2.16" @@ -143,22 +128,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", - "zstd", - "zstd-safe", -] - [[package]] name = "async-trait" version = "0.1.77" @@ -389,27 +358,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - [[package]] name = "bumpalo" version = "3.14.0" @@ -669,15 +617,6 @@ dependencies = [ "rustc_version", ] -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - [[package]] name = "criterion" version = "0.5.1" @@ -1017,12 +956,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "fast-counter" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf000f5d36bbfe94dd055f7fc5ec15e67cc674fd867a109b1c56577c37d8234" - [[package]] name = "fastrand" version = "2.0.1" @@ -1046,16 +979,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "flume" version = "0.11.0" @@ -1682,22 +1605,16 @@ dependencies = [ name = "moor-console-host" version = "0.1.0" dependencies = [ - "async-trait", "bincode", "clap", "clap_derive", "color-eyre", "eyre", - "futures", - "futures-util", - "itertools 0.12.1", "moor-values", "rpc-common", "rpc-sync-client", "rustyline", - "strum", "tracing", - "tracing-chrome", "tracing-subscriber", "uuid", "zmq", @@ -1708,15 +1625,11 @@ name = "moor-daemon" version = "0.1.0" dependencies = [ "bincode", - "chrono", "clap", "clap_derive", "color-eyre", "ed25519-dalek", "eyre", - "futures", - "futures-util", - "itertools 0.12.1", "moor-db", "moor-kernel", "moor-values", @@ -1727,9 +1640,7 @@ dependencies = [ "serde", "serde_json", "strum", - "tower-http", "tracing", - "tracing-chrome", "tracing-subscriber", "uuid", "zmq", @@ -1744,16 +1655,13 @@ dependencies = [ "binary-layout", "bincode", "criterion", - "fast-counter", "hi_sparse_bitset", "human_bytes", "im", "io-uring", "kanal", - "lazy_static", "libc", "moor-values", - "num-traits", "okaywal", "rand", "serde", @@ -1771,7 +1679,6 @@ name = "moor-kernel" version = "0.1.0" dependencies = [ "bincode", - "bytes", "chrono", "chrono-tz", "criterion", @@ -1779,7 +1686,6 @@ dependencies = [ "decorum", "iana-time-zone", "inventory", - "itertools 0.12.1", "kanal", "lazy_static", "libc", @@ -1808,7 +1714,6 @@ dependencies = [ name = "moor-telnet-host" version = "0.1.0" dependencies = [ - "async-trait", "bincode", "clap", "clap_derive", @@ -1816,7 +1721,6 @@ dependencies = [ "eyre", "futures", "futures-util", - "itertools 0.12.1", "moor-values", "rpc-async-client", "rpc-common", @@ -1824,9 +1728,7 @@ dependencies = [ "tmq", "tokio", "tokio-util", - "tower-http", "tracing", - "tracing-chrome", "tracing-subscriber", "uuid", ] @@ -1835,7 +1737,6 @@ dependencies = [ name = "moor-values" version = "0.1.0" dependencies = [ - "async-trait", "binary-layout", "bincode", "bytes", @@ -1855,7 +1756,6 @@ dependencies = [ name = "moor-web-host" version = "0.1.0" dependencies = [ - "async-trait", "axum", "axum-extra", "bincode", @@ -1863,9 +1763,7 @@ dependencies = [ "clap_derive", "color-eyre", "eyre", - "futures", "futures-util", - "itertools 0.12.1", "moor-values", "rpc-async-client", "rpc-common", @@ -1878,7 +1776,6 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "tracing-chrome", "tracing-subscriber", "uuid", ] @@ -2462,7 +2359,6 @@ name = "rpc-sync-client" version = "0.1.0" dependencies = [ "bincode", - "futures-util", "rpc-common", "thiserror", "tracing", @@ -3157,29 +3053,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e" -dependencies = [ - "async-compression", - "base64 0.21.7", - "bitflags 2.4.2", - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-layer" version = "0.3.2" @@ -3215,17 +3088,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "tracing-chrome" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496b3cd5447f7ff527bbbf19b071ad542a000adf297d4127078b4dfdb931f41a" -dependencies = [ - "serde_json", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -3882,31 +3744,3 @@ dependencies = [ "system-deps", "zeromq-src", ] - -[[package]] -name = "zstd" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/Cargo.toml b/Cargo.toml index c4038fdf8..1ba5835e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,6 @@ serde_json = "1.0.113" tower-http = { version = "0.5.1", features = ["add-extension", "auth", "compression-full", "trace"] } ## Asynchronous transaction processing & networking -async-trait = "0.1.77" futures = "0.3.30" futures-util = { version = "0.3.30", features = ["sink", "std"] } tokio = { version = "1.36.0", features = ["full"] } @@ -49,7 +48,6 @@ zmq = "0.10.0" ## Logging & tracing tracing = "0.1.40" -tracing-chrome = "0.7.1" tracing-subscriber = "0.3.18" tracing-test = "0.2.4" @@ -90,8 +88,8 @@ pest = "2.7.7" pest_derive = "2.7.7" ## Error declaration/ handling -eyre = "0.6.12" color-eyre = "0.6.2" +eyre = "0.6.12" thiserror = "1.0.56" ## For macro-ing diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml index 3362634de..99edb0970 100644 --- a/crates/compiler/Cargo.toml +++ b/crates/compiler/Cargo.toml @@ -8,9 +8,10 @@ authors.workspace = true rust-version.workspace = true [dev-dependencies] +pretty_assertions.workspace = true test-case.workspace = true +tracing-test.workspace = true unindent.workspace = true -pretty_assertions.workspace = true [dependencies] @@ -31,6 +32,5 @@ pest_derive.workspace = true thiserror.workspace = true ## Logging & tracing -tracing-test.workspace = true tracing.workspace = true diff --git a/crates/console-host/Cargo.toml b/crates/console-host/Cargo.toml index c45386b30..99b7666a7 100644 --- a/crates/console-host/Cargo.toml +++ b/crates/console-host/Cargo.toml @@ -15,25 +15,19 @@ rpc-sync-client = { path = "../rpc-sync-client" } ## Command line arguments parsing. clap.workspace = true clap_derive.workspace = true -strum.workspace = true # General. -eyre.workspace = true -color-eyre.workspace = true -async-trait.workspace = true bincode.workspace = true -futures-util.workspace = true -futures.workspace = true +color-eyre.workspace = true +eyre.workspace = true ## Logging & tracing -tracing-chrome.workspace = true tracing-subscriber.workspace = true tracing.workspace = true ## ZMQ / RPC -itertools.workspace = true -zmq.workspace = true uuid.workspace = true +zmq.workspace = true ## For console rustyline.workspace = true diff --git a/crates/daemon/Cargo.toml b/crates/daemon/Cargo.toml index 32f87919a..3bb7e08e0 100644 --- a/crates/daemon/Cargo.toml +++ b/crates/daemon/Cargo.toml @@ -19,21 +19,15 @@ clap_derive.workspace = true strum.workspace = true # General. -eyre.workspace = true -color-eyre.workspace = true bincode.workspace = true -futures-util.workspace = true -futures.workspace = true -tower-http.workspace = true +color-eyre.workspace = true +eyre.workspace = true ## Logging & tracing -tracing-chrome.workspace = true tracing-subscriber.workspace = true tracing.workspace = true ## RPC daemon support -chrono.workspace = true -itertools.workspace = true serde.workspace = true serde_json.workspace = true uuid.workspace = true diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml index bd56f227b..c40918194 100644 --- a/crates/db/Cargo.toml +++ b/crates/db/Cargo.toml @@ -17,6 +17,7 @@ rand.workspace = true serde.workspace = true serde_json.workspace = true tempfile.workspace = true +tracing-test.workspace = true [dependencies] ## Own @@ -24,7 +25,6 @@ moor-values = { path = "../values" } ## General usefullness human_bytes.workspace = true -lazy_static.workspace = true strum.workspace = true uuid.workspace = true @@ -32,7 +32,6 @@ uuid.workspace = true thiserror.workspace = true ## Logging & tracing -tracing-test.workspace = true tracing.workspace = true # For the DB layer. @@ -40,15 +39,9 @@ arc-swap.workspace = true atomic-wait.workspace = true binary-layout.workspace = true bincode.workspace = true -fast-counter.workspace = true hi_sparse_bitset.workspace = true im.workspace = true io-uring.workspace = true kanal.workspace = true libc.workspace = true -num-traits.workspace = true okaywal.workspace = true - -# For testing & benching common bits -serde.workspace = true -serde_json.workspace = true diff --git a/crates/db/benches/tb_single_thread.rs b/crates/db/benches/tb_single_thread.rs index ffb0ec18c..0cc363009 100644 --- a/crates/db/benches/tb_single_thread.rs +++ b/crates/db/benches/tb_single_thread.rs @@ -17,16 +17,19 @@ use criterion::{black_box, criterion_group, criterion_main, Criterion}; use moor_db::rdb::{RelBox, RelationInfo}; -use moor_db::testing::jepsen::{History, Type, Value}; use moor_values::util::SliceRef; use std::rc::Rc; use std::sync::Arc; use std::time::{Duration, Instant}; // This is a struct that tells Criterion.rs to use the "futures" crate's current-thread executor +use crate::support::{History, Type, Value}; use moor_db::rdb::RelationId; use moor_values::util::{BitArray, Bitset64}; +#[path = "../tests/test-support.rs"] +mod support; + /// Build a test database with a bunch of relations fn test_db() -> Arc { // Generate 10 test relations that we'll use for testing. diff --git a/crates/db/src/lib.rs b/crates/db/src/lib.rs index fef78a57b..9f3ac9421 100644 --- a/crates/db/src/lib.rs +++ b/crates/db/src/lib.rs @@ -28,9 +28,6 @@ pub mod loader; pub mod rdb; pub mod odb; -#[doc(hidden)] -pub mod testing; - pub mod util; pub struct DatabaseBuilder { diff --git a/crates/db/src/testing/jepsen.rs b/crates/db/src/testing/jepsen.rs deleted file mode 100644 index ab3214d45..000000000 --- a/crates/db/src/testing/jepsen.rs +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (C) 2024 Ryan Daum -// -// This program is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free Software -// Foundation, version 3. -// -// This program is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along with -// this program. If not, see . -// - -//! For loading Jepsen-produced history files. - -#[derive(Debug, serde::Deserialize, Copy, Clone, PartialEq)] -#[allow(non_camel_case_types)] -pub enum Type { - invoke, - ok, - fail, -} -impl Type { - pub fn to_keyword(&self) -> &str { - match self { - Type::invoke => "invoke", - Type::ok => "ok", - Type::fail => "fail", - } - } -} - -#[derive(Debug, serde::Deserialize)] -pub struct History { - pub f: String, - pub index: i64, - pub process: i64, - pub time: i64, - pub r#type: Type, - pub value: Vec, -} - -// ["append",9,1] -#[derive(Debug, serde::Deserialize)] -#[serde(untagged)] -#[allow(non_camel_case_types)] -pub enum Value { - append(String, i64, i64), - r(String, i64, Option>), -} diff --git a/crates/db/src/testing/mod.rs b/crates/db/src/testing/mod.rs deleted file mode 100644 index f63e5d24d..000000000 --- a/crates/db/src/testing/mod.rs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (C) 2024 Ryan Daum -// -// This program is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free Software -// Foundation, version 3. -// -// This program is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along with -// this program. If not, see . -// - -//! Stuff for benchmarking and testing the DB. - -pub mod jepsen; diff --git a/crates/db/tests/jepsen.rs b/crates/db/tests/jepsen.rs index 6595f2971..77c76f2aa 100644 --- a/crates/db/tests/jepsen.rs +++ b/crates/db/tests/jepsen.rs @@ -11,27 +11,8 @@ // You should have received a copy of the GNU General Public License along with // this program. If not, see . // - -pub mod support { - use moor_db::rdb::{RelBox, RelationInfo}; - use std::path::PathBuf; - use std::sync::Arc; - - /// Build a test database with a bunch of relations - pub fn test_db(dir: PathBuf) -> Arc { - // Generate 10 test relations that we'll use for testing. - let relations = (0..100) - .map(|i| RelationInfo { - name: format!("relation_{}", i), - domain_type_id: 0, - codomain_type_id: 0, - secondary_indexed: false, - }) - .collect::>(); - - RelBox::new(1 << 24, Some(dir), &relations, 0) - } -} +#[path = "./test-support.rs"] +mod support; #[cfg(test)] mod tests { @@ -42,8 +23,8 @@ mod tests { use moor_db::rdb::RelBox; use moor_db::rdb::{RelationId, Transaction}; - use moor_db::testing::jepsen::{History, Type, Value}; + use crate::support::{History, Type, Value}; use moor_values::util::SliceRef; use super::*; @@ -80,7 +61,7 @@ mod tests { expected.iter().all(|v| got.contains(v)), "T{} at {}, r {} expected {:?} but got {:?}", process, - action_type.to_keyword(), + action_type.as_keyword(), relation.0, values, got @@ -112,7 +93,7 @@ mod tests { expect_val, "T{} at {}, expected {} to be {} after its insert", process, - action_type.to_keyword(), + action_type.as_keyword(), register, expect_val ); diff --git a/crates/db/tests/rdb_restore.rs b/crates/db/tests/rdb_restore.rs index ce5d7155d..7c40eb116 100644 --- a/crates/db/tests/rdb_restore.rs +++ b/crates/db/tests/rdb_restore.rs @@ -11,6 +11,8 @@ // You should have received a copy of the GNU General Public License along with // this program. If not, see . // +#[path = "./test-support.rs"] +mod support; #[cfg(test)] mod test { @@ -20,9 +22,9 @@ mod test { use std::sync::Arc; use tracing_test::traced_test; + use crate::support::{History, Type, Value}; use moor_db::rdb::{RelBox, RelationInfo}; use moor_db::rdb::{RelationId, Transaction}; - use moor_db::testing::jepsen::{History, Type, Value}; use moor_values::util::SliceRef; fn from_val(value: i64) -> SliceRef { diff --git a/crates/db/tests/test-support.rs b/crates/db/tests/test-support.rs new file mode 100644 index 000000000..ad5c59813 --- /dev/null +++ b/crates/db/tests/test-support.rs @@ -0,0 +1,60 @@ +use moor_db::rdb::{RelBox, RelationInfo}; +use std::path::PathBuf; +use std::sync::Arc; + +/// Build a test database with a bunch of relations +#[allow(dead_code)] +pub fn test_db(dir: PathBuf) -> Arc { + // Generate 10 test relations that we'll use for testing. + let relations = (0..100) + .map(|i| RelationInfo { + name: format!("relation_{}", i), + domain_type_id: 0, + codomain_type_id: 0, + secondary_indexed: false, + }) + .collect::>(); + + RelBox::new(1 << 24, Some(dir), &relations, 0) +} + +#[derive(Debug, serde::Deserialize, Copy, Clone, PartialEq)] +#[allow(non_camel_case_types)] +#[allow(dead_code)] +pub enum Type { + invoke, + ok, + fail, +} + +impl Type { + #[allow(dead_code)] + pub fn as_keyword(&self) -> &str { + match self { + Type::invoke => "invoke", + Type::ok => "ok", + Type::fail => "fail", + } + } +} + +#[derive(Debug, serde::Deserialize)] +#[allow(dead_code)] +pub struct History { + pub f: String, + pub index: i64, + pub process: i64, + pub time: i64, + pub r#type: Type, + pub value: Vec, +} + +// ["append",9,1] +#[derive(Debug, serde::Deserialize)] +#[serde(untagged)] +#[allow(non_camel_case_types)] +#[allow(dead_code)] +pub enum Value { + append(String, i64, i64), + r(String, i64, Option>), +} diff --git a/crates/db/tests/worldstate_restore.rs b/crates/db/tests/worldstate_restore.rs index 783e47622..149a08d1c 100644 --- a/crates/db/tests/worldstate_restore.rs +++ b/crates/db/tests/worldstate_restore.rs @@ -12,11 +12,18 @@ // this program. If not, see . // +#[path = "./test-support.rs"] +mod support; + #[cfg(test)] mod test { + use std::path::PathBuf; + use std::sync::Arc; + use std::time::Duration; + use strum::{EnumCount, IntoEnumIterator}; + use moor_db::db_tx::DbTransaction; - use moor_db::odb::RelBoxTransaction; - use moor_db::odb::{WorldStateRelation, WorldStateSequences}; + use moor_db::odb::{RelBoxTransaction, WorldStateRelation, WorldStateSequences}; use moor_db::rdb::{RelBox, RelationInfo}; use moor_values::model::BinaryType; use moor_values::model::CommitResult; @@ -25,10 +32,6 @@ mod test { use moor_values::model::VerbArgsSpec; use moor_values::util::BitEnum; use moor_values::NOTHING; - use std::path::PathBuf; - use std::sync::Arc; - use std::time::Duration; - use strum::{EnumCount, IntoEnumIterator}; pub fn test_db(dir: PathBuf) -> Arc { let mut relations: Vec = WorldStateRelation::iter() diff --git a/crates/kernel/Cargo.toml b/crates/kernel/Cargo.toml index 5ccd49c8a..92afeb20a 100644 --- a/crates/kernel/Cargo.toml +++ b/crates/kernel/Cargo.toml @@ -14,6 +14,7 @@ pretty_assertions.workspace = true tempfile.workspace = true test-case.workspace = true text-diff.workspace = true +tracing-test.workspace = true unindent.workspace = true [[test]] @@ -32,11 +33,9 @@ moor-db = { path = "../db" } moor-values = { path = "../values" } ## General usefullness -bytes.workspace = true chrono.workspace = true dashmap.workspace = true decorum.workspace = true -itertools.workspace = true kanal.workspace = true lazy_static.workspace = true libc.workspace = true @@ -59,7 +58,6 @@ thiserror.workspace = true paste.workspace = true ## Logging & tracing -tracing-test.workspace = true tracing.workspace = true # For the DB layer. diff --git a/crates/rpc-sync-client/Cargo.toml b/crates/rpc-sync-client/Cargo.toml index f67329a88..44cbb53c6 100644 --- a/crates/rpc-sync-client/Cargo.toml +++ b/crates/rpc-sync-client/Cargo.toml @@ -12,8 +12,7 @@ rust-version.workspace = true rpc-common = { path = "../rpc-common" } bincode.workspace = true -futures-util.workspace = true thiserror.workspace = true -zmq.workspace = true tracing.workspace = true uuid.workspace = true +zmq.workspace = true diff --git a/crates/telnet-host/Cargo.toml b/crates/telnet-host/Cargo.toml index a0c3d8846..a5a362286 100644 --- a/crates/telnet-host/Cargo.toml +++ b/crates/telnet-host/Cargo.toml @@ -9,8 +9,8 @@ rust-version.workspace = true [dependencies] moor-values = { path = "../values" } -rpc-common = { path = "../rpc-common" } rpc-async-client = { path = "../rpc-async-client" } +rpc-common = { path = "../rpc-common" } ## Command line arguments parsing. clap.workspace = true @@ -18,25 +18,21 @@ clap_derive.workspace = true strum.workspace = true ## General. -eyre.workspace = true -color-eyre.workspace = true -async-trait.workspace = true bincode.workspace = true +color-eyre.workspace = true +eyre.workspace = true futures-util.workspace = true futures.workspace = true -tower-http.workspace = true ## Asynchronous transaction processing & networking tokio-util.workspace = true tokio.workspace = true ## Logging & tracing -tracing-chrome.workspace = true tracing-subscriber.workspace = true tracing.workspace = true ## ZMQ / RPC -itertools.workspace = true tmq.workspace = true uuid.workspace = true diff --git a/crates/values/Cargo.toml b/crates/values/Cargo.toml index b3cfbecec..b038bceb7 100644 --- a/crates/values/Cargo.toml +++ b/crates/values/Cargo.toml @@ -8,7 +8,6 @@ authors.workspace = true rust-version.workspace = true [dependencies] -async-trait.workspace = true binary-layout.workspace = true bincode.workspace = true bytes.workspace = true diff --git a/crates/web-host/Cargo.toml b/crates/web-host/Cargo.toml index 8e2a7f90e..3b76ad684 100644 --- a/crates/web-host/Cargo.toml +++ b/crates/web-host/Cargo.toml @@ -9,8 +9,8 @@ rust-version.workspace = true [dependencies] moor-values = { path = "../values" } -rpc-common = { path = "../rpc-common" } rpc-async-client = { path = "../rpc-async-client" } +rpc-common = { path = "../rpc-common" } ## Command line arguments parsing. clap.workspace = true @@ -18,12 +18,10 @@ clap_derive.workspace = true strum.workspace = true # General. -eyre.workspace = true -color-eyre.workspace = true -async-trait.workspace = true bincode.workspace = true +color-eyre.workspace = true +eyre.workspace = true futures-util.workspace = true -futures.workspace = true thiserror.workspace = true ## Asynchronous transaction processing & networking @@ -31,12 +29,10 @@ tokio-util.workspace = true tokio.workspace = true ## Logging & tracing -tracing-chrome.workspace = true tracing-subscriber.workspace = true tracing.workspace = true ## ZMQ / RPC -itertools.workspace = true tmq.workspace = true uuid.workspace = true