chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)

* chore: bump clap from 2.33.3 to 3.1.8 (#206) Bumps [clap](https://github.com/clap-rs/clap) from 2.33.3 to 3.1.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@v2.33.3...v3.1.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump rand from 0.7.3 to 0.8.5 (#205) Bumps [rand](https://github.com/rust-random/rand) from 0.7.3 to 0.8.5. - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](rust-random/rand@0.7.3...0.8.5) --- updated-dependencies: - dependency-name: rand dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump eslint-plugin-import from 2.25.3 to 2.26.0 in /web3.js (#209) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.3 to 2.26.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.25.3...v2.26.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump tokio-util from 0.6.9 to 0.7.1 Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.6.9 to 0.7.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](tokio-rs/tokio@tokio-util-0.6.9...tokio-util-0.7.1) --- updated-dependencies: - dependency-name: tokio-util dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 0d773bd) # Conflicts: # Cargo.lock # accounts-bench/Cargo.toml # accounts-cluster-bench/Cargo.toml # banking-bench/Cargo.toml # bench-tps/Cargo.toml # bloom/Cargo.toml # clap-utils/Cargo.toml # cli/Cargo.toml # client/Cargo.toml # core/Cargo.toml # dos/Cargo.toml # entry/Cargo.toml # faucet/Cargo.toml # genesis/Cargo.toml # gossip/Cargo.toml # ledger-tool/Cargo.toml # local-cluster/Cargo.toml # merkle-root-bench/Cargo.toml # metrics/Cargo.toml # net-shaper/Cargo.toml # net-utils/Cargo.toml # perf/Cargo.toml # poh-bench/Cargo.toml # poh/Cargo.toml # programs/bpf_loader/Cargo.toml # programs/ed25519-tests/Cargo.toml # rbpf-cli/Cargo.toml # runtime/store-tool/Cargo.toml # sdk/cargo-build-bpf/Cargo.toml # sdk/cargo-test-bpf/Cargo.toml # stake-accounts/Cargo.toml # sys-tuner/Cargo.toml # transaction-dos/Cargo.toml # validator/Cargo.toml # watchtower/Cargo.toml
jstarry · Apr 20, 2022 · 7e63d25 · 7e63d25
1 parent 89cb21a
commit 7e63d25
Show file tree

Hide file tree

Showing 39 changed files with 280 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
@@ -10,9 +10,13 @@ publish = false
 
 [dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 clap = "3.1.8"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
+=======
+clap = "3.1.8"
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 log = "0.4.14"
 rayon = "1.5.1"
 solana-logger = { path = "../logger", version = "=1.9.17" }

diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
@@ -12,6 +12,7 @@ publish = false
 clap = "3.1.8"
 log = "0.4.14"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 rayon = "1.5.1"
 solana-account-decoder = { path = "../account-decoder", version = "=1.9.17" }
@@ -30,6 +31,8 @@ solana-test-validator = { path = "../test-validator", version = "=1.9.17" }
 solana-transaction-status = { path = "../transaction-status", version = "=1.9.17" }
 solana-version = { path = "../version", version = "=1.9.17" }
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 rayon = "1.5.2"
 solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" }

diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
@@ -13,6 +13,7 @@ clap = "2.33.1"
 crossbeam-channel = "0.5"
 log = "0.4.14"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 rayon = "1.5.1"
 solana-core = { path = "../core", version = "=1.9.17" }
@@ -27,6 +28,8 @@ solana-streamer = { path = "../streamer", version = "=1.9.17" }
 solana-sdk = { path = "../sdk", version = "=1.9.17" }
 solana-version = { path = "../version", version = "=1.9.17" }
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 rayon = "1.5.2"
 solana-core = { path = "../core", version = "=1.11.0" }

diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
@@ -10,8 +10,11 @@ publish = false
 
 [dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.1"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 clap = "3.1.8"
 crossbeam-channel = "0.5"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))

diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml
@@ -13,10 +13,13 @@ edition = "2021"
 bv = { version = "0.11.1", features = ["serde"] }
 fnv = "1.0.7"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 serde = { version = "1.0.133", features = ["rc"] }
 rayon = "1.5.1"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 log = "0.4.14"
 rand = "0.8.5"
 rayon = "1.5.2"

diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
@@ -11,12 +11,15 @@ edition = "2021"
 
 [dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.0"
 rpassword = "5.0"
 solana-perf = { path = "../perf", version = "=1.9.17" }
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.17" }
 solana-sdk = { path = "../sdk", version = "=1.9.17" }
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 chrono = "0.4"
 clap = "3.1.8"
 rpassword = "6.0"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -13,12 +13,16 @@ documentation = "https://docs.rs/solana-cli"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.1"
 criterion-stats = "0.3.0"
 ctrlc = { version = "3.2.1", features = ["termination"] }
 =======
 clap = "3.1.8"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
+=======
+clap = "3.1.8"
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 console = "0.15.0"
 const_format = "0.2.22"
 log = "0.4.14"

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -14,8 +14,11 @@ base64 = "0.13.0"
 bincode = "1.3.3"
 bs58 = "0.4.0"
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.0"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 bytes = "1.1.0"
 clap = "3.1.8"
 crossbeam-channel = "0.5"

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -27,12 +27,17 @@ histogram = "0.6.9"
 itertools = "0.10.1"
 log = "0.4.14"
 <<<<<<< HEAD
+<<<<<<< HEAD
 lru = "0.7.1"
 rand = "0.7.0"
 =======
 lru = "0.7.5"
 rand = "0.8.5"
 >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205))
