diff --git a/Cargo.lock b/Cargo.lock index aef79954905fbd..cf87954f2a5483 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,12 +214,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - [[package]] name = "base64" version = "0.9.3" @@ -342,25 +336,13 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding 0.2.1", + "block-padding", "generic-array 0.14.4", ] @@ -373,15 +355,6 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - [[package]] name = "block-padding" version = "0.2.1" @@ -473,12 +446,6 @@ dependencies = [ "serde", ] -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byte-unit" version = "4.0.13" @@ -1380,12 +1347,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -2257,21 +2218,6 @@ dependencies = [ "unicase 2.6.0", ] -[[package]] -name = "jsonrpc-ws-server" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" -dependencies = [ - "futures 0.3.19", - "jsonrpc-core", - "jsonrpc-server-utils", - "log 0.4.14", - "parity-ws", - "parking_lot 0.11.2", - "slab", -] - [[package]] name = "keccak" version = "0.1.0" @@ -2478,7 +2424,7 @@ checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -2577,18 +2523,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log 0.4.14", - "mio 0.6.23", - "slab", -] - [[package]] name = "miow" version = "0.2.2" @@ -2784,12 +2718,6 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -2903,24 +2831,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "parity-ws" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5983d3929ad50f12c3eb9a6743f19d691866ecd44da74c0a3308c3f8a56df0c6" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log 0.4.14", - "mio 0.6.23", - "mio-extras", - "rand 0.7.3", - "sha-1 0.8.2", - "slab", - "url 2.2.2", -] - [[package]] name = "parking_lot" version = "0.9.0" @@ -4127,18 +4037,6 @@ dependencies = [ "syn 1.0.81", ] -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha-1" version = "0.9.8" @@ -4149,7 +4047,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -4168,7 +4066,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -4191,7 +4089,7 @@ dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", "keccak", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -4315,7 +4213,7 @@ dependencies = [ "httparse", "log 0.4.14", "rand 0.8.4", - "sha-1 0.9.8", + "sha-1", ] [[package]] @@ -4402,7 +4300,6 @@ dependencies = [ "serde_derive", "serde_json", "solana-accountsdb-plugin-interface", - "solana-logger 1.10.0", "solana-measure", "solana-metrics", "solana-rpc", @@ -4535,8 +4432,6 @@ name = "solana-bench-streamer" version = "1.10.0" dependencies = [ "clap 2.33.3", - "solana-clap-utils", - "solana-logger 1.10.0", "solana-net-utils", "solana-streamer", "solana-version", @@ -5189,7 +5084,6 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_yaml", "signal-hook", "solana-clap-utils", "solana-cli-output", @@ -5323,7 +5217,6 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "solana-clap-utils", "solana-logger 1.10.0", ] @@ -5522,7 +5415,6 @@ dependencies = [ name = "solana-program-test" version = "1.10.0" dependencies = [ - "assert_matches", "async-trait", "base64 0.12.3", "bincode", @@ -5553,7 +5445,6 @@ dependencies = [ name = "solana-remote-wallet" version = "1.10.0" dependencies = [ - "base32", "console", "dialoguer", "hidapi", @@ -5629,7 +5520,6 @@ dependencies = [ "jsonrpc-derive", "jsonrpc-http-server", "jsonrpc-pubsub", - "jsonrpc-ws-server", "libc", "log 0.4.14", "rayon", @@ -7064,7 +6954,7 @@ dependencies = [ "log 0.4.14", "rand 0.8.4", "rustls 0.20.0", - "sha-1 0.9.8", + "sha-1", "thiserror", "url 2.2.2", "utf-8", diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml index 689ba51e0b67ca..d1089d37c598fe 100644 --- 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 index 62797d48854865..259be4f49fa417 100644 --- 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 index 7c6782ca66e2f5..923022cacf0c6e 100644 --- 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 index 9f76e8276a3303..3c50fb9d31b66a 100644 --- 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 index b834f3054f2086..6466c3d253f774 100644 --- 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 index 3e30fb19d5c6c0..ab8c2109f08b50 100644 --- 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" diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index fb3aff25d5b3b3..db4656eec54d7e 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -11,7 +11,6 @@ documentation = "https://docs.rs/solana-ledger-tool" [dependencies] bs58 = "0.4.0" -bytecount = "0.6.2" clap = "2.33.1" csv = "1.1.6" dashmap = "5.0.0" @@ -21,7 +20,6 @@ log = { version = "0.4.14" } regex = "1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.73" -serde_yaml = "0.8.23" solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" } solana-cli-output = { path = "../cli-output", version = "=1.10.0" } solana-core = { path = "../core", version = "=1.10.0" } @@ -43,6 +41,7 @@ jemallocator = {package = "tikv-jemallocator", version = "0.4.1", features = ["u [dev-dependencies] assert_cmd = "2.0" +bytecount = "0.6.2" [target."cfg(unix)".dependencies] signal-hook = "0.3.13" diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml index 94550b34f6d635..acc3364b427a30 100644 --- a/ledger/Cargo.toml +++ b/ledger/Cargo.toml @@ -36,7 +36,6 @@ solana-entry = { path = "../entry", version = "=1.10.0" } solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.0" } solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "=1.10.0" } solana-transaction-status = { path = "../transaction-status", 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-perf = { path = "../perf", version = "=1.10.0" } @@ -64,6 +63,7 @@ features = ["lz4"] assert_matches = "1.5.0" matches = "0.1.9" solana-account-decoder = { path = "../account-decoder", version = "=1.10.0" } +solana-logger = { path = "../logger", version = "=1.10.0" } [build-dependencies] rustc_version = "0.4" diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml index 15dbf9c29dd609..771943fe946c14 100644 --- a/local-cluster/Cargo.toml +++ b/local-cluster/Cargo.toml @@ -12,7 +12,6 @@ documentation = "https://docs.rs/solana-local-cluster" [dependencies] crossbeam-channel = "0.5" itertools = "0.10.3" -gag = "1.0.0" fs_extra = "1.2.0" log = "0.4.14" rand = "0.7.0" @@ -20,11 +19,9 @@ rayon = "1.5.1" solana-config-program = { path = "../programs/config", version = "=1.10.0" } solana-core = { path = "../core", version = "=1.10.0" } solana-client = { path = "../client", version = "=1.10.0" } -solana-download-utils = { path = "../download-utils", 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-runtime = { path = "../runtime", version = "=1.10.0" } solana-sdk = { path = "../sdk", version = "=1.10.0" } solana-stake-program = { path = "../programs/stake", version = "=1.10.0" } @@ -34,7 +31,10 @@ tempfile = "3.2.0" [dev-dependencies] assert_matches = "1.5.0" +gag = "1.0.0" serial_test = "0.5.1" +solana-download-utils = { path = "../download-utils", version = "=1.10.0" } +solana-logger = { path = "../logger", version = "=1.10.0" } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index ce0a1a6d8c37ff..ce0ea54d2c314c 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -10,7 +10,6 @@ documentation = "https://docs.rs/solana-metrics" edition = "2021" [dependencies] -env_logger = "0.9.0" gethostname = "0.2.1" lazy_static = "1.4.0" log = "0.4.14" @@ -18,6 +17,7 @@ reqwest = { version = "0.11.6", default-features = false, features = ["blocking" solana-sdk = { path = "../sdk", version = "=1.10.0" } [dev-dependencies] +env_logger = "0.9.0" rand = "0.7.0" serial_test = "0.5.1" diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml index add24178d2dde4..32ba4d13899a0a 100644 --- a/net-shaper/Cargo.toml +++ b/net-shaper/Cargo.toml @@ -13,7 +13,6 @@ publish = false clap = "2.33.1" serde = "1.0.132" serde_json = "1.0.73" -solana-clap-utils = { path = "../clap-utils", version = "=1.10.0" } solana-logger = { path = "../logger", version = "=1.10.0" } rand = "0.7.0" diff --git a/perf/Cargo.toml b/perf/Cargo.toml index 7093df297cc9bb..6758f34a7b42e4 100644 --- a/perf/Cargo.toml +++ b/perf/Cargo.toml @@ -19,7 +19,6 @@ log = "0.4.14" rand = "0.7.0" rayon = "1.5.1" serde = "1.0.132" -solana-logger = { path = "../logger", version = "=1.10.0" } solana-metrics = { path = "../metrics", version = "=1.10.0" } solana-sdk = { path = "../sdk", version = "=1.10.0" } solana-vote-program = { path = "../programs/vote", version = "=1.10.0" } @@ -35,6 +34,7 @@ name = "solana_perf" [dev-dependencies] matches = "0.1.9" +solana-logger = { path = "../logger", version = "=1.10.0" } [[bench]] name = "sigverify" diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml index e380db1b0dccf6..b7e99f2e6579a5 100644 --- a/program-runtime/Cargo.toml +++ b/program-runtime/Cargo.toml @@ -19,10 +19,12 @@ log = "0.4.14" num-derive = { version = "0.3" } num-traits = { version = "0.2" } serde = { version = "1.0.129", features = ["derive", "rc"] } -solana-logger = { path = "../logger", version = "=1.10.0" } solana-sdk = { path = "../sdk", version = "=1.10.0" } thiserror = "1.0" +[dev-dependencies] +solana-logger = { path = "../logger", version = "=1.10.0" } + [lib] crate-type = ["lib"] name = "solana_program_runtime" diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml index e23a90b6d17056..e7c0b5f074843d 100644 --- a/program-test/Cargo.toml +++ b/program-test/Cargo.toml @@ -24,6 +24,3 @@ solana-sdk = { path = "../sdk", version = "=1.10.0" } solana-vote-program = { path = "../programs/vote", version = "=1.10.0" } thiserror = "1.0" tokio = { version = "1", features = ["full"] } - -[dev-dependencies] -assert_matches = "1.5.0" diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 9a0fc1f1caac10..0c99ec2147fa62 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -134,12 +134,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base32" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" - [[package]] name = "base64" version = "0.12.3" @@ -959,12 +953,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs_extra" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" - [[package]] name = "futures" version = "0.3.19" @@ -2940,12 +2928,9 @@ dependencies = [ name = "solana-bucket-map" version = "1.10.0" dependencies = [ - "fs_extra", "log", "memmap2 0.5.0", "rand 0.7.3", - "rayon", - "solana-logger 1.10.0", "solana-measure", "solana-sdk", "tempfile", @@ -3108,7 +3093,6 @@ dependencies = [ "serde_derive", "sha2 0.10.0", "solana-frozen-abi-macro 1.10.0", - "solana-logger 1.10.0", "thiserror", ] @@ -3166,7 +3150,6 @@ dependencies = [ name = "solana-metrics" version = "1.10.0" dependencies = [ - "env_logger 0.9.0", "gethostname", "lazy_static", "log", @@ -3209,7 +3192,6 @@ dependencies = [ "rand 0.7.3", "rayon", "serde", - "solana-logger 1.10.0", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", @@ -3286,7 +3268,6 @@ dependencies = [ "sha3 0.10.0", "solana-frozen-abi 1.10.0", "solana-frozen-abi-macro 1.10.0", - "solana-logger 1.10.0", "solana-sdk-macro 1.10.0", "thiserror", "wasm-bindgen", @@ -3306,7 +3287,6 @@ dependencies = [ "num-traits", "rustc_version 0.4.0", "serde", - "solana-logger 1.10.0", "solana-sdk", "thiserror", ] @@ -3345,7 +3325,6 @@ dependencies = [ name = "solana-remote-wallet" version = "1.10.0" dependencies = [ - "base32", "console", "dialoguer", "hidapi", @@ -3395,7 +3374,6 @@ dependencies = [ "solana-config-program", "solana-frozen-abi 1.10.0", "solana-frozen-abi-macro 1.10.0", - "solana-logger 1.10.0", "solana-measure", "solana-metrics", "solana-program-runtime", @@ -3487,7 +3465,6 @@ name = "solana-send-transaction-service" version = "1.10.0" dependencies = [ "log", - "solana-logger 1.10.0", "solana-metrics", "solana-runtime", "solana-sdk", @@ -3565,7 +3542,6 @@ dependencies = [ "serde_derive", "solana-frozen-abi 1.10.0", "solana-frozen-abi-macro 1.10.0", - "solana-logger 1.10.0", "solana-metrics", "solana-program-runtime", "solana-sdk", diff --git a/programs/vote/Cargo.toml b/programs/vote/Cargo.toml index d85c93ccbfd61e..d23047e223bf7e 100644 --- a/programs/vote/Cargo.toml +++ b/programs/vote/Cargo.toml @@ -18,12 +18,14 @@ serde = "1.0.132" serde_derive = "1.0.103" solana-frozen-abi = { path = "../../frozen-abi", version = "=1.10.0" } solana-frozen-abi-macro = { path = "../../frozen-abi/macro", version = "=1.10.0" } -solana-logger = { path = "../../logger", version = "=1.10.0" } solana-metrics = { path = "../../metrics", version = "=1.10.0" } solana-program-runtime = { path = "../../program-runtime", version = "=1.10.0" } solana-sdk = { path = "../../sdk", version = "=1.10.0" } thiserror = "1.0" +[dev-dependencies] +solana-logger = { path = "../../logger", version = "=1.10.0" } + [build-dependencies] rustc_version = "0.4" diff --git a/remote-wallet/Cargo.toml b/remote-wallet/Cargo.toml index 39ac07ce7edaf2..e288f4d29d3e5c 100644 --- a/remote-wallet/Cargo.toml +++ b/remote-wallet/Cargo.toml @@ -10,7 +10,6 @@ homepage = "https://solana.com/" documentation = "https://docs.rs/solana-remote-wallet" [dependencies] -base32 = "0.4.0" console = "0.15.0" dialoguer = "0.9.0" hidapi = { version = "1.3.0", default-features = false } diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index 4b4ef3c3e30528..76c4a1be7f626d 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -21,7 +21,6 @@ jsonrpc-core-client = { version = "18.0.0", features = ["ipc", "ws"] } jsonrpc-derive = "18.0.0" jsonrpc-http-server = "18.0.0" jsonrpc-pubsub = "18.0.0" -jsonrpc-ws-server = "18.0.0" libc = "0.2.112" log = "0.4.14" rayon = "1.5.1" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 385e51ae4b034a..cb427de4165352 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -39,7 +39,6 @@ solana-config-program = { path = "../programs/config", version = "=1.10.0" } solana-compute-budget-program = { path = "../programs/compute-budget", version = "=1.10.0" } solana-frozen-abi = { path = "../frozen-abi", version = "=1.10.0" } solana-frozen-abi-macro = { path = "../frozen-abi/macro", 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-bucket-map = { path = "../bucket_map", version = "=1.10.0" } @@ -62,6 +61,7 @@ name = "solana_runtime" ed25519-dalek = "=1.0.1" libsecp256k1 = "0.6.0" assert_matches = "1.5.0" +solana-logger = { path = "../logger", version = "=1.10.0" } [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index 1a13046527347b..043bba6ea4da7e 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -40,10 +40,12 @@ base64 = "0.13" curve25519-dalek = "3.0.0" libsecp256k1 = "0.6.0" rand = "0.7.0" -solana-logger = { path = "../../logger", version = "=1.10.0" } itertools = "0.10.1" wasm-bindgen = "0.2" +[target.'cfg(not(target_arch = "bpf"))'.dev-dependencies] +solana-logger = { path = "../../logger", version = "=1.10.0" } + [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1.7" console_log = "0.2.0" diff --git a/send-transaction-service/Cargo.toml b/send-transaction-service/Cargo.toml index 864797af1998e6..d99c14910bf987 100644 --- a/send-transaction-service/Cargo.toml +++ b/send-transaction-service/Cargo.toml @@ -11,10 +11,12 @@ edition = "2021" [dependencies] log = "0.4.14" -solana-logger = { path = "../logger", version = "=1.10.0" } solana-metrics = { path = "../metrics", version = "=1.10.0" } solana-runtime = { path = "../runtime", version = "=1.10.0" } solana-sdk = { path = "../sdk", version = "=1.10.0" } +[dev-dependencies] +solana-logger = { path = "../logger", version = "=1.10.0" } + [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/streamer/Cargo.toml b/streamer/Cargo.toml index d4dadc3fc118b7..bce936e59cf6b2 100644 --- a/streamer/Cargo.toml +++ b/streamer/Cargo.toml @@ -16,12 +16,12 @@ log = "0.4.14" solana-metrics = { path = "../metrics", version = "=1.10.0" } solana-sdk = { path = "../sdk", version = "=1.10.0" } thiserror = "1.0" -solana-logger = { path = "../logger", version = "=1.10.0" } libc = "0.2.112" nix = "0.23.1" solana-perf = { path = "../perf", version = "=1.10.0" } [dev-dependencies] +solana-logger = { path = "../logger", version = "=1.10.0" } [lib] crate-type = ["lib"]