pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-19 14:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade tokio to 1.10 (#9575)

Browse Source 
* Upgrade tokio to 1.10

* Fix test runner

* Try fix it

* Update Cargo.lock

* Review feedback

* ahhhh

* FML

* FMT

* Fix tests
This commit is contained in:
Bastian Köcher
2021-08-24 16:31:19 +02:00
committed by GitHub
parent d722c44248
commit f92e5c5e65
24 changed files with 143 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/Cargo.lock
Generated
+36 -258
View File
@@ -1202,17 +1202,6 @@ dependencies = [
"crossbeam-utils 0.8.3",
]
[[package]]
name = "crossbeam-deque"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
dependencies = [
"crossbeam-epoch 0.8.2",
"crossbeam-utils 0.7.2",
"maybe-uninit",
]
[[package]]
name = "crossbeam-deque"
version = "0.8.0"
@@ -1220,25 +1209,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-epoch 0.9.3",
"crossbeam-epoch",
"crossbeam-utils 0.8.3",
]
[[package]]
name = "crossbeam-epoch"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
dependencies = [
"autocfg 1.0.1",
"cfg-if 0.1.10",
"crossbeam-utils 0.7.2",
"lazy_static",
"maybe-uninit",
"memoffset 0.5.6",
"scopeguard",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.3"
@@ -1248,21 +1222,10 @@ dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils 0.8.3",
"lazy_static",
"memoffset 0.6.1",
"memoffset",
"scopeguard",
]
[[package]]
name = "crossbeam-queue"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
dependencies = [
"cfg-if 0.1.10",
"crossbeam-utils 0.7.2",
"maybe-uninit",
]
[[package]]
name = "crossbeam-utils"
version = "0.7.2"
@@ -2682,7 +2645,7 @@ dependencies = [
"itoa",
"pin-project-lite 0.2.6",
"socket2 0.4.0",
"tokio 1.10.0",
"tokio",
"tower-service",
"tracing",
"want",
@@ -2700,8 +2663,8 @@ dependencies = [
"log 0.4.14",
"rustls",
"rustls-native-certs",
"tokio 1.10.0",
"tokio-rustls 0.22.0",
"tokio",
"tokio-rustls",
"webpki",
]
@@ -2714,7 +2677,7 @@ dependencies = [
"bytes 1.0.1",
"hyper 0.14.11",
"native-tls",
"tokio 1.10.0",
"tokio",
"tokio-native-tls",
]
@@ -2941,7 +2904,7 @@ dependencies = [
"log 0.4.14",
"serde",
"serde_json",
"tokio 1.10.0",
"tokio",
"url 1.7.2",
"websocket",
]
@@ -3041,9 +3004,9 @@ dependencies = [
"jsonrpc-core",
"lazy_static",
"log 0.4.14",
"tokio 1.10.0",
"tokio",
"tokio-stream",
"tokio-util 0.6.7",
"tokio-util",
"unicase 2.6.0",
]
@@ -3112,9 +3075,9 @@ dependencies = [
"serde_json",
"soketto 0.6.0",
"thiserror",
"tokio 0.2.25",
"tokio-rustls 0.15.0",
"tokio-util 0.3.1",
"tokio",
"tokio-rustls",
"tokio-util",
"url 2.2.1",
]
@@ -3977,15 +3940,6 @@ dependencies = [
"libc",
]
[[package]]
name = "memoffset"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
dependencies = [
"autocfg 1.0.1",
]
[[package]]
name = "memoffset"
version = "0.6.1"
@@ -4107,17 +4061,6 @@ dependencies = [
"slab",
]
[[package]]
name = "mio-uds"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
dependencies = [
"iovec",
"libc",
"mio 0.6.23",
]
[[package]]
name = "miow"
version = "0.2.2"
@@ -5968,7 +5911,7 @@ dependencies = [
"libc",
"log 0.4.14",
"rand 0.7.3",
"tokio 1.10.0",
"tokio",
"winapi 0.3.9",
]
@@ -6963,7 +6906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
dependencies = [
"autocfg 1.0.1",
"crossbeam-deque 0.8.0",
"crossbeam-deque",
"either",
"rayon-core",
]
@@ -6975,7 +6918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
dependencies = [
"crossbeam-channel",
"crossbeam-deque 0.8.0",
"crossbeam-deque",
"crossbeam-utils 0.8.3",
"lazy_static",
"num_cpus",
@@ -7103,7 +7046,7 @@ dependencies = [
"sp-io",
"sp-runtime",
"sp-version",
"tokio 0.2.25",
"tokio",
]
[[package]]
@@ -7433,7 +7376,7 @@ dependencies = [
"tempfile",
"thiserror",
"tiny-bip39",
"tokio 0.2.25",
"tokio",
]
[[package]]
@@ -7681,7 +7624,7 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"substrate-test-runtime-transaction-pool",
"tokio 0.2.25",
"tokio",
]
[[package]]
@@ -7875,7 +7818,7 @@ dependencies = [
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
"tokio 0.2.25",
"tokio",
]
[[package]]
@@ -8087,7 +8030,7 @@ dependencies = [
"sp-utils",
"substrate-test-runtime-client",
"threadpool",
"tokio 1.10.0",
"tokio",
]
[[package]]
@@ -8262,7 +8205,7 @@ dependencies = [
"substrate-test-runtime-client",
"tempfile",
"thiserror",
"tokio 0.2.25",
"tokio",
"tracing",
"tracing-futures",
]
@@ -8272,7 +8215,6 @@ name = "sc-service-test"
version = "2.0.0"
dependencies = [
"fdlimit",
"futures 0.1.31",
"futures 0.3.16",
"hex-literal",
"log 0.4.14",
@@ -8301,7 +8243,7 @@ dependencies = [
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
"tokio 0.1.22",
"tokio",
]
[[package]]
@@ -9789,7 +9731,7 @@ dependencies = [
"sc-rpc-api",
"serde",
"sp-storage",
"tokio 0.2.25",
"tokio",
]
[[package]]
@@ -9826,7 +9768,7 @@ dependencies = [
"hyper 0.14.11",
"log 0.4.14",
"prometheus",
"tokio 1.10.0",
"tokio",
]
[[package]]
@@ -9941,7 +9883,7 @@ dependencies = [
"futures 0.3.16",
"sc-service",
"substrate-test-utils-derive",
"tokio 0.2.25",
"tokio",
"trybuild",
]
@@ -9950,6 +9892,7 @@ name = "substrate-test-utils-derive"
version = "0.10.0-dev"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
"quote",
"syn",
]
@@ -9960,7 +9903,7 @@ version = "0.1.0"
dependencies = [
"sc-service",
"substrate-test-utils",
"tokio 0.2.25",
"tokio",
]
[[package]]
@@ -10105,7 +10048,7 @@ dependencies = [
"sp-state-machine",
"sp-transaction-pool",
"sp-wasm-interface",
"tokio 0.2.25",
"tokio",
]
[[package]]
@@ -10240,51 +10183,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
dependencies = [
"bytes 0.4.12",
"futures 0.1.31",
"mio 0.6.23",
"num_cpus",
"tokio-codec",
"tokio-current-thread",
"tokio-executor",
"tokio-fs",
"tokio-io",
"tokio-reactor",
"tokio-sync",
"tokio-tcp",
"tokio-threadpool",
"tokio-timer",
"tokio-udp",
"tokio-uds",
]
[[package]]
name = "tokio"
version = "0.2.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092"
dependencies = [
"bytes 0.5.6",
"fnv",
"iovec",
"lazy_static",
"libc",
"mio 0.6.23",
"mio-uds",
"num_cpus",
"pin-project-lite 0.1.12",
"signal-hook-registry",
"slab",
"tokio-macros 0.2.6",
"winapi 0.3.9",
]
[[package]]
name = "tokio"
version = "1.10.0"
@@ -10301,7 +10199,7 @@ dependencies = [
"parking_lot 0.11.1",
"pin-project-lite 0.2.6",
"signal-hook-registry",
"tokio-macros 1.3.0",
"tokio-macros",
"winapi 0.3.9",
]
@@ -10316,16 +10214,6 @@ dependencies = [
"tokio-io",
]
[[package]]
name = "tokio-current-thread"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
dependencies = [
"futures 0.1.31",
"tokio-executor",
]
[[package]]
name = "tokio-executor"
version = "0.1.10"
@@ -10336,17 +10224,6 @@ dependencies = [
"futures 0.1.31",
]
[[package]]
name = "tokio-fs"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
dependencies = [
"futures 0.1.31",
"tokio-io",
"tokio-threadpool",
]
[[package]]
name = "tokio-io"
version = "0.1.13"
@@ -10358,17 +10235,6 @@ dependencies = [
"log 0.4.14",
]
[[package]]
name = "tokio-macros"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tokio-macros"
version = "1.3.0"
@@ -10387,7 +10253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
dependencies = [
"native-tls",
"tokio 1.10.0",
"tokio",
]
[[package]]
@@ -10409,18 +10275,6 @@ dependencies = [
"tokio-sync",
]
[[package]]
name = "tokio-rustls"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736"
dependencies = [
"futures-core",
"rustls",
"tokio 0.2.25",
"webpki",
]
[[package]]
name = "tokio-rustls"
version = "0.22.0"
@@ -10428,7 +10282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
dependencies = [
"rustls",
"tokio 1.10.0",
"tokio",
"webpki",
]
@@ -10440,7 +10294,7 @@ checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
dependencies = [
"futures-core",
"pin-project-lite 0.2.6",
"tokio 1.10.0",
"tokio",
]
[[package]]
@@ -10467,35 +10321,6 @@ dependencies = [
"tokio-reactor",
]
[[package]]
name = "tokio-threadpool"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
dependencies = [
"crossbeam-deque 0.7.3",
"crossbeam-queue",
"crossbeam-utils 0.7.2",
"futures 0.1.31",
"lazy_static",
"log 0.4.14",
"num_cpus",
"slab",
"tokio-executor",
]
[[package]]
name = "tokio-timer"
version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
dependencies = [
"crossbeam-utils 0.7.2",
"futures 0.1.31",
"slab",
"tokio-executor",
]
[[package]]
name = "tokio-tls"
version = "0.2.1"
@@ -10507,54 +10332,6 @@ dependencies = [
"tokio-io",
]
[[package]]
name = "tokio-udp"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
dependencies = [
"bytes 0.4.12",
"futures 0.1.31",
"log 0.4.14",
"mio 0.6.23",
"tokio-codec",
"tokio-io",
"tokio-reactor",
]
[[package]]
name = "tokio-uds"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
dependencies = [
"bytes 0.4.12",
"futures 0.1.31",
"iovec",
"libc",
"log 0.4.14",
"mio 0.6.23",
"mio-uds",
"tokio-codec",
"tokio-io",
"tokio-reactor",
]
[[package]]
name = "tokio-util"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
dependencies = [
"bytes 0.5.6",
"futures-core",
"futures-io",
"futures-sink",
"log 0.4.14",
"pin-project-lite 0.1.12",
"tokio 0.2.25",
]
[[package]]
name = "tokio-util"
version = "0.6.7"
@@ -10563,10 +10340,11 @@ checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
dependencies = [
"bytes 1.0.1",
"futures-core",
"futures-io",
"futures-sink",
"log 0.4.14",
"pin-project-lite 0.2.6",
"tokio 1.10.0",
"tokio",
]
[[package]]
@@ -11345,7 +11123,7 @@ dependencies = [
"cfg-if 0.1.10",
"indexmap",
"libc",
"memoffset 0.6.1",
"memoffset",
"more-asserts",
"region",
"serde",
@@ -11571,7 +11349,7 @@ dependencies = [
"libc",
"log 0.4.14",
"mach",
"memoffset 0.6.1",
"memoffset",
"more-asserts",
"rand 0.8.4",
"region",