diff --git a/Cargo.lock b/Cargo.lock index 1ff2317994..cfd91a9af4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1257,7 +1257,7 @@ dependencies = [ "log 0.4.8", "slab", "tokio 0.2.22", - "tokio-util 0.3.1", + "tokio-util", ] [[package]] @@ -4712,6 +4712,12 @@ dependencies = [ "version_check 0.9.2", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "stdweb" version = "0.4.20" @@ -4870,10 +4876,11 @@ dependencies = [ [[package]] name = "tarpc" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7262a81ff505d04617aabee6f3e416eafd4d67f856832196c221ffd434efda47" +checksum = "1503e47bfae912674d6f4226c09cb8d2f0271a57eef7e799b6f98a545f89c7a3" dependencies = [ + "anyhow", "fnv", "futures 0.3.5", "humantime 1.3.0", @@ -4881,10 +4888,11 @@ dependencies = [ "pin-project", "rand 0.7.3", "serde", + "static_assertions", "tarpc-plugins", "tokio 0.2.22", "tokio-serde", - "tokio-util 0.2.0", + "tokio-util", ] [[package]] @@ -5345,20 +5353,6 @@ dependencies = [ "tokio-reactor", ] -[[package]] -name = "tokio-util" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" -dependencies = [ - "bytes 0.5.4", - "futures-core", - "futures-sink", - "log 0.4.8", - "pin-project-lite", - "tokio 0.2.22", -] - [[package]] name = "tokio-util" version = "0.3.1" @@ -5403,7 +5397,7 @@ dependencies = [ "prost-derive", "tokio 0.2.22", "tokio-rustls 0.14.0", - "tokio-util 0.3.1", + "tokio-util", "tower", "tower-balance", "tower-load", diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml index a6fed40fed..1f85906b9e 100644 --- a/banks-client/Cargo.toml +++ b/banks-client/Cargo.toml @@ -14,7 +14,7 @@ bincode = "1.3.1" futures = "0.3" solana-banks-interface = { path = "../banks-interface", version = "1.4.0" } solana-sdk = { path = "../sdk", version = "1.4.0" } -tarpc = { version = "0.21.0", features = ["full"] } +tarpc = { version = "0.22.0", features = ["full"] } tokio = "0.2" tokio-serde = { version = "0.6", features = ["bincode"] } diff --git a/banks-client/src/lib.rs b/banks-client/src/lib.rs index 1ded4dfa43..0e5130591a 100644 --- a/banks-client/src/lib.rs +++ b/banks-client/src/lib.rs @@ -191,7 +191,7 @@ pub async fn start_client( } pub async fn start_tcp_client(addr: T) -> io::Result { - let transport = tcp::connect(addr, Bincode::default()).await?; + let transport = tcp::connect(addr, Bincode::default).await?; BanksClient::new(client::Config::default(), transport).spawn() } diff --git a/banks-interface/Cargo.toml b/banks-interface/Cargo.toml index a69de8e1e0..903e5fd14e 100644 --- a/banks-interface/Cargo.toml +++ b/banks-interface/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] serde = { version = "1.0.112", features = ["derive"] } solana-sdk = { path = "../sdk", version = "1.4.0" } -tarpc = { version = "0.21.0", features = ["full"] } +tarpc = { version = "0.22.0", features = ["full"] } [lib] crate-type = ["lib"] diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml index 20951cbec9..36b72106ad 100644 --- a/banks-server/Cargo.toml +++ b/banks-server/Cargo.toml @@ -16,7 +16,7 @@ solana-banks-interface = { path = "../banks-interface", version = "1.4.0" } solana-runtime = { path = "../runtime", version = "1.4.0" } solana-sdk = { path = "../sdk", version = "1.4.0" } solana-metrics = { path = "../metrics", version = "1.4.0" } -tarpc = { version = "0.21.0", features = ["full"] } +tarpc = { version = "0.22.0", features = ["full"] } tokio = "0.2" tokio-serde = { version = "0.6", features = ["bincode"] }