From 270749185cc9a4ad18fe035226ee5a7c7197f325 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 5 Apr 2021 08:55:57 -0700
Subject: [PATCH] Adjust tokio version to just "1"

(cherry picked from commit 43feef7362ca258396fcae155f3ed8e153ad760a)

# Conflicts:
#	faucet/Cargo.toml
#	net-utils/Cargo.toml
---
 banks-client/Cargo.toml    |  2 +-
 banks-interface/Cargo.toml |  2 +-
 banks-server/Cargo.toml    |  2 +-
 core/Cargo.toml            |  2 +-
 faucet/Cargo.toml          | 10 ++++++++++
 ledger-tool/Cargo.toml     |  2 +-
 ledger/Cargo.toml          |  2 +-
 net-utils/Cargo.toml       |  7 +++++++
 program-test/Cargo.toml    |  2 +-
 9 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml
index a604465f05..0daf8443c1 100644
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -19,7 +19,7 @@ solana-banks-interface = { path = "../banks-interface", version = "=1.6.5" }
 solana-program = { path = "../sdk/program", version = "=1.6.5" }
 solana-sdk = { path = "../sdk", version = "=1.6.5" }
 tarpc = { version = "0.24.1", features = ["full"] }
-tokio = { version = "1.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 
 [dev-dependencies]
diff --git a/banks-interface/Cargo.toml b/banks-interface/Cargo.toml
index 95f38b1c11..76e280d226 100644
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -16,7 +16,7 @@ solana-sdk = { path = "../sdk", version = "=1.6.5" }
 tarpc = { version = "0.24.1", features = ["full"] }
 
 [dev-dependencies]
-tokio = { version = "1.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 
 [lib]
 crate-type = ["lib"]
diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
index f48ece048d..c033cdef1e 100644
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -19,7 +19,7 @@ solana-runtime = { path = "../runtime", version = "=1.6.5" }
 solana-sdk = { path = "../sdk", version = "=1.6.5" }
 solana-metrics = { path = "../metrics", version = "=1.6.5" }
 tarpc = { version = "0.24.1", features = ["full"] }
-tokio = { version = "1.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }
 tokio-stream = "0.1"
 
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 87a1f3921e..0dc3b18842 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -79,7 +79,7 @@ solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
 spl-token-v2-0 = { package = "spl-token", version = "=3.1.0", features = ["no-entrypoint"] }
 tempfile = "3.1.0"
 thiserror = "1.0"
-tokio = { version = "1.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 tokio_02 = { version = "0.2", package = "tokio", features = ["full"] }
 tokio-util = { version = "0.3", features = ["codec"] } # This crate needs to stay in sync with tokio_02, until that dependency can be removed
 solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.6.5" }
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 53517574ee..c5145e85a1 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -16,6 +16,7 @@ clap = "2.33"
 log = "0.4.11"
 serde = "1.0.122"
 serde_derive = "1.0.103"
+<<<<<<< HEAD
 solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
 solana-cli-config = { path = "../cli-config", version = "=1.6.5" }
 solana-logger = { path = "../logger", version = "=1.6.5" }
@@ -23,6 +24,15 @@ solana-metrics = { path = "../metrics", version = "=1.6.5" }
 solana-sdk = { path = "../sdk", version = "=1.6.5" }
 solana-version = { path = "../version", version = "=1.6.5" }
 tokio = { version = "1.1", features = ["full"] }
+=======
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
+solana-cli-config = { path = "../cli-config", version = "=1.7.0" }
+solana-logger = { path = "../logger", version = "=1.7.0" }
+solana-metrics = { path = "../metrics", version = "=1.7.0" }
+solana-sdk = { path = "../sdk", version = "=1.7.0" }
+solana-version = { path = "../version", version = "=1.7.0" }
+tokio = { version = "1", features = ["full"] }
+>>>>>>> 43feef736... Adjust tokio version to just "1"
 
 [lib]
 crate-type = ["lib"]
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 24e4b0dd27..bd38e9c7ed 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -36,7 +36,7 @@ solana-transaction-status = { path = "../transaction-status", version = "=1.6.5"
 solana-version = { path = "../version", version = "=1.6.5" }
 solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
 tempfile = "3.1.0"
-tokio = { version = "1.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 assert_cmd = "1.0"
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index 30ca919c7a..3d4700ea8a 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -52,7 +52,7 @@ solana-storage-proto = { path = "../storage-proto", version = "=1.6.5" }
 solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
 tempfile = "3.1.0"
 thiserror = "1.0"
-tokio = { version = "1.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 tokio-stream = "0.1"
 trees = "0.2.1"
 
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index b1eba350d6..0aca1b0af6 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -18,10 +18,17 @@ rand = "0.7.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 socket2 = "0.3.17"
+<<<<<<< HEAD
 solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
 solana-logger = { path = "../logger", version = "=1.6.5" }
 solana-version = { path = "../version", version = "=1.6.5" }
 tokio = { version = "1.1", features = ["full"] }
+=======
+solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
+solana-logger = { path = "../logger", version = "=1.7.0" }
+solana-version = { path = "../version", version = "=1.7.0" }
+tokio = { version = "1", features = ["full"] }
+>>>>>>> 43feef736... Adjust tokio version to just "1"
 url = "2.1.1"
 
 [lib]
diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml
index b7aac42354..cf004e0f66 100644
--- a/program-test/Cargo.toml
+++ b/program-test/Cargo.toml
@@ -22,7 +22,7 @@ solana-runtime = { path = "../runtime", version = "=1.6.5" }
 solana-sdk = { path = "../sdk", version = "=1.6.5" }
 solana-vote-program = { path = "../programs/vote", version = "=1.6.5" }
 thiserror = "1.0"
-tokio = { version = "1.1", features = ["full"] }
+tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 solana-stake-program = { path = "../programs/stake", version = "=1.6.5" }