diff --git a/Cargo.lock b/Cargo.lock index a150a39e1..d5005d329 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1557,18 +1557,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "enum_dispatch" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" -dependencies = [ - "once_cell", - "proc-macro2 1.0.53", - "quote 1.0.26", - "syn 1.0.107", -] - [[package]] name = "env_logger" version = "0.9.3" @@ -5225,7 +5213,6 @@ dependencies = [ "async-trait", "bincode", "crossbeam-channel", - "enum_dispatch", "futures 0.3.24", "futures-util", "indexmap", @@ -5236,7 +5223,6 @@ dependencies = [ "rand_chacha 0.2.2", "rayon", "solana-connection-cache", - "solana-logger 1.16.0", "solana-measure", "solana-metrics", "solana-net-utils", @@ -5329,7 +5315,6 @@ dependencies = [ name = "solana-core" version = "1.16.0" dependencies = [ - "ahash", "base64 0.13.0", "bincode", "bs58", @@ -5409,7 +5394,6 @@ dependencies = [ "log", "rand 0.7.3", "serde", - "serial_test", "solana-bench-tps", "solana-client", "solana-core", @@ -6212,7 +6196,6 @@ dependencies = [ "enum-iterator", "itertools", "libc", - "libloading", "log", "num-derive", "num-traits", @@ -6303,7 +6286,6 @@ dependencies = [ "solana-rpc-client-api", "solana-sdk 1.16.0", "solana-streamer", - "solana-tpu-client", "thiserror", "tokio", ] @@ -6883,7 +6865,6 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-sdk 1.16.0", - "solana-tpu-client", ] [[package]] @@ -6932,10 +6913,8 @@ dependencies = [ "rand_chacha 0.2.2", "rayon", "solana-connection-cache", - "solana-logger 1.16.0", "solana-measure", "solana-metrics", - "solana-net-utils", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", @@ -7004,7 +6983,6 @@ dependencies = [ "solana-net-utils", "solana-sdk 1.16.0", "solana-streamer", - "solana-tpu-client", "thiserror", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 059d5a8c1..017cafa23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -179,7 +179,6 @@ eager = "0.1.0" ed25519-dalek = "=1.0.1" ed25519-dalek-bip32 = "0.2.0" either = "1.7.0" -enum_dispatch = "0.3.8" enum-iterator = "1.2.0" env_logger = "0.9.3" etcd-client = "0.8.1" diff --git a/client/Cargo.toml b/client/Cargo.toml index b45d28bfd..12115d25a 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -12,7 +12,6 @@ edition = "2021" [dependencies] async-trait = { workspace = true } bincode = { workspace = true } -enum_dispatch = { workspace = true } futures = { workspace = true } futures-util = { workspace = true } indexmap = { workspace = true } @@ -41,7 +40,6 @@ tokio = { workspace = true, features = ["full"] } [dev-dependencies] crossbeam-channel = { workspace = true } rand_chacha = { workspace = true } -solana-logger = { workspace = true } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/connection-cache/Cargo.toml b/connection-cache/Cargo.toml index 02d1265fc..8faf5a5a9 100644 --- a/connection-cache/Cargo.toml +++ b/connection-cache/Cargo.toml @@ -20,7 +20,6 @@ rand = "0.7.0" rayon = "1.5.3" solana-measure = { path = "../measure", version = "=1.16.0" } solana-metrics = { path = "../metrics", version = "=1.16.0" } -solana-net-utils = { path = "../net-utils", version = "=1.16.0" } solana-sdk = { path = "../sdk", version = "=1.16.0" } thiserror = "1.0" tokio = { version = "1", features = ["full"] } @@ -28,3 +27,4 @@ tokio = { version = "1", features = ["full"] } [dev-dependencies] rand_chacha = "0.2.2" solana-logger = { path = "../logger", version = "=1.16.0" } +solana-net-utils = { path = "../net-utils", version = "=1.16.0" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 48f8be7e0..eefea7dfd 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -14,7 +14,6 @@ edition = { workspace = true } codecov = { repository = "solana-labs/solana", branch = "master", service = "github" } [dependencies] -ahash = { workspace = true } base64 = { workspace = true } bincode = { workspace = true } bs58 = { workspace = true } diff --git a/dos/Cargo.toml b/dos/Cargo.toml index 74df5eef2..d100d501c 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -37,6 +37,5 @@ solana-version = { workspace = true } targets = ["x86_64-unknown-linux-gnu"] [dev-dependencies] -serial_test = { workspace = true } solana-local-cluster = { workspace = true } solana-thin-client = { workspace = true } diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml index d93fa884b..1da8bd875 100644 --- a/program-runtime/Cargo.toml +++ b/program-runtime/Cargo.toml @@ -16,7 +16,6 @@ eager = { workspace = true } enum-iterator = { workspace = true } itertools = { workspace = true } libc = { workspace = true } -libloading = { workspace = true } log = { workspace = true } num-derive = { workspace = true } num-traits = { workspace = true } diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index d8c1756a4..5fc039622 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -1378,18 +1378,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "enum_dispatch" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" -dependencies = [ - "once_cell", - "proc-macro2 1.0.53", - "quote 1.0.26", - "syn 1.0.107", -] - [[package]] name = "env_logger" version = "0.9.3" @@ -4536,7 +4524,6 @@ version = "1.16.0" dependencies = [ "async-trait", "bincode", - "enum_dispatch", "futures 0.3.24", "futures-util", "indexmap", @@ -4596,7 +4583,6 @@ dependencies = [ "rayon", "solana-measure", "solana-metrics", - "solana-net-utils", "solana-sdk 1.16.0", "thiserror", "tokio", @@ -4606,7 +4592,6 @@ dependencies = [ name = "solana-core" version = "1.16.0" dependencies = [ - "ahash", "base64 0.13.0", "bincode", "bs58", @@ -5181,7 +5166,6 @@ dependencies = [ "enum-iterator", "itertools", "libc", - "libloading", "log", "num-derive", "num-traits", @@ -5266,7 +5250,6 @@ dependencies = [ "solana-rpc-client-api", "solana-sdk 1.16.0", "solana-streamer", - "solana-tpu-client", "thiserror", "tokio", ] @@ -6140,7 +6123,6 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-sdk 1.16.0", - "solana-tpu-client", ] [[package]] @@ -6158,7 +6140,6 @@ dependencies = [ "solana-connection-cache", "solana-measure", "solana-metrics", - "solana-net-utils", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", @@ -6200,7 +6181,6 @@ dependencies = [ "solana-net-utils", "solana-sdk 1.16.0", "solana-streamer", - "solana-tpu-client", "thiserror", "tokio", ] diff --git a/quic-client/Cargo.toml b/quic-client/Cargo.toml index 287b60d17..ed5df13a3 100644 --- a/quic-client/Cargo.toml +++ b/quic-client/Cargo.toml @@ -27,7 +27,6 @@ solana-net-utils = { workspace = true } solana-rpc-client-api = { workspace = true } solana-sdk = { workspace = true } solana-streamer = { workspace = true } -solana-tpu-client = { workspace = true, features = ["default"] } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } diff --git a/thin-client/Cargo.toml b/thin-client/Cargo.toml index c8070a71a..6cda9dcdb 100644 --- a/thin-client/Cargo.toml +++ b/thin-client/Cargo.toml @@ -17,7 +17,6 @@ solana-connection-cache = { workspace = true } solana-rpc-client = { workspace = true } solana-rpc-client-api = { workspace = true } solana-sdk = { workspace = true } -solana-tpu-client = { workspace = true } [dev-dependencies] solana-logger = { workspace = true } diff --git a/tpu-client/Cargo.toml b/tpu-client/Cargo.toml index c78e3de8b..8ee1c3b57 100644 --- a/tpu-client/Cargo.toml +++ b/tpu-client/Cargo.toml @@ -21,7 +21,6 @@ rayon = { workspace = true } solana-connection-cache = { workspace = true } solana-measure = { workspace = true } solana-metrics = { workspace = true } -solana-net-utils = { workspace = true } solana-pubsub-client = { workspace = true } solana-rpc-client = { workspace = true } solana-rpc-client-api = { workspace = true } @@ -31,7 +30,6 @@ tokio = { workspace = true, features = ["full"] } [dev-dependencies] rand_chacha = { workspace = true } -solana-logger = { workspace = true } [features] default = ["spinner"] diff --git a/udp-client/Cargo.toml b/udp-client/Cargo.toml index be2238367..4b22df742 100644 --- a/udp-client/Cargo.toml +++ b/udp-client/Cargo.toml @@ -15,6 +15,5 @@ solana-connection-cache = { workspace = true } solana-net-utils = { workspace = true } solana-sdk = { workspace = true } solana-streamer = { workspace = true } -solana-tpu-client = { workspace = true, features = ["default"] } thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] }