pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-09 20:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Subscription Manager from jsonrpc-pubsub (#6208)

Browse Source 
* Bump jsonrpc pubsub, core, http, and ws

Right now these are the packages which _need_ to be updated
so I can just the latest `jsonrpc-pubsub` code. Once a release
it cut upstream the rest of the dependencies should be updated
as well.

* Use jsonrpc-pubsub's SubscriptionManager

This places sc-rpc-api::Subscriptions

* Bump jsonrpc-core outside of sc-rpc-*

* Update client/rpc tests

Right now one of the `author` tests is failing, I
need to think a bit about how best to fix it.

* Remove Subscriptions manager

There's no need for this implementation since we're
using the one from `jsonrpc-pubsub` now

* Fix author RPC test

This test used to check for a numerial subscription ID,
whereas now it uses a string based ID which is the default
provided by `jsonrpc-pubsub`'s subscription manager.

* Remove unused NumericIdProvider

* Add missing bracket

Removed one too many with that last one, lol

* Bump `jsonrpc` to v14.2

There's an exception though. `jsonrpc-derive` cannot be bumped
past v14.0.5 just yet since it has a dependency on `quote` pinned
to v1.0.1. This means that at the moment it won't build on Substrate
since it's using v1.0.3.

* Track `jsonrpc-derive` master branch

* Bump `quote` version to v1.0.6

* Bump `jsonrpc-derive` to v14.2.1

This includes support for `quote` v1.0.6
This commit is contained in:
Hernando Castano
2020-06-04 04:50:22 -04:00
committed by GitHub
parent e3795af0e3
commit ea1eb4e57f
31 changed files with 196 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/Cargo.lock
Generated
+64 -62
View File
@@ -160,7 +160,7 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d0864d84b8e07b145449be9a8537db86bf9de5ce03b913214694643b4743502"
dependencies = [
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -321,7 +321,7 @@ dependencies = [
"log",
"peeking_take_while",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"regex",
"rustc-hash",
"shlex",
@@ -991,7 +991,7 @@ version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47c5e5ac752e18207b12e16b10631ae5f7f68f8805f335f9b817ead83d9ffce1"
dependencies = [
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -1031,7 +1031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2323f3f47db9a0e77ce7a300605d8d2098597fc451ed1a97bb1f6411bb550a7"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -1133,7 +1133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ed9afacaea0301eefb738c9deea725e6d53938004597cdc518a8cf9a7aa2f03"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -1286,7 +1286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "030a733c8287d6213886dd487564ff5c8f6aae10278b3588ed177f9d18f8d231"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"synstructure",
]
@@ -1477,7 +1477,7 @@ version = "2.0.0-rc2"
dependencies = [
"frame-support-procedural-tools",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -1488,7 +1488,7 @@ dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -1497,7 +1497,7 @@ name = "frame-support-procedural-tools-derive"
version = "2.0.0-rc2"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -1713,7 +1713,7 @@ checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7"
dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -2234,7 +2234,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -2319,9 +2319,9 @@ dependencies = [
[[package]]
name = "jsonrpc-client-transports"
version = "14.1.0"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2307a7e78cf969759e390a8a2151ea12e783849a45bb00aa871b468ba58ea79e"
checksum = "ecbdaacc17243168d9d1fa6b2bd7556a27e1e60a621d8a2a6e590ae2b145d158"
dependencies = [
"failure",
"futures 0.1.29",
@@ -2336,9 +2336,9 @@ dependencies = [
[[package]]
name = "jsonrpc-core"
version = "14.1.0"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25525f6002338fb4debb5167a89a0b47f727a5a48418417545ad3429758b7fec"
checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62"
dependencies = [
"futures 0.1.29",
"log",
@@ -2349,30 +2349,30 @@ dependencies = [
[[package]]
name = "jsonrpc-core-client"
version = "14.1.0"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f9382e831a6d630c658df103aac3f971da096deb57c136ea2b760d3b4e3f9f"
checksum = "34221123bc79b66279a3fde2d3363553835b43092d629b34f2e760c44dc94713"
dependencies = [
"jsonrpc-client-transports",
]
[[package]]
name = "jsonrpc-derive"
version = "14.0.5"
version = "14.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058"
checksum = "0fadf6945e227246825a583514534d864554e9f23d80b3c77d034b10983db5ef"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
[[package]]
name = "jsonrpc-http-server"
version = "14.1.0"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52860f0549694aa4abb12766856f56952ab46d3fb9f0815131b2db3d9cc2f29"
checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522"
dependencies = [
"hyper 0.12.35",
"jsonrpc-core",
@@ -2385,21 +2385,22 @@ dependencies = [
[[package]]
name = "jsonrpc-pubsub"
version = "14.1.0"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4ca5e391d6c6a2261d4adca029f427fe63ea546ad6cef2957c654c08495ec16"
checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986"
dependencies = [
"jsonrpc-core",
"log",
"parking_lot 0.10.2",
"rand 0.7.3",
"serde",
]
[[package]]
name = "jsonrpc-server-utils"
version = "14.1.0"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f06add502b48351e05dd95814835327fb115e4e9f834ca42fd522d3b769d4d2"
checksum = "56cbfb462e7f902e21121d9f0d1c2b77b2c5b642e1a4e8f4ebfa2e15b94402bb"
dependencies = [
"bytes 0.4.12",
"globset",
@@ -2413,9 +2414,9 @@ dependencies = [
[[package]]
name = "jsonrpc-ws-server"
version = "14.1.0"
version = "14.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "017a7dd5083d9ed62c5e1dd3e317975c33c3115dac5447f4480fe05a8c354754"
checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc"
dependencies = [
"jsonrpc-core",
"jsonrpc-server-utils",
@@ -2641,7 +2642,7 @@ version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f09548626b737ed64080fde595e06ce1117795b8b9fc4d2629fa36561c583171"
dependencies = [
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -4471,7 +4472,7 @@ version = "2.0.0-rc2"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"sp-runtime",
"syn 1.0.17",
]
@@ -4704,7 +4705,7 @@ checksum = "5a0ec292e92e8ec7c58e576adacc1e3f399c597c8f263c42f18420abe58e7245"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -4823,7 +4824,7 @@ checksum = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a"
dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -4887,7 +4888,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8988430ce790d8682672117bc06dda364c0be32d3abd738234f19f3240bad99a"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -5007,7 +5008,7 @@ checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"version_check",
]
@@ -5019,7 +5020,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"syn-mid",
"version_check",
@@ -5112,7 +5113,7 @@ dependencies = [
"anyhow",
"itertools",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -5180,9 +5181,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
[[package]]
name = "quote"
version = "1.0.3"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f"
checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
dependencies = [
"proc-macro2",
]
@@ -5480,7 +5481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -5664,7 +5665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3bba175698996010c4f6dce5e7f173b6eb781fce25d2cfc45e27091ce0b79f6"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -5797,7 +5798,7 @@ version = "2.0.0-rc2"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -6572,6 +6573,7 @@ dependencies = [
"futures 0.3.4",
"futures-timer 3.0.2",
"hash-db",
"jsonrpc-pubsub",
"lazy_static",
"log",
"netstat2",
@@ -6817,7 +6819,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -6913,7 +6915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -7033,7 +7035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -7135,7 +7137,7 @@ dependencies = [
"blake2-rfc",
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -7395,7 +7397,7 @@ name = "sp-debug-derive"
version = "2.0.0-rc2"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -7512,7 +7514,7 @@ version = "2.0.0-rc2"
dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -7585,7 +7587,7 @@ dependencies = [
"Inflector",
"proc-macro-crate",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -7879,7 +7881,7 @@ dependencies = [
"heck",
"proc-macro-error",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -7900,7 +7902,7 @@ checksum = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
dependencies = [
"heck",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -8270,7 +8272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"unicode-xid 0.2.0",
]
@@ -8281,7 +8283,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -8301,7 +8303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"unicode-xid 0.2.0",
]
@@ -8364,7 +8366,7 @@ checksum = "a605baa797821796a751f4a959e1206079b24a4b7e1ed302b7d785d81a9276c9"
dependencies = [
"lazy_static",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"version_check",
]
@@ -8394,7 +8396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca972988113b7715266f91250ddb98070d033c62a011fa0fcc57434a649310dd"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -8600,7 +8602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -8778,7 +8780,7 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fbad39da2f9af1cae3016339ad7f2c7a9e870f12e8fd04c4fd7ef35b30c0d2b"
dependencies = [
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
]
@@ -9110,7 +9112,7 @@ dependencies = [
"lazy_static",
"log",
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"wasm-bindgen-shared",
]
@@ -9133,7 +9135,7 @@ version = "0.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cd85aa2c579e8892442954685f0d801f9129de24fa2136b2c6a539c76b65776"
dependencies = [
"quote 1.0.3",
"quote 1.0.6",
"wasm-bindgen-macro-support",
]
@@ -9144,7 +9146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
@@ -9177,7 +9179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf2f86cd78a2aa7b1fb4bb6ed854eccb7f9263089c79542dca1576a1518a8467"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
]
[[package]]
@@ -9465,7 +9467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
dependencies = [
"proc-macro2",
"quote 1.0.3",
"quote 1.0.6",
"syn 1.0.17",
"synstructure",
]