removes unused Cargo dependencies (solana-labs#22022)

Also moving some to [dev-dependencies] so that they are not propagated to other packages which depend on the package.
Balantion2020 · Dec 22, 2021 · f67ecd5 · f67ecd5
1 parent 61cc7b1
commit f67ecd5
Show file tree

Hide file tree

Showing 23 changed files with 40 additions and 172 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
@@ -16,7 +16,6 @@ rayon = "1.5.1"
 solana-account-decoder = { path = "../account-decoder", version = "=1.10.0" }
 solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" }
 solana-client = { path = "../client", version = "=1.10.0" }
-solana-core = { path = "../core", version = "=1.10.0" }
 solana-faucet = { path = "../faucet", version = "=1.10.0" }
 solana-gossip = { path = "../gossip", version = "=1.10.0" }
 solana-logger = { path = "../logger", version = "=1.10.0" }
@@ -25,13 +24,14 @@ solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
 solana-runtime = { path = "../runtime", version = "=1.10.0" }
 solana-sdk = { path = "../sdk", version = "=1.10.0" }
 solana-streamer = { path = "../streamer", version = "=1.10.0" }
-solana-test-validator = { path = "../test-validator", version = "=1.10.0" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.10.0" }
 solana-version = { path = "../version", version = "=1.10.0" }
 spl-token = { version = "=3.2.0", features = ["no-entrypoint"] }
 
 [dev-dependencies]
+solana-core = { path = "../core", version = "=1.10.0" }
 solana-local-cluster = { path = "../local-cluster", version = "=1.10.0" }
+solana-test-validator = { path = "../test-validator", version = "=1.10.0" }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/accountsdb-plugin-manager/Cargo.toml b/accountsdb-plugin-manager/Cargo.toml
@@ -18,7 +18,6 @@ serde = "1.0.132"
 serde_derive = "1.0.103"
 serde_json = "1.0.73"
 solana-accountsdb-plugin-interface = { path = "../accountsdb-plugin-interface", version = "=1.10.0" }
-solana-logger = { path = "../logger", version = "=1.10.0" }
 solana-measure = { path = "../measure", version = "=1.10.0" }
 solana-metrics = { path = "../metrics", version = "=1.10.0" }
 solana-rpc = { path = "../rpc", version = "=1.10.0" }

diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
@@ -10,9 +10,7 @@ publish = false
 
 [dependencies]
 clap = "2.33.1"
-solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" }
 solana-streamer = { path = "../streamer", version = "=1.10.0" }
-solana-logger = { path = "../logger", version = "=1.10.0" }
 solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
 solana-version = { path = "../version", version = "=1.10.0" }
 

diff --git a/bucket_map/Cargo.toml b/bucket_map/Cargo.toml
@@ -11,16 +11,18 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies]
-rayon = "1.5.0"
-solana-logger = { path = "../logger", version = "=1.10.0" }
 solana-sdk = { path = "../sdk", version = "=1.10.0" }
 memmap2 = "0.5.0"
 log = { version = "0.4.11" }
 solana-measure = { path = "../measure", version = "=1.10.0" }
 rand = "0.7.0"
-fs_extra = "1.2.0"
 tempfile = "3.2.0"
 
+[dev-dependencies]
+fs_extra = "1.2.0"
+rayon = "1.5.0"
+solana-logger = { path = "../logger", version = "=1.10.0" }
+
 [lib]
 crate-type = ["lib"]
 name = "solana_bucket_map"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -29,7 +29,6 @@ log = "0.4.14"
 lru = "0.7.1"
 rand = "0.7.0"
 rand_chacha = "0.2.2"
-raptorq = "1.6.4"
 rayon = "1.5.1"
 retain_mut = "0.1.5"
 serde = "1.0.132"
@@ -39,7 +38,6 @@ solana-client = { path = "../client", version = "=1.10.0" }
 solana-entry = { path = "../entry", version = "=1.10.0" }
 solana-gossip = { path = "../gossip", version = "=1.10.0" }
 solana-ledger = { path = "../ledger", version = "=1.10.0" }
-solana-logger = { path = "../logger", version = "=1.10.0" }
 solana-measure = { path = "../measure", version = "=1.10.0" }
 solana-metrics = { path = "../metrics", version = "=1.10.0" }
 solana-net-utils = { path = "../net-utils", version = "=1.10.0" }
@@ -68,9 +66,11 @@ jsonrpc-core-client = { version = "18.0.0", features = ["ipc", "ws"] }
 jsonrpc-derive = "18.0.0"
 jsonrpc-pubsub = "18.0.0"
 matches = "0.1.9"
+raptorq = "1.6.4"
 reqwest = { version = "0.11.6", default-features = false, features = ["blocking", "rustls-tls", "json"] }
 serde_json = "1.0.73"
 serial_test = "0.5.1"
+solana-logger = { path = "../logger", version = "=1.10.0" }
 solana-program-runtime = { path = "../program-runtime", version = "=1.10.0" }
 solana-stake-program = { path = "../programs/stake", version = "=1.10.0" }
 solana-version = { path = "../version", version = "=1.10.0" }

diff --git a/frozen-abi/Cargo.toml b/frozen-abi/Cargo.toml
@@ -20,9 +20,11 @@ solana-frozen-abi-macro = { path = "macro", version = "=1.10.0" }
 thiserror = "1.0"
 
 [target.'cfg(not(target_arch = "bpf"))'.dependencies]
-solana-logger = { path = "../logger", version = "=1.10.0" }
 generic-array = { version = "0.14.4", default-features = false, features = ["serde", "more_lengths"]}
 memmap2 = "0.5.0"
 
+[target.'cfg(not(target_arch = "bpf"))'.dev-dependencies]
+solana-logger = { path = "../logger", version = "=1.10.0" }
+
 [build-dependencies]
 rustc_version = "0.4"