From 91090a7509466f73d93620c3e93046c74da23a8a Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Mon, 12 Sep 2022 12:25:47 +0200
Subject: [PATCH] Bump tokio to 1.20.x

---
 .changelog/4928.internal.md               |  1 +
 Cargo.lock                                | 13 +++++++------
 client/Cargo.toml                         |  2 +-
 keymanager-lib/Cargo.toml                 |  2 +-
 runtime/Cargo.toml                        |  2 +-
 tests/runtimes/simple-keyvalue/Cargo.toml |  2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 .changelog/4928.internal.md

diff --git a/.changelog/4928.internal.md b/.changelog/4928.internal.md
new file mode 100644
index 00000000000..bf70a1f719b
--- /dev/null
+++ b/.changelog/4928.internal.md
@@ -0,0 +1 @@
+Bump tokio to 1.20.x
diff --git a/Cargo.lock b/Cargo.lock
index c86638b5815..a65b7f25de9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1876,7 +1876,7 @@ dependencies = [
  "oasis-cbor",
  "oasis-core-runtime",
  "thiserror",
- "tokio 1.19.2",
+ "tokio 1.20.1",
 ]
 
 [[package]]
@@ -1926,7 +1926,7 @@ dependencies = [
  "sgx-isa 0.3.3",
  "sp800-185",
  "tiny-keccak 2.0.2",
- "tokio 1.19.2",
+ "tokio 1.20.1",
  "x25519-dalek",
  "zeroize",
 ]
@@ -1984,7 +1984,7 @@ dependencies = [
  "tendermint-rpc",
  "thiserror",
  "tiny-keccak 2.0.2",
- "tokio 1.19.2",
+ "tokio 1.20.1",
  "x25519-dalek",
  "x509-parser",
  "yasna 0.5.0",
@@ -2758,7 +2758,7 @@ dependencies = [
  "oasis-core-tools",
  "simple-keymanager",
  "thiserror",
- "tokio 1.19.2",
+ "tokio 1.20.1",
  "x25519-dalek",
 ]
 
@@ -3198,10 +3198,11 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.19.2"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
 dependencies = [
+ "autocfg 1.1.0",
  "bytes 1.1.0",
  "libc",
  "memchr",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 6a88ed63ff4..32b41cd5293 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -12,5 +12,5 @@ cbor = { version = "0.5.0", package = "oasis-cbor" }
 anyhow = "1.0"
 thiserror = "1.0"
 futures = "0.3.17"
-tokio = { version = "1", features = ["rt", "sync"] }
+tokio = { version = "~1.20", features = ["rt", "sync"] }
 io-context = "0.2.0"
diff --git a/keymanager-lib/Cargo.toml b/keymanager-lib/Cargo.toml
index 60024510b48..f4fd42350e4 100644
--- a/keymanager-lib/Cargo.toml
+++ b/keymanager-lib/Cargo.toml
@@ -20,6 +20,6 @@ sgx-isa = { version = "0.3.3", features = ["sgxstd"] }
 sp800-185 = "0.2.0"
 tiny-keccak = { version = "2.0.2", features = ["sha3"] }
 x25519-dalek = "1.1.0"
-tokio = { version = "1", features = ["rt"] }
+tokio = { version = "~1.20", features = ["rt"] }
 zeroize = "1.4"
 rustc-hex = "2.0.1"
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index dbe8d4e6490..9db4f919b07 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -33,7 +33,7 @@ base64 = "0.13.0"
 rustc-hex = "2.0.1"
 rand = "0.7.3"
 futures = "0.3.17"
-tokio = { version = "1", features = ["rt", "sync"] }
+tokio = { version = "~1.20", features = ["rt", "sync"] }
 tendermint = "0.23.7"
 tendermint-proto = "0.23.7"
 tendermint-light-client = { version = "0.23.7", default-features = false }
diff --git a/tests/runtimes/simple-keyvalue/Cargo.toml b/tests/runtimes/simple-keyvalue/Cargo.toml
index d68e5135899..bcd7f295c47 100644
--- a/tests/runtimes/simple-keyvalue/Cargo.toml
+++ b/tests/runtimes/simple-keyvalue/Cargo.toml
@@ -33,7 +33,7 @@ thiserror = "1.0"
 io-context = "0.2.0"
 byteorder = "1.4.3"
 x25519-dalek = "1.1.0"
-tokio = { version = "1", features = ["rt"] }
+tokio = { version = "~1.20", features = ["rt"] }
 
 [build-dependencies]
 oasis-core-tools = { path = "../../../tools" }