+=======
+lru = "0.7.5"
+rand = "0.8.5"
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand_chacha = "0.2.2"
 raptorq = "1.6.4"
 rayon = "1.5.1"

diff --git a/dos/Cargo.toml b/dos/Cargo.toml
@@ -11,6 +11,7 @@ publish = false
 [dependencies]
 bincode = "1.3.3"
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.1"
 =======
 clap = {version = "3.1.8", features = ["derive", "cargo"]}
@@ -28,6 +29,10 @@ solana-streamer = { path = "../streamer", version = "=1.9.17" }
 solana-version = { path = "../version", version = "=1.9.17" }
 solana-client = { path = "../client", version = "=1.9.17" }
 =======
+=======
+clap = {version = "3.1.8", features = ["derive", "cargo"]}
+log = "0.4.14"
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 serde = "1.0.136"
 solana-client = { path = "../client", version = "=1.11.0" }

diff --git a/entry/Cargo.toml b/entry/Cargo.toml
@@ -14,6 +14,7 @@ dlopen = "0.1.8"
 dlopen_derive = "0.1.4"
 log = "0.4.11"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 rayon = "1.5.1"
 serde = "1.0.130"
@@ -25,6 +26,8 @@ solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.17"
 solana-sdk = { path = "../sdk", version = "=1.9.17" }
 bincode = "1.3.3"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 rayon = "1.5.2"
 serde = "1.0.136"

diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
@@ -13,8 +13,11 @@ edition = "2021"
 bincode = "1.3.3"
 byteorder = "1.4.3"
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 clap = "3.1"
 crossbeam-channel = "0.5"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))

diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
@@ -11,6 +11,7 @@ documentation = "https://docs.rs/solana-genesis"
 
 [dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 base64 = "0.12.3"
 clap = "2.33.1"
 serde = "1.0.130"
@@ -28,6 +29,8 @@ solana-version = { path = "../version", version = "=1.9.17" }
 solana-vote-program = { path = "../programs/vote", version = "=1.9.17" }
 tempfile = "3.2.0"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 base64 = "0.13.0"
 clap = "3.1.8"
 serde = "1.0.136"

diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
@@ -13,8 +13,11 @@ documentation = "https://docs.rs/solana-gossip"
 bincode = "1.3.3"
 bv = { version = "0.11.1", features = ["serde"] }
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.1"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 clap = "3.1.8"
 crossbeam-channel = "0.5"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))

diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
@@ -12,9 +12,12 @@ documentation = "https://docs.rs/solana-ledger-tool"
 [dependencies]
 bs58 = "0.4.0"
 <<<<<<< HEAD
+<<<<<<< HEAD
 bytecount = "0.6.2"
 clap = "2.33.1"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 clap = "3.1.8"
 crossbeam-channel = "0.5"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))

diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml
@@ -16,6 +16,7 @@ gag = "1.0.0"
 fs_extra = "1.2.0"
 log = "0.4.14"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 rayon = "1.5.1"
 solana-config-program = { path = "../programs/config", version = "=1.9.17" }
@@ -33,6 +34,8 @@ solana-streamer = { path = "../streamer", version = "=1.9.17" }
 solana-vote-program = { path = "../programs/vote", version = "=1.9.17" }
 tempfile = "3.2.0"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 rayon = "1.5.2"
 solana-client = { path = "../client", version = "=1.11.0" }

diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
@@ -10,9 +10,13 @@ publish = false
 
 [dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 clap = "3.1.8"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
+=======
+clap = "3.1.8"
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 log = "0.4.14"
 solana-logger = { path = "../logger", version = "=1.9.17" }
 solana-runtime = { path = "../runtime", version = "=1.9.17" }

diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml
@@ -19,9 +19,12 @@ solana-sdk = { path = "../sdk", version = "=1.9.17" }
 
 [dev-dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 serial_test = "0.5.1"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 env_logger = "0.9.0"
 rand = "0.8.5"
 serial_test = "0.6.0"

diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
@@ -11,6 +11,7 @@ publish = false
 
 [dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.1"
 serde = "1.0.130"
 serde_json = "1.0.72"
@@ -22,6 +23,9 @@ rand = "0.7.0"
 =======
 rand = "0.8.5"
 >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205))
+=======
+rand = "0.8.5"
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 clap = { version = "3.1.8", features = ["cargo"] }
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"

diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
@@ -12,17 +12,23 @@ edition = "2021"
 [dependencies]
 bincode = "1.3.3"
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.1"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 clap = { version = "3.1.8", features = ["cargo"] }
 crossbeam-channel = "0.5"
 >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206))
 log = "0.4.14"
 <<<<<<< HEAD
+<<<<<<< HEAD
 nix = "0.23.0"
 rand = "0.7.0"
 serde = "1.0.130"
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 nix = "0.23.1"
 rand = "0.8.5"
 serde = "1.0.136"

diff --git a/perf/Cargo.toml b/perf/Cargo.toml
@@ -20,6 +20,7 @@ bv = { version = "0.11.1", features = ["serde"] }
 fnv = "1.0.7"
 log = "0.4.14"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 rayon = "1.5.1"
 serde = "1.0.130"
@@ -30,6 +31,8 @@ solana-sdk = { path = "../sdk", version = "=1.9.17" }
 solana-vote-program = { path = "../programs/vote", version = "=1.9.17" }
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.17" }
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 rayon = "1.5.2"
 serde = "1.0.136"

diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
@@ -11,6 +11,7 @@ publish = false
 
 [dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 clap = "2.33.1"
 =======
 clap = { version = "3.1.8", features = ["cargo"] }
@@ -26,6 +27,10 @@ solana-measure = { path = "../measure", version = "=1.9.17" }
 solana-version = { path = "../version", version = "=1.9.17" }
 solana-perf = { path = "../perf", version = "=1.9.17" }
 =======
+=======
+clap = { version = "3.1.8", features = ["cargo"] }
+log = "0.4.14"
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 rayon = "1.5.2"
 solana-entry = { path = "../entry", version = "=1.11.0" }

diff --git a/poh/Cargo.toml b/poh/Cargo.toml
@@ -26,10 +26,13 @@ thiserror = "1.0"
 bincode = "1.3.3"
 matches = "0.1.9"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 solana-logger = { path = "../logger", version = "=1.9.17" }
 solana-perf = { path = "../perf", version = "=1.9.17" }
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 solana-logger = { path = "../logger", version = "=1.11.0" }
 solana-perf = { path = "../perf", version = "=1.11.0" }

diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml
@@ -23,9 +23,12 @@ thiserror = "1.0"
 
 [dev-dependencies]
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.3"
 solana-runtime = { path = "../../runtime", version = "=1.9.17" }
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 solana-runtime = { path = "../../runtime", version = "=1.11.0" }
 >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205))

diff --git a/programs/ed25519-tests/Cargo.toml b/programs/ed25519-tests/Cargo.toml
@@ -12,10 +12,13 @@ publish = false
 assert_matches = "1.5.0"
 ed25519-dalek = "=1.0.1"
 <<<<<<< HEAD
+<<<<<<< HEAD
 rand = "0.7.0"
 solana-program-test = { path = "../../program-test", version = "=1.9.17" }
 solana-sdk = { path = "../../sdk", version = "=1.9.17" }
 =======
+=======
+>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213))
 rand = "0.8.5"
 solana-program-test = { path = "../../program-test", version = "=1.11.0" }
 solana-sdk = { path = "../../sdk", version = "=1.11.0" }