diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 29e4c2c1ad..3435608ebc 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -450,12 +450,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -832,12 +826,6 @@ dependencies = [ "iovec", ] -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - [[package]] name = "bytes" version = "1.1.0" @@ -3441,7 +3429,7 @@ dependencies = [ "jsonrpsee-types", "pin-project 1.0.10", "rustls-native-certs 0.6.1", - "soketto 0.7.1", + "soketto", "thiserror", "tokio", "tokio-rustls 0.23.2", @@ -3467,7 +3455,7 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "soketto 0.7.1", + "soketto", "thiserror", "tokio", "tracing", @@ -4119,7 +4107,7 @@ dependencies = [ "log 0.4.14", "quicksink", "rw-stream-sink", - "soketto 0.7.1", + "soketto", "url 2.2.1", "webpki-roots 0.21.0", ] @@ -4863,7 +4851,7 @@ dependencies = [ "sc-transaction-pool-api", "serde", "serde_json", - "soketto 0.4.2", + "soketto", "sp-api", "sp-authority-discovery", "sp-authorship", @@ -9701,21 +9689,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "soketto" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88" -dependencies = [ - "base64 0.12.3", - "bytes 0.5.6", - "futures 0.3.21", - "httparse", - "log 0.4.14", - "rand 0.7.3", - "sha-1 0.9.4", -] - [[package]] name = "soketto" version = "0.7.1" diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml index dda6b57d02..bb4ec763a3 100644 --- a/substrate/bin/node/cli/Cargo.toml +++ b/substrate/bin/node/cli/Cargo.toml @@ -125,7 +125,7 @@ serde_json = "1.0" regex = "1.5.5" platforms = "2.0" async-std = { version = "1.10.0", features = ["attributes"] } -soketto = "0.4.2" +soketto = "0.7.1" criterion = { version = "0.3.5", features = ["async_tokio"] } tokio = { version = "1.17.0", features = ["macros", "time", "parking_lot"] } wait-timeout = "0.2" diff --git a/substrate/bin/node/cli/tests/websocket_server.rs b/substrate/bin/node/cli/tests/websocket_server.rs index 6eecfaf6de..513497c6cd 100644 --- a/substrate/bin/node/cli/tests/websocket_server.rs +++ b/substrate/bin/node/cli/tests/websocket_server.rs @@ -123,12 +123,12 @@ impl WsServer { let mut server = Server::new(pending_incoming); let websocket_key = match server.receive_request().await { - Ok(req) => req.into_key(), + Ok(req) => req.key(), Err(err) => return Err(Box::new(err) as Box<_>), }; match server - .send_response(&{ Response::Accept { key: &websocket_key, protocol: None } }) + .send_response(&{ Response::Accept { key: websocket_key, protocol: None } }) .await { Ok(()) => {},