Upgrade jsonrpsee to v0.4.1 (#10022)

* Upgrade jsonrpsee to v0.4.1

* remove needless BlockT trait bound

* use default wss port in URL

* Fix try_runtime build

* Partially fix for "remote-tests" feature

* Review feedback

* fmt

* Sort out trait bounds for benches

* Fmt

* fmt again?

* fmt with nightly-2021-09-13

* Upgrade try-runtime as well

* fmt

Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
This commit is contained in:
David
2021-11-11 12:29:28 +01:00
committed by GitHub
parent bb6aecee7a
commit eeb80f9e0b
12 changed files with 130 additions and 176 deletions
+51 -79
View File
@@ -144,9 +144,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
[[package]]
name = "arrayvec"
version = "0.7.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a2f58b0bb10c380af2b26e57212856b8c9a59e0925b4c20f4a174a49734eaf7"
checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd"
[[package]]
name = "asn1_der"
@@ -419,19 +419,6 @@ dependencies = [
"rustc-demangle",
]
[[package]]
name = "bae"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf"
dependencies = [
"heck",
"proc-macro-error 0.4.12",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "base-x"
version = "0.2.8"
@@ -477,9 +464,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "beef"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6736e2428df2ca2848d846c43e88745121a6654696e349ce0054a420815a7409"
checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736"
dependencies = [
"serde",
]
@@ -1634,7 +1621,7 @@ dependencies = [
"bitflags",
"byteorder",
"lazy_static",
"proc-macro-error 1.0.4",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
@@ -3141,13 +3128,24 @@ dependencies = [
]
[[package]]
name = "jsonrpsee-proc-macros"
version = "0.3.1"
name = "jsonrpsee"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8edb341d35279b59c79d7fe9e060a51aec29d45af99cc7c72ea7caa350fa71a4"
checksum = "6373a33d987866ccfe1af4bc11b089dce941764313f9fd8b7cf13fcb51b72dc5"
dependencies = [
"Inflector",
"bae",
"jsonrpsee-proc-macros",
"jsonrpsee-types",
"jsonrpsee-utils",
"jsonrpsee-ws-client",
]
[[package]]
name = "jsonrpsee-proc-macros"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d802063f7a3c867456955f9d2f15eb3ee0edb5ec9ec2b5526324756759221c0f"
dependencies = [
"log 0.4.14",
"proc-macro-crate 1.0.0",
"proc-macro2",
"quote",
@@ -3156,10 +3154,11 @@ dependencies = [
[[package]]
name = "jsonrpsee-types"
version = "0.3.1"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cc738fd55b676ada3271ef7c383a14a0867a2a88b0fa941311bf5fc0a29d498"
checksum = "62f778cf245158fbd8f5d50823a2e9e4c708a40be164766bd35e9fb1d86715b2"
dependencies = [
"anyhow",
"async-trait",
"beef",
"futures-channel",
@@ -3168,32 +3167,43 @@ dependencies = [
"log 0.4.14",
"serde",
"serde_json",
"soketto 0.6.0",
"soketto 0.7.0",
"thiserror",
]
[[package]]
name = "jsonrpsee-ws-client"
version = "0.3.1"
name = "jsonrpsee-utils"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9841352dbecf4c2ed5dc71698df9f1660262ae4e0b610e968602529bdbcf7b30"
checksum = "0109c4f972058f3b1925b73a17210aff7b63b65967264d0045d15ee88fe84f0c"
dependencies = [
"arrayvec 0.7.1",
"beef",
"jsonrpsee-types",
]
[[package]]
name = "jsonrpsee-ws-client"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "559aa56fc402af206c00fc913dc2be1d9d788dcde045d14df141a535245d35ef"
dependencies = [
"arrayvec 0.7.1",
"async-trait",
"fnv",
"futures 0.3.16",
"http",
"jsonrpsee-types",
"log 0.4.14",
"pin-project 1.0.8",
"rustls",
"rustls-native-certs",
"serde",
"serde_json",
"soketto 0.6.0",
"soketto 0.7.0",
"thiserror",
"tokio",
"tokio-rustls",
"tokio-util",
"url 2.2.1",
]
[[package]]
@@ -4353,7 +4363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro-error 1.0.4",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
@@ -6249,7 +6259,7 @@ version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
dependencies = [
"arrayvec 0.7.0",
"arrayvec 0.7.1",
"bitvec 0.20.2",
"byte-slice-cast",
"impl-trait-for-tuples",
@@ -6742,45 +6752,19 @@ dependencies = [
"toml",
]
[[package]]
name = "proc-macro-error"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
dependencies = [
"proc-macro-error-attr 0.4.12",
"proc-macro2",
"quote",
"syn",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr 1.0.4",
"proc-macro-error-attr",
"proc-macro2",
"quote",
"syn",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-error-attr"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
dependencies = [
"proc-macro2",
"quote",
"syn",
"syn-mid",
"version_check 0.9.2",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
@@ -7365,8 +7349,7 @@ version = "0.10.0-dev"
dependencies = [
"env_logger 0.9.0",
"frame-support",
"jsonrpsee-proc-macros",
"jsonrpsee-ws-client",
"jsonrpsee",
"log 0.4.14",
"pallet-elections-phragmen",
"parity-scale-codec",
@@ -9157,9 +9140,9 @@ dependencies = [
[[package]]
name = "soketto"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f"
checksum = "083624472e8817d44d02c0e55df043737ff11f279af924abdf93845717c2b75c"
dependencies = [
"base64 0.13.0",
"bytes 1.0.1",
@@ -10062,7 +10045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba"
dependencies = [
"heck",
"proc-macro-error 1.0.4",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
@@ -10355,17 +10338,6 @@ dependencies = [
"unicode-xid",
]
[[package]]
name = "syn-mid"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "synstructure"
version = "0.12.4"
@@ -10974,7 +10946,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
name = "try-runtime-cli"
version = "0.10.0-dev"
dependencies = [
"jsonrpsee-ws-client",
"jsonrpsee",
"log 0.4.14",
"parity-scale-codec",
"remote-externalities",
@@ -11447,7 +11419,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b86dcd2c3efdb8390728a2b56f762db07789aaa5aa872a9dc776ba3a7912ed"
dependencies = [
"proc-macro-error 1.0.4",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",