Skip to content

Commit

Permalink
revert: add back dev-deps (gakonst#1532)
Browse files Browse the repository at this point in the history
* Revert "disable dev deps"

This reverts commit 97bdcb9.

* fix: add back removed dev-deps
  • Loading branch information
mattsse authored Jul 29, 2022
1 parent 1ef7735 commit 1f69ec7
Show file tree
Hide file tree
Showing 13 changed files with 497 additions and 38 deletions.
409 changes: 402 additions & 7 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 11 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ description = """
Complete Ethereum library and wallet implementation in Rust.
"""

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[package.metadata.playground]
features = ["full"]

[workspace]
members = [
"ethers-addressbook",
Expand All @@ -43,6 +36,13 @@ default-members = [
"ethers-solc",
]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[package.metadata.playground]
features = ["full"]

[features]
celo = [
"ethers-core/celo",
Expand Down Expand Up @@ -90,6 +90,10 @@ ethers-middleware = { version = "^0.17.0", default-features = false, path = "./e
ethers-solc = { version = "^0.17.0", default-features = false, path = "./ethers-solc", optional = true }
ethers-etherscan = { version = "^0.17.0", default-features = false, path = "./ethers-etherscan" }

[dev-dependencies]
ethers-contract = { version = "^0.17.0", default-features = false, path = "./ethers-contract", features = ["abigen", "eip712"] }
ethers-providers = { version = "^0.17.0", default-features = false, path = "./ethers-providers", features = ["ws"] }

[target.'cfg(target_family = "unix")'.dev-dependencies]
ethers-providers = { version = "^0.17.0", default-features = false, path = "./ethers-providers", features = ["ws", "ipc"] }
eyre = "0.6"
Expand Down
18 changes: 14 additions & 4 deletions ethers-contract/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ homepage = "https://docs.rs/ethers"
repository = "https://github.com/gakonst/ethers-rs"
keywords = ["ethereum", "web3", "celo", "ethers"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
ethers-providers = { version = "^0.17.0", path = "../ethers-providers", default-features = false }
ethers-core = { version = "^0.17.0", path = "../ethers-core", default-features = false }
Expand All @@ -28,6 +24,16 @@ pin-project = {version = "1.0.11", default-features = false }
futures-util = { version = "^0.3" }
hex = { version = "0.4.3", default-features = false, features = ["std"] }

[dev-dependencies]
ethers-middleware = { version = "^0.17.0", path = "../ethers-middleware" }
ethers-providers = { version = "^0.17.0", path = "../ethers-providers", default-features = false, features = ["ws"] }
ethers-signers = { version = "^0.17.0", path = "../ethers-signers" }
ethers-contract-abigen = { version = "^0.17.0", path = "ethers-contract-abigen" }
ethers-contract-derive = { version = "^0.17.0", path = "ethers-contract-derive" }
ethers-core = { version = "^0.17.0", path = "../ethers-core", default-features = false, features = ["eip712"]}
ethers-derive-eip712 = { version = "^0.17.0", path = "../ethers-core/ethers-derive-eip712"}
ethers-solc = { version = "^0.17.0", path = "../ethers-solc", default-features = false }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.18", default-features = false, features = ["macros"] }

Expand All @@ -40,3 +46,7 @@ legacy = []

rustls = ["ethers-contract-abigen/rustls"]
openssl = ["ethers-contract-abigen/openssl"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
12 changes: 8 additions & 4 deletions ethers-contract/ethers-contract-abigen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ homepage = "https://docs.rs/ethers"
repository = "https://github.com/gakonst/ethers-rs"
keywords = ["ethereum", "web3", "celo", "ethers"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
ethers-core = { version = "^0.17.0", path = "../../ethers-core", features = ["macros"] }

Expand All @@ -34,7 +30,15 @@ eyre = "0.6"
# NOTE: this enables wasm compatibility for getrandom indirectly
getrandom = { version = "0.2", features = ["js"] }

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[features]
default = ["reqwest", "rustls"]
openssl = ["reqwest/native-tls"]
rustls = ["reqwest/rustls-tls"]

[dev-dependencies]
tempfile = "3.2.0"
ethers-solc = { version = "^0.17.0", path = "../../ethers-solc", default-features = false, features = ["project-util", "svm-solc"] }
8 changes: 4 additions & 4 deletions ethers-contract/ethers-contract-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ homepage = "https://docs.rs/ethers"
repository = "https://github.com/gakonst/ethers-rs"
keywords = ["ethereum", "web3", "celo", "ethers"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[lib]
proc-macro = true

Expand All @@ -25,3 +21,7 @@ hex = { version = "0.4.3", default-features = false, features = ["std"] }
proc-macro2 = "1.0"
quote = "1.0"
syn = "1.0.12"

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
15 changes: 11 additions & 4 deletions ethers-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ homepage = "https://docs.rs/ethers"
repository = "https://github.com/gakonst/ethers-rs"
keywords = ["ethereum", "web3", "celo", "ethers"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
fastrlp = { version = "0.1.3", features = ["std", "derive", "ethereum-types"] }
rlp = { version = "0.5.0", default-features = false, features = ["std"] }
Expand Down Expand Up @@ -47,8 +43,19 @@ syn = { version = "1.0.98", optional = true }
proc-macro2 = { version = "1.0.42", optional = true }
rust_decimal = "1.25.0"

[dev-dependencies]
serde_json = { version = "1.0.64", default-features = false }
bincode = { version = "1.3.3", default-features = false }
once_cell = { version = "1.13.0" }
hex-literal = "0.3.4"
rand = "0.8.5"

[features]
celo = ["legacy"] # celo support extends the transaction format with extra fields
legacy = []
eip712 = ["convert_case", "syn", "proc-macro2"]
macros = ["syn", "cargo_metadata", "once_cell"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
5 changes: 5 additions & 0 deletions ethers-core/ethers-derive-eip712/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ syn = "1.0.77"
ethers-core = { version = "^0.17.0", path = "../", default-features = false, features = ["eip712", "macros"] }
hex = "0.4.3"
serde_json = "1.0.68"

[dev-dependencies]
ethers-contract = { version = "^0.17.0", path = "../../ethers-contract", features = ["abigen"]}
ethers-contract-derive = { version = "^0.17.0", path = "../../ethers-contract/ethers-contract-derive" }
ethers-signers = { version = "^0.17.0", path = "../../ethers-signers" }
15 changes: 11 additions & 4 deletions ethers-etherscan/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ Rust API bindings for the etherscan.io web API
"""
keywords = ["ethereum", "web3", "etherscan", "ethers"]

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
ethers-core = { version = "^0.17.0", path = "../ethers-core", default-features = false }
reqwest = { version = "0.11.11", default-features = false, features = ["json"] }
Expand All @@ -31,6 +27,17 @@ semver = "1.0.12"
# NOTE: this enables wasm compatibility for getrandom indirectly
getrandom = { version = "0.2", features = ["js"] }

[dev-dependencies]
tempfile = "3.3.0"
tokio = { version = "1.18", features = ["macros", "rt-multi-thread", "time"] }
serial_test = "0.8.0"
tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt"] }
ethers-solc = { version = "^0.17.0", path = "../ethers-solc", default-features = false }

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[features]
default = ["rustls"]
openssl = ["reqwest/native-tls"]
Expand Down
8 changes: 8 additions & 0 deletions ethers-middleware/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ instant = {version = "0.1.12", features = ["now"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
tokio = { version = "1.18" }

[dev-dependencies]
hex = { version = "0.4.3", default-features = false, features = ["std"] }
rand = { version = "0.8.5", default-features = false }
ethers-providers = { version = "^0.17.0", path = "../ethers-providers", default-features = false, features = ["ws", "rustls"] }
once_cell = "1.13.0"
ethers-solc = { version = "^0.17.0", path = "../ethers-solc" }
serial_test = "0.8.0"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }

Expand Down
8 changes: 4 additions & 4 deletions ethers-providers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ hashers = "1.0.1"
tokio = { version = "1.18", features = ["time"] }
tokio-tungstenite = { version = "0.17.2", default-features = false, features = ["connect"], optional = true }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }
tempfile = "3.3.0"


[target.'cfg(target_arch = "wasm32")'.dependencies]
ws_stream_wasm = "0.7"
Expand All @@ -63,6 +59,10 @@ parking_lot = { version = "0.11", features = ["wasm-bindgen"] }
# NOTE: this enables wasm compatibility for getrandom indirectly
getrandom = { version = "0.2", features = ["js"] }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }
tempfile = "3.3.0"

[features]
default = ["ws", "rustls"]
celo = ["ethers-core/celo"]
Expand Down
7 changes: 7 additions & 0 deletions ethers-signers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ spki = { version = "0.6.0", optional = true }
eth-keystore = { version = "0.4.1" }
home = { version = "0.5.3", optional = true }

[dev-dependencies]
ethers-contract = { version = "^0.17.0", path = "../ethers-contract", features = ["eip712", "abigen"]}
ethers-derive-eip712 = { version = "^0.17.0", path = "../ethers-core/ethers-derive-eip712" }
serde_json = { version = "1.0.64" }
tracing-subscriber = "0.3.15"
yubihsm = { version = "0.41.0-pre", features = ["secp256k1", "usb", "mockhsm"] }

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
yubihsm = { version = "0.41.0-pre", features = ["secp256k1", "usb", "mockhsm"] }
tokio = { version = "1.18", default-features = false, features = ["macros", "rt"] }
Expand Down
9 changes: 9 additions & 0 deletions ethers-solc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@ svm-builds = { package = "svm-rs-builds", version = "0.1.5", optional = true}
# NOTE: this enables wasm compatibility for getrandom indirectly
getrandom = { version = "0.2", features = ["js"] }

[dev-dependencies]
criterion = { version = "0.3", features = ["async_tokio"] }
env_logger = "*"
tracing-subscriber = {version = "0.3", default-features = false, features = ["env-filter", "fmt"]}
rand = "0.8.5"
pretty_assertions = "1.2.1"
tempfile = "3.3.0"
tokio = { version = "1.18", features = ["full"] }

[[bench]]
name = "compile_many"
harness = false
Expand Down
3 changes: 3 additions & 0 deletions examples/ethers-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ wee_alloc = { version = "0.4.5", optional = true }
serde = { version = "1.0.126", features = ["derive"] }
hex = "0.4.3"
web-sys = "0.3.59"

[dev-dependencies]
wasm-bindgen-test = "0.3.32"

0 comments on commit 1f69ec7

Please sign in to comment.