Remove some unused deps (#1929)

* move deps to dev-dependencies where possible * remove unused deps * put solana-program behind target.'cfg(target_os = "solana")' in curve25519 * update lock files
anza-xyz · Jul 11, 2024 · 0fa8da4 · 0fa8da4
1 parent b24f492
commit 0fa8da4
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
@@ -17,7 +17,6 @@ solana-account-decoder = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-client = { workspace = true }
-solana-faucet = { workspace = true }
 solana-gossip = { workspace = true }
 solana-inline-spl = { workspace = true }
 solana-logger = { workspace = true }
@@ -34,6 +33,7 @@ spl-token = { workspace = true, features = ["no-entrypoint"] }
 [dev-dependencies]
 solana-accounts-db = { workspace = true }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
+solana-faucet = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-test-validator = { workspace = true }

diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml
@@ -14,14 +14,16 @@ bv = { workspace = true, features = ["serde"] }
 fnv = { workspace = true }
 log = { workspace = true }
 rand = { workspace = true }
-rayon = { workspace = true }
 serde = { workspace = true, features = ["rc"] }
 serde_derive = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-sanitize = { workspace = true }
 solana-sdk = { workspace = true }
 
+[dev-dependencies]
+rayon = { workspace = true }
+
 [lib]
 crate-type = ["lib"]
 name = "solana_bloom"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -36,7 +36,6 @@ solana-cli-output = { workspace = true }
 solana-client = { workspace = true }
 solana-compute-budget = { workspace = true }
 solana-config-program = { workspace = true }
-solana-faucet = { workspace = true }
 solana-loader-v4-program = { workspace = true }
 solana-logger = { workspace = true }
 solana-program-runtime = { workspace = true }
@@ -61,6 +60,7 @@ tiny-bip39 = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+solana-faucet = { workspace = true }
 solana-rpc = { workspace = true }
 solana-streamer = { workspace = true }
 solana-test-validator = { workspace = true }

diff --git a/curves/curve25519/Cargo.toml b/curves/curve25519/Cargo.toml
@@ -12,8 +12,10 @@ edition = { workspace = true }
 [dependencies]
 bytemuck = { workspace = true }
 bytemuck_derive = { workspace = true }
-solana-program = { workspace = true }
 thiserror = { workspace = true }
 
+[target.'cfg(target_os = "solana")'.dependencies]
+solana-program = { workspace = true }
+
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 curve25519-dalek = { workspace = true, features = ["serde"] }
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
@@ -22,7 +22,6 @@ socket2 = { workspace = true }
 solana-logger = { workspace = true }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }
-static_assertions = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 url = { workspace = true }
 

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml
@@ -17,7 +17,6 @@ rayon = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-cli = { workspace = true }
 solana-client = { workspace = true }
-solana-core = { workspace = true }
 solana-faucet = { workspace = true }
 solana-gossip = { workspace = true }
 solana-logger = { workspace = true }

diff --git a/transaction-metrics-tracker/Cargo.toml b/transaction-metrics-tracker/Cargo.toml
@@ -10,7 +10,6 @@ license = { workspace = true }
 edition = { workspace = true }
 
 [dependencies]
-Inflector = { workspace = true }
 base64 = { workspace = true }
 bincode = { workspace = true }
 # Update this borsh dependency to the workspace version once

diff --git a/wen-restart/Cargo.toml b/wen-restart/Cargo.toml
@@ -19,7 +19,6 @@ rayon = { workspace = true }
 solana-entry = { workspace = true }
 solana-gossip = { workspace = true }
 solana-ledger = { workspace = true }
-solana-logger = { workspace = true }
 solana-program = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-runtime = { workspace = true }
@@ -32,6 +31,7 @@ rand = { workspace = true }
 serial_test = { workspace = true }
 solana-accounts-db = { workspace = true }
 solana-entry = { workspace = true }
+solana-logger = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-streamer = { workspace = true }
 tempfile = { workspace = true }

diff --git a/zk-keygen/Cargo.toml b/zk-keygen/Cargo.toml
@@ -19,9 +19,7 @@ edition = { workspace = true }
 bs58 = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo", "derive"] }
 dirs-next = { workspace = true }
-num_cpus = { workspace = true }
 solana-clap-v3-utils = { workspace = true }
-solana-cli-config = { workspace = true }
 solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }