From 9da9f24009f41ef4841d25f9796a14941956a3b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 21:30:11 +0000 Subject: [PATCH] chore(deps): bump tonic from 0.6.2 to 0.8.2 Bumps [tonic](https://github.com/hyperium/tonic) from 0.6.2 to 0.8.2. - [Release notes](https://github.com/hyperium/tonic/releases) - [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/tonic/compare/v0.6.2...v0.8.2) --- updated-dependencies: - dependency-name: tonic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 154 +++++++++++++----- explorer/Cargo.toml | 2 +- jormungandr/Cargo.toml | 2 +- testing/jormungandr-automation/Cargo.toml | 2 +- .../jormungandr-integration-tests/Cargo.toml | 2 +- 5 files changed, 119 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ef5b6bb56f..ebf3c03018 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -310,6 +310,51 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "axum" +version = "0.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043" +dependencies = [ + "async-trait", + "axum-core", + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa 1.0.3", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde", + "sync_wrapper", + "tokio", + "tower", + "tower-http", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c0a60006f2a293d82d571f635042a72edf927539b7685bd62d361963839b" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http", + "http-body", + "mime", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.66" @@ -923,7 +968,7 @@ dependencies = [ "criterion-plot", "csv", "futures", - "itertools 0.10.3", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -946,7 +991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" dependencies = [ "cast", - "itertools 0.10.3", + "itertools", ] [[package]] @@ -1515,7 +1560,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.6.10", - "tonic 0.4.3", + "tonic 0.8.2", "tracing", "tracing-appender", "tracing-futures", @@ -1914,7 +1959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8bc64bdceb2909623131a62d470e809c32f86b8329d82f8d31d9971349cb00a" dependencies = [ "gtmpl_value", - "itertools 0.10.3", + "itertools", "lazy_static", "percent-encoding", ] @@ -2107,6 +2152,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "http-zipkin" version = "0.3.0" @@ -2314,15 +2365,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.3" @@ -2442,7 +2484,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util 0.6.10", - "tonic 0.6.2", + "tonic 0.8.2", "tracing", "tracing-appender", "tracing-futures", @@ -2509,7 +2551,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic 0.8.2", "tonic-build", "tracing", "tracing-subscriber", @@ -2565,7 +2607,7 @@ dependencies = [ "thiserror", "thor", "tokio", - "tonic 0.6.2", + "tonic 0.8.2", "tracing", "url", "yaml-rust", @@ -2867,6 +2909,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +[[package]] +name = "matchit" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb" + [[package]] name = "memchr" version = "2.5.0" @@ -3529,7 +3577,7 @@ checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c" dependencies = [ "difflib", "float-cmp", - "itertools 0.10.3", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -3667,22 +3715,22 @@ dependencies = [ [[package]] name = "prost" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "prost-derive 0.7.0", + "prost-derive 0.9.0", ] [[package]] name = "prost" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" dependencies = [ "bytes", - "prost-derive 0.9.0", + "prost-derive 0.11.0", ] [[package]] @@ -3693,7 +3741,7 @@ checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck", - "itertools 0.10.3", + "itertools", "lazy_static", "log", "multimap", @@ -3707,12 +3755,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", - "itertools 0.9.0", + "itertools", "proc-macro2", "quote", "syn", @@ -3720,12 +3768,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" dependencies = [ "anyhow", - "itertools 0.10.3", + "itertools", "proc-macro2", "quote", "syn", @@ -4607,6 +4655,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8" + [[package]] name = "synstructure" version = "0.12.6" @@ -4976,9 +5030,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.4.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac42cd97ac6bd2339af5bcabf105540e21e45636ec6fa6aae5e85d44db31be0" +checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" dependencies = [ "async-stream", "async-trait", @@ -4990,14 +5044,16 @@ dependencies = [ "http", "http-body", "hyper", + "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.7.0", - "prost-derive 0.7.0", + "prost 0.9.0", + "prost-derive 0.9.0", "tokio", "tokio-stream", "tokio-util 0.6.10", "tower", + "tower-layer", "tower-service", "tracing", "tracing-futures", @@ -5005,12 +5061,13 @@ dependencies = [ [[package]] name = "tonic" -version = "0.6.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +checksum = "55b9af819e54b8f33d453655bef9b9acc171568fb49523078d0cc4e7484200ec" dependencies = [ "async-stream", "async-trait", + "axum", "base64", "bytes", "futures-core", @@ -5022,11 +5079,11 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.9.0", - "prost-derive 0.9.0", + "prost 0.11.0", + "prost-derive 0.11.0", "tokio", "tokio-stream", - "tokio-util 0.6.10", + "tokio-util 0.7.4", "tower", "tower-layer", "tower-service", @@ -5066,6 +5123,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower-http" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.1" diff --git a/explorer/Cargo.toml b/explorer/Cargo.toml index 643f00960d..66541d2d6c 100644 --- a/explorer/Cargo.toml +++ b/explorer/Cargo.toml @@ -31,7 +31,7 @@ tracing-appender = "0.2" tokio = { version = "^1.4", features = ["rt-multi-thread", "time", "sync", "rt", "signal", "test-util"] } tokio-stream = { version = "0.1.4", features = ["sync"] } tokio-util = { version = "0.6.0", features = ["time"] } -tonic = "0.4" +tonic = "0.8" multiaddr = { package = "parity-multiaddr", version = "0.11" } rand = "0.8.5" rand_chacha = "0.3.0" diff --git a/jormungandr/Cargo.toml b/jormungandr/Cargo.toml index f31eadb34c..080ed18749 100644 --- a/jormungandr/Cargo.toml +++ b/jormungandr/Cargo.toml @@ -55,7 +55,7 @@ tracing-appender = "0.2" tokio = { version = "^1.15", features = ["rt-multi-thread", "time", "sync", "rt", "signal", "test-util"] } tokio-stream = { version = "0.1.4", features = ["sync"] } tokio-util = { version = "0.6.0", features = ["time"] } -tonic = "0.6" +tonic = "0.8" lru = "0.7" warp = { version = "0.3.2", features = ["tls"] } serde_with = { version = "1.12", features = ["macros"] } diff --git a/testing/jormungandr-automation/Cargo.toml b/testing/jormungandr-automation/Cargo.toml index 832253214f..aadfdeec06 100644 --- a/testing/jormungandr-automation/Cargo.toml +++ b/testing/jormungandr-automation/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tonic = "0.6" +tonic = "0.8" prost = "0.9" tokio = { version = "1.15", features = ["macros","rt","rt-multi-thread"] } tokio-stream = "0.1" diff --git a/testing/jormungandr-integration-tests/Cargo.toml b/testing/jormungandr-integration-tests/Cargo.toml index 2a01a22c48..3a0dee2deb 100644 --- a/testing/jormungandr-integration-tests/Cargo.toml +++ b/testing/jormungandr-integration-tests/Cargo.toml @@ -5,7 +5,7 @@ authors = [ "dev@iohk.io" ] edition = "2021" [dependencies] -tonic = "0.6" +tonic = "0.8" bech32 = "0.7" prost = "0.9" tokio = { version = "1.15", features = ["macros", "time"] }