瀏覽代碼

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
Kevin Heavey 1 年之前
父節點
當前提交
0fa8da419e

+ 0 - 4
Cargo.lock

@@ -6664,7 +6664,6 @@ dependencies = [
  "solana-logger",
  "solana-logger",
  "solana-sdk",
  "solana-sdk",
  "solana-version",
  "solana-version",
- "static_assertions",
  "tokio",
  "tokio",
  "url 2.5.2",
  "url 2.5.2",
 ]
 ]
@@ -7678,7 +7677,6 @@ dependencies = [
 name = "solana-transaction-metrics-tracker"
 name = "solana-transaction-metrics-tracker"
 version = "2.1.0"
 version = "2.1.0"
 dependencies = [
 dependencies = [
- "Inflector",
  "base64 0.22.1",
  "base64 0.22.1",
  "bincode",
  "bincode",
  "lazy_static",
  "lazy_static",
@@ -7916,9 +7914,7 @@ dependencies = [
  "bs58",
  "bs58",
  "clap 3.2.23",
  "clap 3.2.23",
  "dirs-next",
  "dirs-next",
- "num_cpus",
  "solana-clap-v3-utils",
  "solana-clap-v3-utils",
- "solana-cli-config",
  "solana-remote-wallet",
  "solana-remote-wallet",
  "solana-sdk",
  "solana-sdk",
  "solana-version",
  "solana-version",

+ 1 - 1
accounts-cluster-bench/Cargo.toml

@@ -17,7 +17,6 @@ solana-account-decoder = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-cli-config = { workspace = true }
 solana-client = { workspace = true }
 solana-client = { workspace = true }
-solana-faucet = { workspace = true }
 solana-gossip = { workspace = true }
 solana-gossip = { workspace = true }
 solana-inline-spl = { workspace = true }
 solana-inline-spl = { workspace = true }
 solana-logger = { workspace = true }
 solana-logger = { workspace = true }
@@ -34,6 +33,7 @@ spl-token = { workspace = true, features = ["no-entrypoint"] }
 [dev-dependencies]
 [dev-dependencies]
 solana-accounts-db = { workspace = true }
 solana-accounts-db = { workspace = true }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
 solana-core = { workspace = true, features = ["dev-context-only-utils"] }
+solana-faucet = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-local-cluster = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-test-validator = { workspace = true }
 solana-test-validator = { workspace = true }

+ 3 - 1
bloom/Cargo.toml

@@ -14,7 +14,6 @@ bv = { workspace = true, features = ["serde"] }
 fnv = { workspace = true }
 fnv = { workspace = true }
 log = { workspace = true }
 log = { workspace = true }
 rand = { workspace = true }
 rand = { workspace = true }
-rayon = { workspace = true }
 serde = { workspace = true, features = ["rc"] }
 serde = { workspace = true, features = ["rc"] }
 serde_derive = { workspace = true }
 serde_derive = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi = { workspace = true, optional = true }
@@ -22,6 +21,9 @@ solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-sanitize = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk = { workspace = true }
 solana-sdk = { workspace = true }
 
 
+[dev-dependencies]
+rayon = { workspace = true }
+
 [lib]
 [lib]
 crate-type = ["lib"]
 crate-type = ["lib"]
 name = "solana_bloom"
 name = "solana_bloom"

+ 1 - 1
cli/Cargo.toml

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

+ 3 - 1
curves/curve25519/Cargo.toml

@@ -12,8 +12,10 @@ edition = { workspace = true }
 [dependencies]
 [dependencies]
 bytemuck = { workspace = true }
 bytemuck = { workspace = true }
 bytemuck_derive = { workspace = true }
 bytemuck_derive = { workspace = true }
-solana-program = { workspace = true }
 thiserror = { workspace = true }
 thiserror = { workspace = true }
 
 
+[target.'cfg(target_os = "solana")'.dependencies]
+solana-program = { workspace = true }
+
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 curve25519-dalek = { workspace = true, features = ["serde"] }
 curve25519-dalek = { workspace = true, features = ["serde"] }

+ 0 - 1
net-utils/Cargo.toml

@@ -22,7 +22,6 @@ socket2 = { workspace = true }
 solana-logger = { workspace = true }
 solana-logger = { workspace = true }
 solana-sdk = { workspace = true }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }
 solana-version = { workspace = true }
-static_assertions = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 tokio = { workspace = true, features = ["full"] }
 url = { workspace = true }
 url = { workspace = true }
 
 

+ 0 - 4
programs/sbf/Cargo.lock

@@ -4628,7 +4628,6 @@ dependencies = [
  "fnv",
  "fnv",
  "log",
  "log",
  "rand 0.8.5",
  "rand 0.8.5",
- "rayon",
  "rustc_version",
  "rustc_version",
  "serde",
  "serde",
  "serde_derive",
  "serde_derive",
@@ -5207,7 +5206,6 @@ dependencies = [
  "solana-logger",
  "solana-logger",
  "solana-sdk",
  "solana-sdk",
  "solana-version",
  "solana-version",
- "static_assertions",
  "tokio",
  "tokio",
  "url 2.5.2",
  "url 2.5.2",
 ]
 ]
@@ -6383,7 +6381,6 @@ dependencies = [
 name = "solana-transaction-metrics-tracker"
 name = "solana-transaction-metrics-tracker"
 version = "2.1.0"
 version = "2.1.0"
 dependencies = [
 dependencies = [
- "Inflector",
  "base64 0.22.1",
  "base64 0.22.1",
  "bincode",
  "bincode",
  "lazy_static",
  "lazy_static",
@@ -6561,7 +6558,6 @@ dependencies = [
  "solana-entry",
  "solana-entry",
  "solana-gossip",
  "solana-gossip",
  "solana-ledger",
  "solana-ledger",
- "solana-logger",
  "solana-program",
  "solana-program",
  "solana-program-runtime",
  "solana-program-runtime",
  "solana-runtime",
  "solana-runtime",

+ 0 - 1
transaction-dos/Cargo.toml

@@ -17,7 +17,6 @@ rayon = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-clap-utils = { workspace = true }
 solana-cli = { workspace = true }
 solana-cli = { workspace = true }
 solana-client = { workspace = true }
 solana-client = { workspace = true }
-solana-core = { workspace = true }
 solana-faucet = { workspace = true }
 solana-faucet = { workspace = true }
 solana-gossip = { workspace = true }
 solana-gossip = { workspace = true }
 solana-logger = { workspace = true }
 solana-logger = { workspace = true }

+ 0 - 1
transaction-metrics-tracker/Cargo.toml

@@ -10,7 +10,6 @@ license = { workspace = true }
 edition = { workspace = true }
 edition = { workspace = true }
 
 
 [dependencies]
 [dependencies]
-Inflector = { workspace = true }
 base64 = { workspace = true }
 base64 = { workspace = true }
 bincode = { workspace = true }
 bincode = { workspace = true }
 # Update this borsh dependency to the workspace version once
 # Update this borsh dependency to the workspace version once

+ 1 - 1
wen-restart/Cargo.toml

@@ -19,7 +19,6 @@ rayon = { workspace = true }
 solana-entry = { workspace = true }
 solana-entry = { workspace = true }
 solana-gossip = { workspace = true }
 solana-gossip = { workspace = true }
 solana-ledger = { workspace = true }
 solana-ledger = { workspace = true }
-solana-logger = { workspace = true }
 solana-program = { workspace = true }
 solana-program = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-runtime = { workspace = true }
 solana-runtime = { workspace = true }
@@ -32,6 +31,7 @@ rand = { workspace = true }
 serial_test = { workspace = true }
 serial_test = { workspace = true }
 solana-accounts-db = { workspace = true }
 solana-accounts-db = { workspace = true }
 solana-entry = { workspace = true }
 solana-entry = { workspace = true }
+solana-logger = { workspace = true }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-runtime = { workspace = true, features = ["dev-context-only-utils"] }
 solana-streamer = { workspace = true }
 solana-streamer = { workspace = true }
 tempfile = { workspace = true }
 tempfile = { workspace = true }

+ 0 - 2
zk-keygen/Cargo.toml

@@ -19,9 +19,7 @@ edition = { workspace = true }
 bs58 = { workspace = true }
 bs58 = { workspace = true }
 clap = { version = "3.1.5", features = ["cargo", "derive"] }
 clap = { version = "3.1.5", features = ["cargo", "derive"] }
 dirs-next = { workspace = true }
 dirs-next = { workspace = true }
-num_cpus = { workspace = true }
 solana-clap-v3-utils = { workspace = true }
 solana-clap-v3-utils = { workspace = true }
-solana-cli-config = { workspace = true }
 solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-remote-wallet = { workspace = true, features = ["default"] }
 solana-sdk = { workspace = true }
 solana-sdk = { workspace = true }
 solana-version = { workspace = true }
 solana-version = { workspace = true }