Maintenance : simplify a few patterns, remove unneeded dependencies (#8137)

* Simplify a few pattern matches

* Removing unneeded dependencies, upgrading internal version #s

 net-shaper: Removing log, semver, serde_derive
 bench-tps: Removing serde, serde_derive
 banking-bench: Removing solana
 ledger-tool: Removing bincode, serde, serde_derive
 librapay: Removing solana, language_e2e_tests
 log-analyzer: Removing log, semver, serde_derive
 exchange: Removing solana
 core: Removing crc, memmap, symlink, untrusted
 perf: Removing serde_derive
 genesis: Removing hex, serde_derive
 sdk-c: Removing sha2
 sys-tuner: Removing semver
 bench-exchange: Removing bincode, bs58, env_logger, serde, serde_derive, untrusted, ws
 btc_spv_bin: Removing serde_json
 btc_spv: Removing chrono
 bpf_loader: Removing serde
 ledger: Removing dlopen, dlopen_derive, serde_derive
 move_loader: Removing byteorder, libc, language_e2e_tests
 ownable: Removing serde, serde_derive
 client: Removing rand
 archiver-utils: Removing rand_chacha
 validator: Removing serde_json, tempfile
 param_passing_dep: Removing solana
 failure: Removing log
 vest: Removing log
 vote-signer: Removing bs58, serde
 local-cluster: Removing symlink
 keygen: Removing rpassword
 install: Removing bs58, log
 upload-perf: Removing log
 runtime: Removing serde_json
 stake: Removing rand

* Add modified Cargo.lock

* fixup! Simplify a few pattern matches

* fixup! Simplify a few pattern matches

Cargo.lock

@@ -307,14 +307,8 @@ dependencies = [
  "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "build_const"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "bumpalo"
 version = "2.6.0"
@@ -632,14 +626,6 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "crc"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.2.0"
@@ -1921,15 +1907,6 @@ dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "memmap"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.5.1"
@@ -3450,7 +3427,6 @@ dependencies = [
  "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-chacha 0.24.0",
  "solana-chacha-sys 0.24.0",
  "solana-ledger 0.24.0",
@@ -3479,18 +3455,13 @@ dependencies = [
 name = "solana-bench-exchange"
 version = "0.24.0"
 dependencies = [
- "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
@@ -3505,8 +3476,6 @@ dependencies = [
  "solana-net-utils 0.24.0",
  "solana-runtime 0.24.0",
  "solana-sdk 0.24.0",
- "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3528,8 +3497,6 @@ dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3558,7 +3525,6 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-logger 0.24.0",
  "solana-sdk 0.24.0",
  "solana_rbpf 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3569,7 +3535,6 @@ name = "solana-btc-spv-program"
 version = "0.24.0"
 dependencies = [
  "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3706,7 +3671,6 @@ dependencies = [
  "jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3739,7 +3703,6 @@ dependencies = [
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "core_affinity 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3753,7 +3716,6 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3786,7 +3748,6 @@ dependencies = [
  "solana-sys-tuner 0.24.0",
  "solana-vote-program 0.24.0",
  "solana-vote-signer 0.24.0",
- "symlink 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sys-info 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "systemstat 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3796,7 +3757,6 @@ dependencies = [
  "tokio-fs 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "trees 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3840,7 +3800,6 @@ dependencies = [
 name = "solana-failure-program"
 version = "0.24.0"
 dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-runtime 0.24.0",
  "solana-sdk 0.24.0",
 ]
@@ -3871,9 +3830,7 @@ dependencies = [
  "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
@@ -3922,7 +3879,6 @@ version = "0.24.0"
 dependencies = [
  "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3931,7 +3887,6 @@ dependencies = [
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "indicatif 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3957,7 +3912,6 @@ dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rpassword 4.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
  "solana-cli-config 0.24.0",
  "solana-sdk 0.24.0",
@@ -3975,8 +3929,6 @@ dependencies = [
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "dir-diff 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "dlopen 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "dlopen_derive 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ed25519-dalek 1.0.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3990,7 +3942,6 @@ dependencies = [
  "rocksdb 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-budget-program 0.24.0",
  "solana-client 0.24.0",
@@ -4018,11 +3969,8 @@ name = "solana-ledger-tool"
 version = "0.24.0"
 dependencies = [
  "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "histogram 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
@@ -4044,7 +3992,6 @@ dependencies = [
  "solana-move-loader-program 0.24.0",
  "solana-runtime 0.24.0",
  "solana-sdk 0.24.0",
- "solana_libra_language_e2e_tests 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -4074,7 +4021,6 @@ dependencies = [
  "solana-storage-program 0.24.0",
  "solana-vest-program 0.24.0",
  "solana-vote-program 0.24.0",
- "symlink 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -4084,10 +4030,7 @@ version = "0.24.0"
 dependencies = [
  "byte-unit 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
  "solana-logger 0.24.0",
@@ -4141,9 +4084,7 @@ name = "solana-move-loader-program"
 version = "0.24.0"
 dependencies = [
  "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4155,7 +4096,6 @@ dependencies = [
  "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana_libra_compiler 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_language_e2e_tests 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana_libra_state_view 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4170,11 +4110,8 @@ name = "solana-net-shaper"
 version = "0.24.0"
 dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
  "solana-logger 0.24.0",
@@ -4215,8 +4152,6 @@ dependencies = [
  "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-runtime 0.24.0",
  "solana-sdk 0.24.0",
  "thiserror 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4235,7 +4170,6 @@ dependencies = [
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-budget-program 0.24.0",
  "solana-logger 0.24.0",
  "solana-metrics 0.24.0",
@@ -4280,7 +4214,6 @@ dependencies = [
  "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-bpf-loader-program 0.24.0",
  "solana-logger 0.24.0",
  "solana-measure 0.24.0",
@@ -4347,7 +4280,6 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-sdk 0.24.0",
 ]
 
@@ -4369,7 +4301,6 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-config-program 0.24.0",
@@ -4404,7 +4335,6 @@ dependencies = [
  "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
  "solana-logger 0.24.0",
  "sysctl 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4416,7 +4346,6 @@ dependencies = [
 name = "solana-upload-perf"
 version = "0.24.0"
 dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-metrics 0.24.0",
 ]
@@ -4449,7 +4378,6 @@ dependencies = [
  "solana-vote-program 0.24.0",
  "solana-vote-signer 0.24.0",
  "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -4458,7 +4386,6 @@ version = "0.24.0"
 dependencies = [
  "bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4489,13 +4416,11 @@ dependencies = [
 name = "solana-vote-signer"
 version = "0.24.0"
 dependencies = [
- "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-derive 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 14.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "solana-clap-utils 0.24.0",
  "solana-metrics 0.24.0",
@@ -4658,35 +4583,6 @@ dependencies = [
  "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "solana_libra_language_e2e_tests"
-version = "0.0.1-sol4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "proptest 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "proptest-derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_bytecode_verifier 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_canonical_serialization 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_compiler 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_config 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_logger 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_proptest_helpers 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_state_view 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_transaction_builder 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_genesis 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "solana_libra_logger"
 version = "0.0.1-sol4"
@@ -4740,15 +4636,6 @@ dependencies = [
  "proptest-derive 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "solana_libra_prost_ext"
-version = "0.0.1-sol4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "solana_libra_state_view"
 version = "0.0.1-sol4"
@@ -4778,20 +4665,6 @@ dependencies = [
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "solana_libra_transaction_builder"
-version = "0.0.1-sol4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_config 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_ir_to_bytecode 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "solana_libra_types"
 version = "0.0.1-sol4"
@@ -4848,27 +4721,6 @@ dependencies = [
  "typed-arena 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "solana_libra_vm_genesis"
-version = "0.0.1-sol4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_config 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_crypto 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_failure_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_prost_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_state_view 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_transaction_builder 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_cache_map 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
- "solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "solana_libra_vm_runtime"
 version = "0.0.1-sol4"
@@ -6021,7 +5873,6 @@ dependencies = [
 "checksum bs58 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c95ee6bba9d950218b6cc910cf62bc9e0a171d0f4537e3627b0f54d08549b188"
 "checksum bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b170cd256a3f9fa6b9edae3e44a7dfdfc77e8124dbc3e2612d75f9c3e2396dae"
 "checksum bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e0a692f1c740e7e821ca71a22cf99b9b2322dfa94d10f71443befb1797b3946a"
-"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
 "checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
 "checksum bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cd4ae9e585e783756cd14b0ea21863acdfbb6383664ac2f7c9ef8d180a14727"
 "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
@@ -6059,7 +5910,6 @@ dependencies = [
 "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
 "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
 "checksum core_affinity 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7f8a03115cc34fb0d7c321dd154a3914b3ca082ccc5c11d91bf7117dbbe7171f"
-"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
 "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum criterion-stats 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "387df94cb74ada1b33e10ce034bb0d9360cc73edb5063e7d7d4120a40ee1c9d2"
 "checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
@@ -6202,7 +6052,6 @@ dependencies = [
 "checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
-"checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
 "checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
 "checksum memsec 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ccabb92f665f997bcb4f3ade019a8e07315148d8bcef3e65fbc5dbd65a22eb04"
 "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
@@ -6373,20 +6222,16 @@ dependencies = [
 "checksum solana_libra_failure_macros 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "f9fb2b4161a853c17f0074719427551d34cb4c68affa098a0ac5d0721034607e"
 "checksum solana_libra_ir_to_bytecode 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "290f4322e54e0ba347729cf17bd1f9145d49dcf927ea3d1d1817e224692ebad6"
 "checksum solana_libra_ir_to_bytecode_syntax 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "90f56eccaf25ef145f814f82eeb5dcfbac1d4b025b9e4d15b0b760987afa4ab0"
-"checksum solana_libra_language_e2e_tests 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "1c895e0870ea3ba0fd527f194b191843527e7d4b1311868279a328363ebf1de8"
 "checksum solana_libra_logger 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "9b43115806f8f24055c36af78e0f9af9f93952d6ee2806a6bfb569834dd05ac9"
 "checksum solana_libra_metrics 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "238dcafcf6934a501732981138c70c577b59371ed18ef2dac572e0ad2d836aed"
 "checksum solana_libra_nibble 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9937c68d78bb2287bd180f10539766974ac4f6ddde8946bf78a3dce5a0a654"
 "checksum solana_libra_proptest_helpers 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "6bde114ef094aa4b43eeaa01ef1bf3a6f9dc9608988737bf12a93186f14dbfa3"
-"checksum solana_libra_prost_ext 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "139efe49108d6f8e26053ef2d03aff4e0c43612b8c91a3a7c59bb5cb15a50d72"
 "checksum solana_libra_state_view 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "542d26b2c35dc879f77a311b657c5f89caae34d3ecef115061062a720c12f619"
 "checksum solana_libra_stdlib 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "b462ea5089ecd469f5d8b419b7b31cac30a1d5957ad6d222792ab6077a5fed49"
 "checksum solana_libra_tools 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "5214c4a84a097b03ddd1b73a6b287252e4b77226658f0b6abcbab634325d5b5c"
-"checksum solana_libra_transaction_builder 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "de6960c4114f9f96b6e08608ff95dcf7ae0d6aee86a1f3fb3bdfe0a77e077be8"
 "checksum solana_libra_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "06f40fce42cdb6ab6b12bb150d0336eacc1170dc62db4cdef77bca47b41c0a79"
 "checksum solana_libra_vm 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "14ecbd2cce1e5375b450262f119d18015fb3370eb1004b8098564d9634fe26b7"
 "checksum solana_libra_vm_cache_map 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "37fa2e1f00a87514cd2169149a5f81a89279703b2523979688d6ef84081a4690"
-"checksum solana_libra_vm_genesis 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "d2c98f2663f28ff221b119a471fd790dbbf1e87664fce4c40421120252c09b8e"
 "checksum solana_libra_vm_runtime 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "ff9f8a7b8212dc4ece5d93f2839896e633c34d7463856e4a555cbcb5c67e9c26"
 "checksum solana_libra_vm_runtime_types 0.0.1-sol4 (registry+https://github.com/rust-lang/crates.io-index)" = "254c23c8f30e7c82ae4dc6694e743400d674c66d371b700eec03378ba994f00b"
 "checksum solana_rbpf 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3a42509c38aaba4e771b6067d8d7bbfeb83e2b314fb2f3da401acdec9b8425ba"

archiver-utils/Cargo.toml

@@ -11,7 +11,6 @@ edition = "2018"
 [dependencies]
 log = "0.4.8"
 rand = "0.6.5"
-rand_chacha = "0.1.1"
 solana-chacha = { path = "../chacha", version = "0.24.0" }
 solana-chacha-sys = { path = "../chacha-sys", version = "0.24.0" }
 solana-ledger = { path = "../ledger", version = "0.24.0" }

bench-exchange/Cargo.toml

@@ -9,18 +9,13 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-bincode = "1.2.1"
-bs58 = "0.3.0"
 clap = "2.32.0"
-env_logger = "0.7.1"
 itertools = "0.8.2"
 log = "0.4.8"
 num-derive = "0.3"
 num-traits = "0.2"
 rand = "0.6.5"
 rayon = "1.2.0"
-serde = "1.0.104"
-serde_derive = "1.0.103"
 serde_json = "1.0.46"
 serde_yaml = "0.8.11"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }
@@ -34,8 +29,6 @@ solana-metrics = { path = "../metrics", version = "0.24.0" }
 solana-net-utils = { path = "../net-utils", version = "0.24.0" }
 solana-runtime = { path = "../runtime", version = "0.24.0" }
 solana-sdk = { path = "../sdk", version = "0.24.0" }
-untrusted = "0.7.0"
-ws = "0.9.1"
 
 [dev-dependencies]
 solana-local-cluster = { path = "../local-cluster", version = "0.24.0" }

bench-tps/Cargo.toml

@@ -12,8 +12,6 @@ bincode = "1.2.1"
 clap = "2.33.0"
 log = "0.4.8"
 rayon = "1.2.0"
-serde = "1.0.104"
-serde_derive = "1.0.103"
 serde_json = "1.0.46"
 serde_yaml = "0.8.11"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }

client/Cargo.toml

@@ -13,7 +13,6 @@ bincode = "1.2.1"
 bs58 = "0.3.0"
 jsonrpc-core = "14.0.5"
 log = "0.4.8"
-rand = "0.6.5"
 rayon = "1.2.0"
 reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls"] }
 serde = "1.0.104"

core/Cargo.toml

@@ -19,7 +19,6 @@ bs58 = "0.3.0"
 byteorder = "1.3.2"
 chrono = { version = "0.4.10", features = ["serde"] }
 core_affinity = "0.5.10"
-crc = { version = "1.8.1", optional = true }
 crossbeam-channel = "0.3"
 fs_extra = "1.1.0"
 indexmap = "1.3"
@@ -31,7 +30,6 @@ jsonrpc-pubsub = "14.0.5"
 jsonrpc-ws-server = "14.0.5"
 libc = "0.2.66"
 log = "0.4.8"
-memmap = { version = "0.7.0", optional = true }
 nix = "0.17.0"
 num-traits = "0.2"
 rand = "0.6.5"
@@ -60,7 +58,6 @@ solana-storage-program = { path = "../programs/storage", version = "0.24.0" }
 solana-vote-program = { path = "../programs/vote", version = "0.24.0" }
 solana-vote-signer = { path = "../vote-signer", version = "0.24.0" }
 solana-sys-tuner = { path = "../sys-tuner", version = "0.24.0" }
-symlink = "0.1.0"
 sys-info = "0.5.9"
 tempfile = "3.1.0"
 thiserror = "1.0"
@@ -68,7 +65,6 @@ tokio = "0.1"
 tokio-codec = "0.1"
 tokio-fs = "0.1"
 tokio-io = "0.1"
-untrusted = "0.7.0"
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.24.0" }
 reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] }
 trees = "0.2.1"

core/src/banking_stage.rs

@@ -660,10 +660,7 @@ impl BankingStage {
         transactions
             .into_iter()
             .zip(indexes)
-            .filter_map(|(tx, index)| match tx {
+            .filter_map(|(tx, index)| tx.map(|tx| (tx, index)))
-                None => None,
-                Some(tx) => Some((tx, index)),
-            })
             .unzip()
     }
 

core/src/cluster_info.rs

@@ -402,8 +402,7 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| x.id != me.id)
+            .filter(|x| x.id != me.id && ContactInfo::is_valid_address(&x.rpc))
-            .filter(|x| ContactInfo::is_valid_address(&x.rpc))
             .cloned()
             .collect()
     }
@@ -429,10 +428,8 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| x.id != me)
+            // shred_version not considered for gossip peers (ie, spy nodes do not set shred_version)
-            /* shred_version not considered for gossip peers (ie, spy nodes do not set
+            .filter(|x| x.id != me && ContactInfo::is_valid_address(&x.gossip))
-            shred_version) */
-            .filter(|x| ContactInfo::is_valid_address(&x.gossip))
             .cloned()
             .collect()
     }
@@ -445,9 +442,11 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| ContactInfo::is_valid_address(&x.tvu))
+            .filter(|x| {
-            .filter(|x| !ClusterInfo::is_archiver(x))
+                ContactInfo::is_valid_address(&x.tvu)
-            .filter(|x| x.id != me.id)
+                    && !ClusterInfo::is_archiver(x)
+                    && x.id != me.id
+            })
             .cloned()
             .collect()
     }
@@ -460,10 +459,12 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| ContactInfo::is_valid_address(&x.tvu))
+            .filter(|x| {
-            .filter(|x| !ClusterInfo::is_archiver(x))
+                ContactInfo::is_valid_address(&x.tvu)
-            .filter(|x| x.id != me.id)
+                    && !ClusterInfo::is_archiver(x)
-            .filter(|x| x.shred_version == me.shred_version)
+                    && x.id != me.id
+                    && x.shred_version == me.shred_version
+            })
             .cloned()
             .collect()
     }
@@ -476,8 +477,7 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| ContactInfo::is_valid_address(&x.storage_addr))
+            .filter(|x| ContactInfo::is_valid_address(&x.storage_addr) && x.id != me.id)
-            .filter(|x| x.id != me.id)
             .cloned()
             .collect()
     }
@@ -490,9 +490,11 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| ContactInfo::is_valid_address(&x.storage_addr))
+            .filter(|x| {
-            .filter(|x| x.id != me.id)
+                ContactInfo::is_valid_address(&x.storage_addr)
-            .filter(|x| x.shred_version == me.shred_version)
+                    && x.id != me.id
+                    && x.shred_version == me.shred_version
+            })
             .cloned()
             .collect()
     }
@@ -505,10 +507,12 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| x.id != me.id)
+            .filter(|x| {
-            .filter(|x| x.shred_version == me.shred_version)
+                x.id != me.id
-            .filter(|x| ContactInfo::is_valid_address(&x.tvu))
+                    && x.shred_version == me.shred_version
-            .filter(|x| ContactInfo::is_valid_address(&x.tvu_forwards))
+                    && ContactInfo::is_valid_address(&x.tvu)
+                    && ContactInfo::is_valid_address(&x.tvu_forwards)
+            })
             .cloned()
             .collect()
     }
@@ -518,13 +522,15 @@ impl ClusterInfo {
         let me = self.my_data();
         ClusterInfo::tvu_peers(self)
             .into_iter()
-            .filter(|x| x.id != me.id)
-            .filter(|x| x.shred_version == me.shred_version)
-            .filter(|x| ContactInfo::is_valid_address(&x.gossip))
             .filter(|x| {
-                self.get_epoch_state_for_node(&x.id, None)
+                x.id != me.id
-                    .map(|(epoch_slots, _)| epoch_slots.lowest <= slot)
+                    && x.shred_version == me.shred_version
-                    .unwrap_or_else(|| /* fallback to legacy behavior */ true)
+                    && ContactInfo::is_valid_address(&x.gossip)
+                    && {
+                        self.get_epoch_state_for_node(&x.id, None)
+                            .map(|(epoch_slots, _)| epoch_slots.lowest <= slot)
+                            .unwrap_or_else(|| /* fallback to legacy behavior */ true)
+                    }
             })
             .collect()
     }
@@ -621,8 +627,7 @@ impl ClusterInfo {
             .table
             .values()
             .filter_map(|x| x.value.contact_info())
-            .filter(|x| x.id != me)
+            .filter(|x| x.id != me && ContactInfo::is_valid_address(&x.tpu))
-            .filter(|x| ContactInfo::is_valid_address(&x.tpu))
             .cloned()
             .collect()
     }
@@ -984,12 +989,11 @@ impl ClusterInfo {
                     .and_then(CrdsValue::contact_info)
                     .map(|p| (p.gossip, messages))
             })
-            .map(|(peer, msgs)| {
+            .flat_map(|(peer, msgs)| {
                 Self::split_gossip_messages(msgs)
                     .into_iter()
                     .map(move |payload| (peer, Protocol::PushMessage(self_id, payload)))
             })
-            .flatten()
             .collect()
     }
 

core/src/rpc.rs

@@ -100,10 +100,7 @@ impl JsonRpcRequestProcessor {
         commitment: Option<CommitmentConfig>,
     ) -> RpcResponse<Option<RpcAccount>> {
         let bank = &*self.bank(commitment);
-        match pubkey {
+        pubkey.and_then(|key| new_response(bank, bank.get_account(&key).map(RpcAccount::encode)))
-            Ok(key) => new_response(bank, bank.get_account(&key).map(RpcAccount::encode)),
-            Err(e) => Err(e),
-        }
     }
 
     pub fn get_minimum_balance_for_rent_exemption(
@@ -148,10 +145,7 @@ impl JsonRpcRequestProcessor {
         commitment: Option<CommitmentConfig>,
     ) -> RpcResponse<u64> {
         let bank = &*self.bank(commitment);
-        match pubkey {
+        pubkey.and_then(|key| new_response(bank, bank.get_balance(&key)))
-            Ok(key) => new_response(bank, bank.get_balance(&key)),
-            Err(e) => Err(e),
-        }
     }
 
     fn get_recent_blockhash(

genesis/Cargo.toml

@@ -12,9 +12,7 @@ homepage = "https://solana.com/"
 base64 = "0.11.0"
 clap = "2.33.0"
 chrono = "0.4"
-hex = "0.4.0"
 serde = "1.0.104"
-serde_derive = "1.0.103"
 serde_json = "1.0.46"
 serde_yaml = "0.8.11"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }

install/Cargo.toml

@@ -11,7 +11,6 @@ homepage = "https://solana.com/"
 [dependencies]
 atty = "0.2.11"
 bincode = "1.2.1"
-bs58 = "0.3.0"
 bzip2 = "0.3.3"
 chrono = { version = "0.4.10", features = ["serde"] }
 clap = { version = "2.33.0" }
@@ -20,7 +19,6 @@ ctrlc = { version = "3.1.3", features = ["termination"] }
 dirs = "2.0.2"
 indicatif = "0.14.0"
 lazy_static = "1.4.0"
-log = "0.4.8"
 nix = "0.17.0"
 reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "rustls-tls"] }
 serde = "1.0.104"

keygen/Cargo.toml

@@ -13,7 +13,6 @@ bs58 = "0.3.0"
 clap = "2.33"
 dirs = "2.0.2"
 num_cpus = "1.12.0"
-rpassword = "4.0"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }
 solana-cli-config = { path = "../cli-config", version = "0.24.0" }
 solana-sdk = { path = "../sdk", version = "0.24.0" }

ledger-tool/Cargo.toml

@@ -9,11 +9,8 @@ license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-bincode = "1.2.1"
 clap = "2.33.0"
 histogram = "*"
-serde = "1.0.104"
-serde_derive = "1.0.103"
 serde_json = "1.0.46"
 serde_yaml = "0.8.11"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }

ledger/Cargo.toml

@@ -15,8 +15,6 @@ bzip2 = "0.3.3"
 chrono = { version = "0.4.10", features = ["serde"] }
 crossbeam-channel = "0.3"
 dir-diff = "0.3.2"
-dlopen = "0.1.8"
-dlopen_derive = "0.1.4"
 sha2 = "0.8.1"
 fs_extra = "1.1.0"
 itertools = "0.8.2"
@@ -28,7 +26,6 @@ rayon = "1.2.0"
 reed-solomon-erasure = { package = "solana-reed-solomon-erasure", version = "4.0.1-3", features = ["simd-accel"] }
 serde = "1.0.104"
 serde_bytes = "0.11.3"
-serde_derive = "1.0.103"
 solana-client = { path = "../client", version = "0.24.0" }
 solana-genesis-programs = { path = "../genesis-programs", version = "0.24.0" }
 solana-logger = { path = "../logger", version = "0.24.0" }

ledger/src/leader_schedule_cache.rs

@@ -193,11 +193,8 @@ impl LeaderScheduleCache {
             cache_result
         } else {
             let (epoch, slot_index) = bank.get_epoch_and_slot_index(slot);
-            if let Some(epoch_schedule) = self.compute_epoch_schedule(epoch, bank) {
+            self.compute_epoch_schedule(epoch, bank)
-                Some(epoch_schedule[slot_index])
+                .map(|epoch_schedule| epoch_schedule[slot_index])
-            } else {
-                None
-            }
         }
     }
 

local-cluster/Cargo.toml

@@ -27,7 +27,6 @@ solana-stake-program = { path = "../programs/stake", version = "0.24.0" }
 solana-storage-program = { path = "../programs/storage", version = "0.24.0" }
 solana-vest-program = { path = "../programs/vest", version = "0.24.0" }
 solana-vote-program = { path = "../programs/vote", version = "0.24.0" }
-symlink = "0.1.0"
 tempfile = "3.1.0"
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.24.0" }
 

log-analyzer/Cargo.toml

@@ -12,10 +12,7 @@ publish = false
 [dependencies]
 byte-unit = "3.0.3"
 clap = "2.33.0"
-log = "0.4.8"
-semver = "0.9.0"
 serde = "1.0.104"
-serde_derive = "1.0.103"
 serde_json = "1.0.46"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }
 solana-logger = { path = "../logger", version = "0.24.0" }

net-shaper/Cargo.toml

@@ -11,10 +11,7 @@ publish = false
 
 [dependencies]
 clap = "2.33.0"
-log = "0.4.8"
-semver = "0.9.0"
 serde = "1.0.104"
-serde_derive = "1.0.103"
 serde_json = "1.0.46"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }
 solana-logger = { path = "../logger", version = "0.24.0" }

net-utils/src/lib.rs

@@ -338,10 +338,8 @@ pub fn bind_to(port: u16, reuseaddr: bool) -> io::Result<UdpSocket> {
 
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port);
 
-    match sock.bind(&SockAddr::from(addr)) {
+    sock.bind(&SockAddr::from(addr))
-        Ok(_) => Result::Ok(sock.into_udp_socket()),
+        .and_then(|_| Result::Ok(sock.into_udp_socket()))
-        Err(err) => Err(err),
-    }
 }
 
 // binds both a UdpSocket and a TcpListener
@@ -350,13 +348,9 @@ pub fn bind_common(port: u16, reuseaddr: bool) -> io::Result<(UdpSocket, TcpList
 
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port);
     let sock_addr = SockAddr::from(addr);
-    match sock.bind(&sock_addr) {
+    sock.bind(&sock_addr).and_then(|_| {
-        Ok(_) => match TcpListener::bind(&addr) {
+        TcpListener::bind(&addr).and_then(|listener| Result::Ok((sock.into_udp_socket(), listener)))
-            Ok(listener) => Result::Ok((sock.into_udp_socket(), listener)),
+    })
-            Err(err) => Err(err),
-        },
-        Err(err) => Err(err),
-    }
 }
 
 pub fn find_available_port_in_range(range: PortRange) -> io::Result<u16> {

perf/Cargo.toml

@@ -14,7 +14,6 @@ dlopen = "0.1.8"
 bincode = "1.2.1"
 rayon = "1.2.0"
 serde = "1.0.104"
-serde_derive = "1.0.103"
 dlopen_derive = "0.1.4"
 lazy_static = "1.4.0"
 log = "0.4.8"

programs/bpf_loader/Cargo.toml

@@ -13,7 +13,6 @@ bincode = "1.2.1"
 byteorder = "1.3.2"
 libc = "0.2.66"
 log = "0.4.8"
-serde = "1.0.104"
 solana-logger = { path = "../../logger", version = "0.24.0" }
 solana-sdk = { path = "../../sdk", version = "0.24.0" }
 solana_rbpf = "=0.1.20"

programs/btc_spv/Cargo.toml

@@ -10,7 +10,6 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.2.1"
-chrono = { version = "0.4.10", features = ["serde"] }
 log = "0.4.2"
 num-derive = "0.3"
 num-traits = "0.2"

programs/btc_spv_bin/Cargo.toml

@@ -13,7 +13,6 @@ clap="2.33.0"
 reqwest = { version = "0.10.1", default-features = false, features = ["blocking", "json", "rustls-tls"] }
 serde="1.0.104"
 serde_derive="1.0.103"
-serde_json = "1.0.46"
 hex = "0.3.2"
 
 [[bin]]

programs/config/src/config_processor.rs

@@ -96,7 +96,7 @@ pub fn process_instruction(
         return Err(InstructionError::InvalidInstructionData);
     }
 
-    config_keyed_account.try_account_ref_mut()?.data[0..data.len()].copy_from_slice(&data);
+    config_keyed_account.try_account_ref_mut()?.data[..data.len()].copy_from_slice(&data);
     Ok(())
 }
 

programs/failure/Cargo.toml

@@ -9,7 +9,6 @@ homepage = "https://solana.com/"
 edition = "2018"
 
 [dependencies]
-log = "0.4.8"
 solana-sdk = { path = "../../sdk", version = "0.24.0" }
 
 [dev-dependencies]

programs/librapay/Cargo.toml

@@ -15,7 +15,6 @@ solana-logger = { path = "../../logger", version = "0.24.0" }
 solana-move-loader-program = { path = "../move_loader", version = "0.24.0" }
 solana-runtime = { path = "../../runtime", version = "0.24.0" }
 solana-sdk = { path = "../../sdk", version = "0.24.0" }
-language_e2e_tests = { version = "0.0.1-sol4", package = "solana_libra_language_e2e_tests" }
 types = { version = "0.0.1-sol4", package = "solana_libra_types" }
 
 [lib]

programs/move_loader/Cargo.toml

@@ -10,9 +10,7 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.2.0"
-byteorder = "1.3.2"
 indexmap = "1.1.0"
-libc = "0.2.65"
 log = "0.4.8"
 serde = "1.0.104"
 serde_bytes = "0.11"
@@ -25,7 +23,6 @@ bytecode_verifier = { version = "0.0.1-sol4", package = "solana_libra_bytecode_v
 canonical_serialization = { version = "0.0.1-sol4", package = "solana_libra_canonical_serialization" }
 compiler = { version = "0.0.1-sol4", package = "solana_libra_compiler" }
 failure = { version = "0.0.1-sol4", package = "solana_libra_failure_ext" }
-language_e2e_tests = { version = "0.0.1-sol4", package = "solana_libra_language_e2e_tests" }
 state_view = { version = "0.0.1-sol4", package = "solana_libra_state_view" }
 stdlib = { version = "0.0.1-sol4", package = "solana_libra_stdlib" }
 types = { version = "0.0.1-sol4", package = "solana_libra_types" }

programs/move_loader/src/data_store.rs

@@ -65,10 +65,7 @@ impl DataStore {
     /// Read an account's resource
     pub fn read_account_resource(&self, addr: &AccountAddress) -> Option<AccountResource> {
         let access_path = create_access_path(&addr, account_config::account_struct_tag());
-        match self.data.get(&access_path) {
+        self.data.get(&access_path).and_then(|blob| { SimpleDeserializer::deserialize(blob).ok() })
-            None => None,
-            Some(blob) => SimpleDeserializer::deserialize(blob).ok(),
-        }
     }
 
     /// Sets a (key, value) pair within this data store.

programs/ownable/Cargo.toml

@@ -10,8 +10,6 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.2.1"
-serde = "1.0.104"
-serde_derive = "1.0.103"
 solana-sdk = { path = "../../sdk", version = "0.24.0" }
 num-derive = "0.3"
 num-traits = "0.2"

programs/stake/Cargo.toml

@@ -13,7 +13,6 @@ bincode = "1.2.1"
 log = "0.4.8"
 num-derive = "0.3"
 num-traits = "0.2"
-rand = "0.6.5"
 serde = "1.0.104"
 serde_derive = "1.0.103"
 solana-logger = { path = "../../logger", version = "0.24.0" }

programs/vest/Cargo.toml

@@ -11,7 +11,6 @@ edition = "2018"
 [dependencies]
 bincode = "1.2.1"
 chrono = { version = "0.4.10", features = ["serde"] }
-log = "0.4.8"
 num-derive = "0.2"
 num-traits = "0.2"
 serde = "1.0.104"

runtime/Cargo.toml

@@ -22,7 +22,6 @@ rand = "0.6.5"
 rayon = "1.2.0"
 serde = { version = "1.0.104", features = ["rc"] }
 serde_derive = "1.0.103"
-serde_json = "1.0.46"
 solana-logger = { path = "../logger", version = "0.24.0" }
 solana-measure = { path = "../measure", version = "0.24.0" }
 solana-metrics = { path = "../metrics", version = "0.24.0" }

runtime/src/accounts_index.rs

@@ -75,11 +75,8 @@ impl<T: Clone> AccountsIndex<T> {
     ) -> Option<(RwLockReadGuard<SlotList<T>>, usize)> {
         self.account_maps.get(pubkey).and_then(|list| {
             let lock = list.read().unwrap();
-            if let Some(found_index) = self.latest_slot(ancestors, &lock) {
+            let found_index = self.latest_slot(ancestors, &lock)?;
-                Some((lock, found_index))
+            Some((lock, found_index))
-            } else {
-                None
-            }
         })
     }
 

runtime/src/nonce_utils.rs

@@ -22,8 +22,7 @@ pub fn transaction_uses_durable_nonce(tx: &Transaction) -> Option<&CompiledInstr
                 Some(program_id) => system_program::check_id(&program_id),
                 _ => false,
             }
-        })
+        } &&  match limited_deserialize(&maybe_ix.data) {
-        .filter(|maybe_ix| match limited_deserialize(&maybe_ix.data) {
             Ok(SystemInstruction::AdvanceNonceAccount) => true,
             _ => false,
         })

runtime/src/status_cache.rs

@@ -87,8 +87,7 @@ impl<T: Serialize + Clone> StatusCache<T> {
         if let Some(stored_forks) = sigmap.get(&sig_slice) {
             let res = stored_forks
                 .iter()
-                .filter(|(f, _)| ancestors.get(f).is_some() || self.roots.get(f).is_some())
+                .find(|(f, _)| ancestors.get(f).is_some() || self.roots.get(f).is_some())
-                .nth(0)
                 .cloned();
             if res.is_some() {
                 return res;

sdk-c/Cargo.toml

@@ -20,7 +20,6 @@ rand_chacha = "0.1.1"
 rand_core = { version = ">=0.2, <0.4", default-features = false }
 solana-sdk = { path = "../sdk", version = "0.24.0" }
 ed25519-dalek = "1.0.0-pre.1"
-sha2 = "0.8.1"
 
 [build-dependencies]
-cbindgen = "0.13.0"
+cbindgen = "0.13.0"

sys-tuner/Cargo.toml

@@ -13,7 +13,6 @@ publish = true
 clap = "2.33.0"
 log = "0.4.8"
 libc = "0.2.66"
-semver = "0.9.0"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }
 solana-logger = { path = "../logger", version = "0.24.0" }
 

upload-perf/Cargo.toml

@@ -10,7 +10,6 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-log = "0.4.8"
 serde_json = "1.0.46"
 solana-metrics = { path = "../metrics", version = "0.24.0" }
 

validator/Cargo.toml

@@ -32,7 +32,6 @@ solana-sdk = { path = "../sdk", version = "0.24.0" }
 solana-vote-program = { path = "../programs/vote", version = "0.24.0" }
 solana-vote-signer = { path = "../vote-signer", version = "0.24.0" }
 tar = "0.4.26"
-tempfile = "3.1.0"
 
 [target."cfg(unix)".dependencies]
 gag = "0.1.10"

vote-signer/Cargo.toml

@@ -9,13 +9,11 @@ license = "Apache-2.0"
 homepage = "https://solana.com/"
 
 [dependencies]
-bs58 = "0.3.0"
 clap = "2.33"
 jsonrpc-core = "14.0.5"
 jsonrpc-derive = "14.0.5"
 jsonrpc-http-server = "14.0.5"
 log = "0.4.8"
-serde = "1.0.104"
 serde_json = "1.0.46"
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }
 solana-metrics = { path = "../metrics", version = "0.24.0" }