chore(deps): make tokio required dependency (gakonst#1322)

* chore(deps): make tokio non optional * chore(deps): bump tokio 0.18 * Update ethers-providers/Cargo.toml Co-authored-by: Georgios Konstantopoulos <[email protected]>
dbelv · May 29, 2022 · d2c4686 · d2c4686
1 parent 299329d
commit d2c4686
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 61 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -101,7 +101,7 @@ eyre = "0.6"
 rand = "0.8.5"
 serde = { version = "1.0.124", features = ["derive"] }
 serde_json = "1.0.64"
-tokio = { version = "1.5", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.18", features = ["macros", "rt-multi-thread"] }
 hex = "0.4.3"
 bytes = "1.1.0"
 

diff --git a/ethers-contract/Cargo.toml b/ethers-contract/Cargo.toml
@@ -35,7 +35,7 @@ ethers-derive-eip712 = { version = "^0.2.0", path = "../ethers-core/ethers-deriv
 ethers-solc = { version = "^0.3.0", path = "../ethers-solc", default-features = false }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-tokio = { version = "1.5", default-features = false, features = ["macros"] }
+tokio = { version = "1.18", default-features = false, features = ["macros"] }
 
 [features]
 eip712 = ["ethers-derive-eip712", "ethers-core/eip712"]

diff --git a/ethers-etherscan/Cargo.toml b/ethers-etherscan/Cargo.toml
@@ -26,7 +26,7 @@ semver = "1.0.9"
 
 [dev-dependencies]
 tempfile = "3.3.0"
-tokio = { version = "1.5", features = ["macros", "rt-multi-thread", "time"] }
+tokio = { version = "1.18", features = ["macros", "rt-multi-thread", "time"] }
 serial_test = "0.6.0"
 tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt"] }
 

diff --git a/ethers-middleware/Cargo.toml b/ethers-middleware/Cargo.toml
@@ -36,7 +36,7 @@ serde_json = { version = "1.0.64", default-features = false }
 instant = {version = "0.1.12", features = ["now"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tokio = { version = "1.5" }
+tokio = { version = "1.18" }
 
 [dev-dependencies]
 hex = { version = "0.4.3", default-features = false, features = ["std"] }
@@ -47,7 +47,7 @@ ethers-solc = { version = "^0.3.0", path = "../ethers-solc", default-features =
 serial_test = "0.6.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-tokio = { version = "1.5", default-features = false, features = ["rt", "macros", "time"] }
+tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }
 
 [features]
 celo = ["ethers-core/celo", "ethers-providers/celo", "ethers-signers/celo", "ethers-contract/celo"]
diff --git a/ethers-providers/Cargo.toml b/ethers-providers/Cargo.toml
@@ -44,8 +44,7 @@ hashers = "1.0.1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 # tokio
-tokio-util = { version = "0.7.2", default-features = false, features = ["io"], optional = true }
-tokio = { version = "1.5", default-features = false, optional = true }
+tokio = { version = "1.18", features = ["time"] }
 tokio-tungstenite = { version = "0.17.1", default-features = false, features = ["connect"], optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -58,14 +57,14 @@ wasm-timer = "0.2"
 parking_lot = { version = "0.11", features = ["wasm-bindgen"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-tokio = { version = "1.5", default-features = false, features = ["rt", "macros", "time"] }
+tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }
 tempfile = "3.3.0"
 
 [features]
 default = ["ws", "rustls"]
 celo = ["ethers-core/celo"]
-ws = ["tokio", "tokio-tungstenite", "futures-channel"]
-ipc = ["tokio", "tokio/io-util", "tokio-util", "bytes", "futures-channel"]
+ws = ["tokio-tungstenite", "futures-channel"]
+ipc = ["tokio/io-util", "bytes", "futures-channel"]
 
 openssl = ["tokio-tungstenite/native-tls", "reqwest/native-tls"]
 # we use the webpki roots so we can build static binaries w/o any root cert dependencies

diff --git a/ethers-signers/Cargo.toml b/ethers-signers/Cargo.toml
@@ -49,7 +49,7 @@ yubihsm = { version = "0.40.0", features = ["secp256k1", "usb", "mockhsm"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 yubihsm = { version = "0.40.0", features = ["secp256k1", "usb", "mockhsm"] }
-tokio = { version = "1.5", default-features = false, features = ["macros", "rt"] }
+tokio = { version = "1.18", default-features = false, features = ["macros", "rt"] }
 tempfile = "3.3.0"
 
 [features]

diff --git a/ethers-solc/Cargo.toml b/ethers-solc/Cargo.toml
@@ -19,7 +19,7 @@ serde_json = "1.0.68"
 serde = { version = "1.0.130", features = ["derive"] }
 semver = { version = "1.0.9", features = ["serde"] }
 walkdir = "2.3.2"
-tokio = { version = "1.15.0", default-features = false, features = ["rt"] }
+tokio = { version = "1.18", default-features = false, features = ["rt"] }
 futures-util = { version = "^0.3", optional = true }
 once_cell = "1.12.0"
 regex = "1.5.6"
@@ -59,7 +59,7 @@ tracing-subscriber = {version = "0.3", default-features = false, features = ["en
 rand = "0.8.5"
 pretty_assertions = "1.2.1"
 tempfile = "3.3.0"
-tokio = { version = "1.15.0", features = ["full"] }
+tokio = { version = "1.18", features = ["full"] }
 
 [[bench]]
 name = "compile_many"