Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

Commit

Permalink
Upgrade reqwest to 0.11.0 to ensure only 1 version of tokio used (#136)
Browse files Browse the repository at this point in the history
This commit also removes the patch stanza in the top level Cargo.toml as the
older tokio tungstenite (0.12.0) is pulled in when ethers is used as a
dependency on another project.
  • Loading branch information
jubos authored Jan 7, 2021
1 parent b63c272 commit 9a9f452
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 53 deletions.
51 changes: 5 additions & 46 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,3 @@ members = [
"./ethers-core",
"./ethers-middleware",
]

[patch.crates-io]
reqwest = { git = "https://github.com/seanmonstar/reqwest", branch = "master" }
tokio-tungstenite = { git = "https://github.com/dnaka91/tokio-tungstenite", branch = "tokio-1.0" }
2 changes: 1 addition & 1 deletion ethers-middleware/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tracing-futures = { version = "0.2.4", default-features = false }

# for gas oracles
serde-aux = { version = "2.1.0", default-features = false }
reqwest = { version = "0.10.10", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.11.0", default-features = false, features = ["json", "rustls-tls"] }
url = { version = "2.2.0", default-features = false }

tokio = { version = "1.0" }
Expand Down
4 changes: 2 additions & 2 deletions ethers-providers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rustdoc-args = ["--cfg", "docsrs"]
ethers-core = { version = "0.1.3", path = "../ethers-core", default-features = false }

async-trait = { version = "0.1.42", default-features = false }
reqwest = { version = "0.10.10", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.11.0", default-features = false, features = ["json", "rustls-tls"] }
serde = { version = "1.0.118", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.60", default-features = false }
thiserror = { version = "1.0.22", default-features = false }
Expand All @@ -37,7 +37,7 @@ tracing-futures = { version = "0.2.4", default-features = false }

# tokio
tokio = { version = "1.0", default-features = false, optional = true }
tokio-tungstenite = { version = "0.12.0", default-features = false, features = ["connect", "tls"], optional = true }
tokio-tungstenite = { git = "https://github.com/dnaka91/tokio-tungstenite", branch = "tokio-1.0", default-features = false, features = ["connect", "tls"], optional = true }

[dev-dependencies]
ethers = { version = "0.1.3", path = "../ethers" }
Expand Down

0 comments on commit 9a9f452

Please sign in to comment.