From 1014781b87594c2609e8a5c3099495debbae6a6d Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Fri, 25 Sep 2020 11:57:59 -0600 Subject: [PATCH] Bump jsonrpc-* to 15.0.0 --- Cargo.lock | 70 +++++++++++++++++++++--------------------- client/Cargo.toml | 6 ++-- core/Cargo.toml | 12 ++++---- vote-signer/Cargo.toml | 6 ++-- 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bc02409e..9e7aaa8ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1682,9 +1682,9 @@ dependencies = [ [[package]] name = "jsonrpc-client-transports" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbdaacc17243168d9d1fa6b2bd7556a27e1e60a621d8a2a6e590ae2b145d158" +checksum = "c6f7b1cdf66312002e15682a24430728bd13036c641163c016bc53fb686a7c2d" dependencies = [ "failure", "futures 0.1.29", @@ -1700,9 +1700,9 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62" +checksum = "f30b12567a31d48588a65b6cf870081e6ba1d7b2ae353977cb9820d512e69c70" dependencies = [ "futures 0.1.29", "log 0.4.8", @@ -1713,18 +1713,18 @@ dependencies = [ [[package]] name = "jsonrpc-core-client" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34221123bc79b66279a3fde2d3363553835b43092d629b34f2e760c44dc94713" +checksum = "d175ca0cf77439b5495612bf216c650807d252d665b4b70ab2eebd895a88fac1" dependencies = [ "jsonrpc-client-transports", ] [[package]] name = "jsonrpc-derive" -version = "14.2.1" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fadf6945e227246825a583514534d864554e9f23d80b3c77d034b10983db5ef" +checksum = "c2cc6ea7f785232d9ca8786a44e9fa698f92149dcdc1acc4aa1fc69c4993d79e" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.19", @@ -1734,9 +1734,9 @@ dependencies = [ [[package]] name = "jsonrpc-http-server" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522" +checksum = "9996b26c0c7a59626d0ed6c5ec8bf06218e62ce1474bd2849f9b9fd38a0158c0" dependencies = [ "hyper 0.12.35", "jsonrpc-core", @@ -1749,9 +1749,9 @@ dependencies = [ [[package]] name = "jsonrpc-pubsub" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986" +checksum = "f389c5cd1f3db258a99296892c21047e21ae73ff4c0e2d39650ea86fe994b4c7" dependencies = [ "jsonrpc-core", "log 0.4.8", @@ -1762,9 +1762,9 @@ dependencies = [ [[package]] name = "jsonrpc-server-utils" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56cbfb462e7f902e21121d9f0d1c2b77b2c5b642e1a4e8f4ebfa2e15b94402bb" +checksum = "c623e1895d0d9110cb0ea7736cfff13191ff52335ad33b21bd5c775ea98b27af" dependencies = [ "bytes 0.4.12", "globset", @@ -1778,16 +1778,16 @@ dependencies = [ [[package]] name = "jsonrpc-ws-server" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc" +checksum = "436a92034d0137ab3e3c64a7a6350b428f31cb4d7d1a89f284bcdbcd98a7bc56" dependencies = [ "jsonrpc-core", "jsonrpc-server-utils", "log 0.4.8", + "parity-ws", "parking_lot 0.10.2", "slab", - "ws", ] [[package]] @@ -2258,6 +2258,24 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "parity-ws" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e02a625dd75084c2a7024f07c575b61b782f729d18702dabb3cdbf31911dc61" +dependencies = [ + "byteorder", + "bytes 0.4.12", + "httparse", + "log 0.4.8", + "mio", + "mio-extras", + "rand 0.7.3", + "sha-1", + "slab", + "url 2.1.1", +] + [[package]] name = "parking_lot" version = "0.9.0" @@ -6181,24 +6199,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "ws" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51a2c47b5798ccc774ffb93ff536aec7c4275d722fd9c740c83cdd1af1f2d94" -dependencies = [ - "byteorder", - "bytes 0.4.12", - "httparse", - "log 0.4.8", - "mio", - "mio-extras", - "rand 0.7.3", - "sha-1", - "slab", - "url 2.1.1", -] - [[package]] name = "ws2_32-sys" version = "0.2.1" diff --git a/client/Cargo.toml b/client/Cargo.toml index d148bd818..6db4c0457 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -13,7 +13,7 @@ bincode = "1.3.1" bs58 = "0.3.1" clap = "2.33.0" indicatif = "0.15.0" -jsonrpc-core = "14.2.0" +jsonrpc-core = "15.0.0" log = "0.4.8" rayon = "1.4.0" reqwest = { version = "0.10.6", default-features = false, features = ["blocking", "rustls-tls", "json"] } @@ -32,8 +32,8 @@ url = "2.1.1" [dev-dependencies] assert_matches = "1.3.0" -jsonrpc-core = "14.2.0" -jsonrpc-http-server = "14.2.0" +jsonrpc-core = "15.0.0" +jsonrpc-http-server = "15.0.0" solana-logger = { path = "../logger", version = "1.4.0" } [package.metadata.docs.rs] diff --git a/core/Cargo.toml b/core/Cargo.toml index 989a0fc4f..507a06542 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -26,12 +26,12 @@ fs_extra = "1.1.0" flate2 = "1.0" indexmap = "1.5" itertools = "0.9.0" -jsonrpc-core = "14.2.0" -jsonrpc-core-client = { version = "14.2.0", features = ["ws"] } -jsonrpc-derive = "14.2.1" -jsonrpc-http-server = "14.2.0" -jsonrpc-pubsub = "14.2.0" -jsonrpc-ws-server = "14.2.0" +jsonrpc-core = "15.0.0" +jsonrpc-core-client = { version = "15.0.0", features = ["ws"] } +jsonrpc-derive = "15.0.0" +jsonrpc-http-server = "15.0.0" +jsonrpc-pubsub = "15.0.0" +jsonrpc-ws-server = "15.0.0" log = "0.4.8" num_cpus = "1.13.0" num-traits = "0.2" diff --git a/vote-signer/Cargo.toml b/vote-signer/Cargo.toml index 28624cfc7..2d32b9396 100644 --- a/vote-signer/Cargo.toml +++ b/vote-signer/Cargo.toml @@ -10,9 +10,9 @@ homepage = "https://solana.com/" [dependencies] clap = "2.33" -jsonrpc-core = "14.2.0" -jsonrpc-derive = "14.2.1" -jsonrpc-http-server = "14.2.0" +jsonrpc-core = "15.0.0" +jsonrpc-derive = "15.0.0" +jsonrpc-http-server = "15.0.0" log = "0.4.8" serde_json = "1.0.56" solana-clap-utils = { path = "../clap-utils", version = "1.4.0" }