Skip to content

Commit

Permalink
Merge of #4864
Browse files Browse the repository at this point in the history
  • Loading branch information
@mergify
mergify[bot] authored Aug 2, 2022
2 parents 0f01c9f + eb807b7 commit ccc68a8
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file

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

4 changes: 2 additions & 2 deletions tower-batch/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ futures = "0.3.21"
futures-core = "0.3.21"
pin-project = "1.0.10"
rayon = "1.5.3"
tokio = { version = "1.20.0", features = ["time", "sync", "tracing", "macros"] }
tokio = { version = "1.20.1", features = ["time", "sync", "tracing", "macros"] }
tokio-util = "0.7.3"
tower = { version = "0.4.13", features = ["util", "buffer"] }
tracing = "0.1.31"
Expand All @@ -21,7 +21,7 @@ color-eyre = "0.6.1"
ed25519-zebra = "3.0.0"
rand = { version = "0.8.5", package = "rand" }

tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
tokio-test = "0.4.2"
tower-fallback = { path = "../tower-fallback/" }
tower-test = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion tower-fallback/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ futures-core = "0.3.21"
tracing = "0.1.31"

[dev-dependencies]
tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/" }
4 changes: 2 additions & 2 deletions zebra-chain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ proptest-derive = { version = "0.3.0", optional = true }
rand = { version = "0.8.5", optional = true, package = "rand" }
rand_chacha = { version = "0.3.1", optional = true }

tokio = { version = "1.20.0", features = ["tracing"], optional = true }
tokio = { version = "1.20.1", features = ["tracing"], optional = true }

zebra-test = { path = "../zebra-test/", optional = true }

Expand All @@ -101,7 +101,7 @@ proptest-derive = "0.3.0"
rand = { version = "0.8.5", package = "rand" }
rand_chacha = "0.3.1"

tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }

zebra-test = { path = "../zebra-test/" }

Expand Down
4 changes: 2 additions & 2 deletions zebra-consensus/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ futures = "0.3.21"
futures-util = "0.3.21"
metrics = "0.18.1"
thiserror = "1.0.31"
tokio = { version = "1.20.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tokio = { version = "1.20.1", features = ["time", "sync", "tracing", "rt-multi-thread"] }
tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
tracing = "0.1.31"
tracing-futures = "0.2.5"
Expand Down Expand Up @@ -58,7 +58,7 @@ proptest-derive = "0.3.0"
rand07 = { package = "rand", version = "0.7" }
spandoc = "0.2.2"

tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
tracing-error = "0.2.0"
tracing-subscriber = "0.3.11"

Expand Down
4 changes: 2 additions & 2 deletions zebra-network/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ serde = { version = "1.0.137", features = ["serde_derive"] }
thiserror = "1.0.31"

futures = "0.3.21"
tokio = { version = "1.20.0", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio = { version = "1.20.1", features = ["net", "time", "tracing", "macros", "rt-multi-thread"] }
tokio-stream = { version = "0.1.9", features = ["sync", "time"] }
tokio-util = { version = "0.7.3", features = ["codec"] }
tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }
Expand All @@ -55,7 +55,7 @@ proptest = "0.10.1"
proptest-derive = "0.3.0"

static_assertions = "1.1.0"
tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
toml = "0.5.9"

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
Expand Down
4 changes: 2 additions & 2 deletions zebra-rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jsonrpc-http-server = "18.0.0"
serde_json = { version = "1.0.82", features = ["preserve_order"] }
indexmap = { version = "1.9.1", features = ["serde"] }

tokio = { version = "1.20.0", features = ["time", "rt-multi-thread", "macros", "tracing"] }
tokio = { version = "1.20.1", features = ["time", "rt-multi-thread", "macros", "tracing"] }
tower = "0.4.13"

tracing = "0.1.31"
Expand All @@ -49,7 +49,7 @@ proptest-derive = "0.3.0"
serde_json = "1.0.82"
thiserror = "1.0.31"

tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
zebra-state = { path = "../zebra-state", features = ["proptest-impl"] }
Expand Down
4 changes: 2 additions & 2 deletions zebra-state/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tempfile = "3.3.0"
thiserror = "1.0.31"

rayon = "1.5.3"
tokio = { version = "1.20.0", features = ["sync", "tracing"] }
tokio = { version = "1.20.1", features = ["sync", "tracing"] }
tower = { version = "0.4.13", features = ["buffer", "util"] }
tracing = "0.1.31"

Expand All @@ -51,7 +51,7 @@ proptest-derive = "0.3.0"
halo2 = { package = "halo2_proofs", version = "0.2.0" }
jubjub = "0.9.0"

tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }

zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
zebra-test = { path = "../zebra-test/" }
2 changes: 1 addition & 1 deletion zebra-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ once_cell = "1.13.0"
rand = { version = "0.8.5", package = "rand" }
regex = "1.6.0"

tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
tower = { version = "0.4.13", features = ["util"] }
futures = "0.3.21"

Expand Down
4 changes: 2 additions & 2 deletions zebrad/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ toml = "0.5.9"

futures = "0.3.21"
rayon = "1.5.3"
tokio = { version = "1.20.0", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] }
tokio = { version = "1.20.1", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] }
tower = { version = "0.4.13", features = ["hedge", "limit"] }
pin-project = "1.0.10"

Expand Down Expand Up @@ -157,7 +157,7 @@ tempfile = "3.3.0"
hyper = { version = "0.14.20", features = ["http1", "http2", "server"]}
reqwest = "0.11.11"

tokio = { version = "1.20.0", features = ["full", "tracing", "test-util"] }
tokio = { version = "1.20.1", features = ["full", "tracing", "test-util"] }
tokio-stream = "0.1.9"

# test feature lightwalletd-grpc-tests
Expand Down

0 comments on commit ccc68a8

Please sign in to comment.