Cargo cleanup (#667)

ava-labs · Jun 12, 2024 · 78f8af5 · 78f8af5
1 parent 7ec3041
commit 78f8af5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/firewood/Cargo.toml b/firewood/Cargo.toml
@@ -18,38 +18,28 @@ readme = "../README.md"
 [dependencies]
 aquamarine = "0.5.0"
 async-trait = "0.1.77"
-bytemuck = { version = "1.14.3", features = ["derive"] }
-enum-as-inner = "0.6.0"
 storage = { version = "0.0.4", path = "../storage" }
 futures = "0.3.30"
 hex = "0.4.3"
-lru = "0.12.2"
 metered = "0.9.0"
 nix = {version = "0.28.0", features = ["fs", "uio"]}
-parking_lot = "0.12.1"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0" }
 sha2 = "0.10.8"
 thiserror = "1.0.57"
 tokio = { version = "1.36.0", features = ["rt", "sync", "macros", "rt-multi-thread"] }
 typed-builder = "0.18.1"
 bincode = "1.3.3"
-bitflags = { version = "2.4.2", features = ["bytemuck"] }
-env_logger = { version = "0.11.2", optional = true }
 log = { version = "0.4.20", optional = true }
 test-case = "3.3.1"
-smallvec = { version = "1.13.2", features = ["serde", "write", "union"] }
 integer-encoding = "4.0.0"
 
 [features]
-logger = ["dep:env_logger", "log"]
+logger = ["log"]
 
 [dev-dependencies]
 criterion = {version = "0.5.1", features = ["async_tokio"]}
-keccak-hasher = "0.15.3"
 rand = "0.8.5"
 triehash = "0.8.4"
-assert_cmd = "2.0.13"
-predicates = "3.1.0"
 clap = { version = "4.5.0", features = ['derive'] }
 pprof = { version = "0.13.0", features = ["flamegraph"] }
 

diff --git a/grpc-testtool/Cargo.toml b/grpc-testtool/Cargo.toml
@@ -18,12 +18,10 @@ bench = false
 [dependencies]
 firewood = { version = "0.0.4", path = "../firewood" }
 prost = "0.12.3"
-thiserror = "1.0.57"
 tokio = { version = "1.36.0", features = ["sync", "rt-multi-thread"] }
 tonic = { version = "0.11.0", features = ["tls"] }
 tracing = { version = "0.1.40" }
 clap = { version = "4.5.0", features = ["derive"] }
-tempdir = "0.3.7"
 log = "0.4.20"
 env_logger = "0.11.2"
 chrono = "0.4.34"
@@ -49,3 +47,7 @@ unwrap_used = "warn"
 indexing_slicing = "warn"
 explicit_deref_methods = "warn"
 missing_const_for_fn = "warn"
+
+[package.metadata.cargo-machete]
+ignored = ["prost", "tonic_build"]
+
diff --git a/storage/Cargo.toml b/storage/Cargo.toml
@@ -13,7 +13,7 @@ hex = "0.4.3"
 serde = { version = "1.0.199", features = ["derive"] }
 smallvec = { version = "1.13.2", features = ["serde", "write", "union"] }
 sha2 = "0.10.8"
-bytemuck = { version = "1.14.3", features = ["derive"] }
+integer-encoding = "4.0.0"
 
 [dev-dependencies]
 rand = "0.8.5"

diff --git a/storage/src/nodestore.rs b/storage/src/nodestore.rs
@@ -46,7 +46,7 @@ const AREA_SIZES: [u64; 21] = [
 
 /// The type of an index into the [AREA_SIZES] array
 /// This is not usize because we can store this as a single byte
-type AreaIndex = u8;
+pub type AreaIndex = u8;
 
 // TODO danlaine: have type for index in AREA_SIZES
 // Implement try_into() for it.
@@ -483,7 +483,7 @@ impl Version {
     }
 }
 
-type FreeLists = [Option<LinearAddress>; NUM_AREA_SIZES];
+pub type FreeLists = [Option<LinearAddress>; NUM_AREA_SIZES];
 
 /// Persisted metadata for a [NodeStore].
 /// The [NodeStoreHeader] is at the start of the LinearStore.