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

Move sc-client into sc-service (#5502)

Browse Source 
* Drop client from sc-network and sc-client-db, move LongestChain to sc-client-api

* move leaves, cht, in_mem to sc-client-api, drop client from sc-finality-grandpa

* drop sc-service from sc-rpc

* drop sc-service from sc-consensus-aura

* drop sc-client from manual-seal and babe

* drop sc-client from utils/frame/rpc/system and utils/frame/benchmarking-cli

* drop sc-client from bin/node and bin/node-template

* drop sc-client

* fix tests

* remove check -p sc-client from gitlab.yml

* fix warnings

* fixes ui test

* fix light client tests

* adds associated Client type to AbstractService

* adds UsageProvider to Client

* fixed ui test, again

* tried and failed to get node-cli to compile for wasm

* thanks to tomaka for helping me get node-cli to compile for wasmm

* ui test pls pas 🙏🏾

* all tests passing 🪄

* no_run documentation code

* rm -f documentation code

* ClientProvider

* fix mega trait

* move LongestChain to sc-consensus, use adds minimal bounds to AbstractService::Client

* adds license to sc-consensus

Co-authored-by: Benjamin Kampmann <ben@parity.io>
This commit is contained in:
Seun Lanlege
2020-04-28 12:59:31 +01:00
committed by GitHub
parent 7784bdeffe
commit 4fa5941f44
87 changed files with 3937 additions and 3575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/Cargo.lock
Generated
+96 -108
View File
@@ -126,15 +126,15 @@ dependencies = [
[[package]]
name = "arbitrary"
version = "0.4.1"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75153c95fdedd7db9732dfbfc3702324a1627eec91ba56e37cd0ac78314ab2ed"
checksum = "1148c9b25d393a07c4cc3ef5dd30f82a40a1c261018c4a670611ed8e76cad3ea"
[[package]]
name = "arc-swap"
version = "0.4.5"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d663a8e9a99154b5fb793032533f6328da35e23aac63d5c152279aa8ba356825"
checksum = "b585a98a234c46fc563103e9278c9391fde1f4e6850334da895d27edb9580f62"
[[package]]
name = "arrayref"
@@ -280,9 +280,9 @@ dependencies = [
[[package]]
name = "backtrace-sys"
version = "0.1.35"
version = "0.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118"
checksum = "78848718ee1255a2485d1309ad9cdecfc2e7d0362dd11c6829364c6b35ae1bc7"
dependencies = [
"cc",
"libc",
@@ -446,9 +446,9 @@ dependencies = [
[[package]]
name = "bs58"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b170cd256a3f9fa6b9edae3e44a7dfdfc77e8124dbc3e2612d75f9c3e2396dae"
checksum = "476e9cd489f9e121e02ffa6014a8ef220ecb15c05ed23fc34cca13925dc283fb"
[[package]]
name = "bstr"
@@ -547,9 +547,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.0.50"
version = "1.0.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
checksum = "9c9384ca4b90c0ea47e19a5c996d6643a3e73dedf9b89c65efb67587e34da1bb"
dependencies = [
"jobserver",
]
@@ -1140,18 +1140,18 @@ dependencies = [
[[package]]
name = "enumflags2"
version = "0.6.3"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a80e524ebf194285b57e5e7944018721c7fffc673253f5183f7accd88a2a3b0c"
checksum = "83c8d82922337cd23a15f88b70d8e4ef5f11da38dd7cdb55e84dd5de99695da0"
dependencies = [
"enumflags2_derive",
]
[[package]]
name = "enumflags2_derive"
version = "0.6.3"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ed9afacaea0301eefb738c9deea725e6d53938004597cdc518a8cf9a7aa2f03"
checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
dependencies = [
"proc-macro2",
"quote 1.0.3",
@@ -1426,7 +1426,6 @@ dependencies = [
"frame-benchmarking",
"parity-scale-codec",
"sc-cli",
"sc-client",
"sc-client-db",
"sc-executor",
"sc-service",
@@ -1980,9 +1979,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
version = "0.1.10"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15"
dependencies = [
"libc",
]
@@ -2135,9 +2134,9 @@ dependencies = [
[[package]]
name = "hyper"
version = "0.13.4"
version = "0.13.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed6081100e960d9d74734659ffc9cc91daf1c0fc7aceb8eaa94ee1a3f5046f2e"
checksum = "96816e1d921eca64d208a85aab4f7798455a8e34229ee5a88c935bdee1b78b14"
dependencies = [
"bytes 0.5.4",
"futures-channel",
@@ -2166,7 +2165,7 @@ dependencies = [
"bytes 0.5.4",
"ct-logs",
"futures-util",
"hyper 0.13.4",
"hyper 0.13.5",
"log",
"rustls",
"rustls-native-certs",
@@ -3431,9 +3430,9 @@ dependencies = [
"sc-basic-authorship",
"sc-chain-spec",
"sc-cli",
"sc-client",
"sc-client-api",
"sc-client-db",
"sc-consensus",
"sc-consensus-babe",
"sc-consensus-epochs",
"sc-finality-grandpa",
@@ -3538,7 +3537,7 @@ dependencies = [
"node-runtime",
"pallet-contracts-rpc",
"pallet-transaction-payment-rpc",
"sc-client",
"sc-client-api",
"sc-consensus-babe",
"sc-consensus-babe-rpc",
"sc-consensus-epochs",
@@ -3638,8 +3637,8 @@ dependencies = [
"node-template-runtime",
"sc-basic-authorship",
"sc-cli",
"sc-client",
"sc-client-api",
"sc-consensus",
"sc-consensus-aura",
"sc-executor",
"sc-finality-grandpa",
@@ -3715,7 +3714,6 @@ dependencies = [
"parity-scale-codec",
"sc-block-builder",
"sc-cli",
"sc-client",
"sc-client-api",
"sc-client-db",
"sc-executor",
@@ -3744,7 +3742,6 @@ dependencies = [
"parity-scale-codec",
"sc-block-builder",
"sc-cli",
"sc-client",
"sc-client-api",
"sc-service",
"sp-api",
@@ -3850,9 +3847,9 @@ dependencies = [
[[package]]
name = "num_cpus"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
dependencies = [
"hermit-abi",
"libc",
@@ -4875,7 +4872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
dependencies = [
"lock_api",
"parking_lot_core 0.7.1",
"parking_lot_core 0.7.2",
]
[[package]]
@@ -4895,9 +4892,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e136c1904604defe99ce5fd71a28d473fa60a12255d511aa78a9ddf11237aeb"
checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
dependencies = [
"cfg-if",
"cloudabi",
@@ -5568,18 +5565,18 @@ dependencies = [
[[package]]
name = "ref-cast"
version = "1.0.0"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "077f197a31bfe7e4169145f9eca08d32705c6c6126c139c26793acdf163ac3ef"
checksum = "0a214c7875e1b63fc1618db7c80efc0954f6156c9ff07699fd9039e255accdd1"
dependencies = [
"ref-cast-impl",
]
[[package]]
name = "ref-cast-impl"
version = "1.0.0"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c36eb52b69b87c9e3a07387f476c88fd0dba9a1713b38e56617ed66b45392c1f"
checksum = "602eb59cda66fcb9aec25841fb76bc01d2b34282dcdd705028da297db6f3eec8"
dependencies = [
"proc-macro2",
"quote 1.0.3",
@@ -5588,9 +5585,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.3.6"
version = "1.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3"
checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692"
dependencies = [
"aho-corasick",
"memchr",
@@ -5952,47 +5949,6 @@ dependencies = [
"tokio 0.2.18",
]
[[package]]
name = "sc-client"
version = "0.8.0-dev"
dependencies = [
"derive_more",
"env_logger 0.7.1",
"fnv",
"futures 0.3.4",
"hash-db",
"hex-literal",
"kvdb",
"kvdb-memorydb",
"log",
"parity-scale-codec",
"parking_lot 0.10.2",
"rand 0.7.3",
"sc-block-builder",
"sc-client-api",
"sc-executor",
"sc-telemetry",
"sp-api",
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-database",
"sp-externalities",
"sp-inherents",
"sp-keyring",
"sp-panic-handler",
"sp-runtime",
"sp-state-machine",
"sp-std",
"sp-trie",
"sp-utils",
"sp-version",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"tempfile",
"tracing",
]
[[package]]
name = "sc-client-api"
version = "2.0.0-dev"
@@ -6003,6 +5959,7 @@ dependencies = [
"hash-db",
"hex-literal",
"kvdb",
"kvdb-memorydb",
"lazy_static",
"log",
"parity-scale-codec",
@@ -6013,6 +5970,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-database",
"sp-externalities",
"sp-inherents",
"sp-keyring",
@@ -6026,6 +5984,7 @@ dependencies = [
"sp-utils",
"sp-version",
"substrate-prometheus-endpoint",
"substrate-test-runtime",
]
[[package]]
@@ -6045,7 +6004,6 @@ dependencies = [
"parity-util-mem",
"parking_lot 0.10.2",
"quickcheck",
"sc-client",
"sc-client-api",
"sc-executor",
"sc-state-db",
@@ -6062,6 +6020,16 @@ dependencies = [
"tempfile",
]
[[package]]
name = "sc-consensus"
version = "0.8.0-dev"
dependencies = [
"sc-client-api",
"sp-blockchain",
"sp-consensus",
"sp-runtime",
]
[[package]]
name = "sc-consensus-aura"
version = "0.8.0-dev"
@@ -6074,7 +6042,6 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.10.2",
"sc-block-builder",
"sc-client",
"sc-client-api",
"sc-consensus-slots",
"sc-executor",
@@ -6119,7 +6086,6 @@ dependencies = [
"pdqselect",
"rand 0.7.3",
"sc-block-builder",
"sc-client",
"sc-client-api",
"sc-consensus-epochs",
"sc-consensus-slots",
@@ -6201,7 +6167,6 @@ dependencies = [
"log",
"parking_lot 0.10.2",
"sc-basic-authorship",
"sc-client",
"sc-client-api",
"sc-transaction-pool",
"serde",
@@ -6372,8 +6337,8 @@ dependencies = [
"pin-project",
"rand 0.7.3",
"sc-block-builder",
"sc-client",
"sc-client-api",
"sc-consensus",
"sc-keystore",
"sc-network",
"sc-network-gossip",
@@ -6463,7 +6428,6 @@ dependencies = [
"quickcheck",
"rand 0.7.3",
"sc-block-builder",
"sc-client",
"sc-client-api",
"sc-peerset",
"serde",
@@ -6520,9 +6484,10 @@ dependencies = [
"parking_lot 0.10.2",
"rand 0.7.3",
"sc-block-builder",
"sc-client",
"sc-client-api",
"sc-consensus",
"sc-network",
"sc-service",
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
@@ -6543,7 +6508,7 @@ dependencies = [
"fnv",
"futures 0.3.4",
"futures-timer 3.0.2",
"hyper 0.13.4",
"hyper 0.13.5",
"hyper-rustls",
"log",
"num_cpus",
@@ -6593,7 +6558,6 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.10.2",
"sc-block-builder",
"sc-client",
"sc-client-api",
"sc-executor",
"sc-keystore",
@@ -6677,6 +6641,7 @@ dependencies = [
"futures 0.1.29",
"futures 0.3.4",
"futures-timer 3.0.2",
"hash-db",
"lazy_static",
"log",
"netstat2",
@@ -6686,8 +6651,9 @@ dependencies = [
"parking_lot 0.10.2",
"pin-project",
"procfs",
"rand 0.7.3",
"sc-block-builder",
"sc-chain-spec",
"sc-client",
"sc-client-api",
"sc-client-db",
"sc-executor",
@@ -6705,16 +6671,21 @@ dependencies = [
"slog",
"sp-api",
"sp-application-crypto",
"sp-block-builder",
"sp-blockchain",
"sp-consensus",
"sp-consensus-babe",
"sp-core",
"sp-externalities",
"sp-finality-grandpa",
"sp-io",
"sp-runtime",
"sp-session",
"sp-state-machine",
"sp-transaction-pool",
"sp-trie",
"sp-utils",
"sp-version",
"substrate-prometheus-endpoint",
"substrate-test-runtime-client",
"sysinfo",
@@ -6730,14 +6701,29 @@ dependencies = [
"fdlimit",
"futures 0.1.29",
"futures 0.3.4",
"hex-literal",
"log",
"sc-client",
"parity-scale-codec",
"parking_lot 0.10.2",
"sc-block-builder",
"sc-client-api",
"sc-client-db",
"sc-executor",
"sc-network",
"sc-service",
"sp-api",
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-externalities",
"sp-panic-handler",
"sp-runtime",
"sp-state-machine",
"sp-storage",
"sp-transaction-pool",
"sp-trie",
"substrate-test-runtime",
"substrate-test-runtime-client",
"tempfile",
"tokio 0.1.22",
]
@@ -7935,9 +7921,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "structopt"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff6da2e8d107dfd7b74df5ef4d205c6aebee0706c647f6bc6a2d5789905c00fb"
checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef"
dependencies = [
"clap",
"lazy_static",
@@ -7946,9 +7932,9 @@ dependencies = [
[[package]]
name = "structopt-derive"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a489c87c08fbaf12e386665109dd13470dcc9c4583ea3e10dd2b4523e5ebd9ac"
checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a"
dependencies = [
"heck",
"proc-macro-error",
@@ -8080,7 +8066,7 @@ dependencies = [
"jsonrpc-derive",
"log",
"parity-scale-codec",
"sc-client",
"sc-client-api",
"sc-transaction-pool",
"serde",
"sp-api",
@@ -8098,7 +8084,7 @@ dependencies = [
"async-std",
"derive_more",
"futures-util",
"hyper 0.13.4",
"hyper 0.13.5",
"log",
"prometheus",
"tokio 0.2.18",
@@ -8111,10 +8097,11 @@ dependencies = [
"futures 0.3.4",
"hash-db",
"parity-scale-codec",
"sc-client",
"sc-client-api",
"sc-client-db",
"sc-consensus",
"sc-executor",
"sc-service",
"sp-blockchain",
"sp-consensus",
"sp-core",
@@ -8139,8 +8126,8 @@ dependencies = [
"parity-scale-codec",
"parity-util-mem",
"sc-block-builder",
"sc-client",
"sc-executor",
"sc-service",
"serde",
"sp-api",
"sp-application-crypto",
@@ -8172,10 +8159,12 @@ dependencies = [
"futures 0.3.4",
"parity-scale-codec",
"sc-block-builder",
"sc-client",
"sc-client-api",
"sc-consensus",
"sc-service",
"sp-api",
"sp-blockchain",
"sp-consensus",
"sp-core",
"sp-runtime",
"substrate-test-client",
@@ -8357,9 +8346,9 @@ dependencies = [
[[package]]
name = "sysinfo"
version = "0.13.3"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a0338198966bde7feb14b011a33d404a62a6e03b843352c71512a2a002634b7"
checksum = "1cac193374347e7c263c5f547524f36ff8ec6702d56c8799c8331d26dffe8c1e"
dependencies = [
"cfg-if",
"doc-comment",
@@ -8467,12 +8456,11 @@ dependencies = [
[[package]]
name = "time"
version = "0.1.42"
version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438"
dependencies = [
"libc",
"redox_syscall",
"winapi 0.3.8",
]
@@ -9355,18 +9343,18 @@ dependencies = [
[[package]]
name = "wast"
version = "13.0.0"
version = "14.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b20abd8b4a26f7e0d4dd5e357e90a3d555ec190e94472c9b2b27c5b9777f9ae"
checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17"
dependencies = [
"leb128",
]
[[package]]
name = "wat"
version = "1.0.14"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51a615830ee3e7200b505c441fec09aac2f114deae69df52f215cb828ba112c4"
checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d"
dependencies = [
"wast",
]
@@ -9448,9 +9436,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.4"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi 0.3.8",
]