Fix a bunch of low work dependency cycles (#4354)

* take test-client off sp-consensus

* use test primitives rather than test client in authority discovery tests

* move runtime-interface tests

* don't forget to remove the dev-dependency

* remove more unneeded dev deps

* add changes_trie_config to test prrimitives

* Separate network crates from its integration tests

* Fix up consensus crates for networking test changes

* remove unnecessary dependencies

* remove unused addition

* remove unnecessary dev-dependencies

* fixing finality grandpa tests

* removing unnecessary executor dependencies
This commit is contained in:
Benjamin Kampmann
2019-12-11 10:27:34 +01:00
committed by GitHub
parent ed50be1eb5
commit 605c0e655e
30 changed files with 249 additions and 161 deletions
+45 -12
View File
@@ -4904,7 +4904,7 @@ dependencies = [
"sp-blockchain 2.0.0",
"sp-core 2.0.0",
"sp-runtime 2.0.0",
"substrate-test-runtime-client 2.0.0",
"sp-test-primitives 2.0.0",
]
[[package]]
@@ -5044,17 +5044,14 @@ name = "sc-client-api"
version = "2.0.0"
dependencies = [
"derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb-memorydb 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-client-db 2.0.0",
"sc-executor 2.0.0",
"sc-telemetry 2.0.0",
"sp-api 2.0.0",
@@ -5064,7 +5061,6 @@ dependencies = [
"sp-externalities 2.0.0",
"sp-inherents 2.0.0",
"sp-keyring 2.0.0",
"sp-panic-handler 2.0.0",
"sp-runtime 2.0.0",
"sp-state-machine 2.0.0",
"sp-std 2.0.0",
@@ -5072,8 +5068,6 @@ dependencies = [
"sp-transaction-pool-api 2.0.0",
"sp-trie 2.0.0",
"sp-version 2.0.0",
"substrate-test-runtime-client 2.0.0",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -5122,6 +5116,7 @@ dependencies = [
"sc-executor 2.0.0",
"sc-keystore 2.0.0",
"sc-network 2.0.0",
"sc-network-test 2.0.0",
"sc-service 2.0.0",
"sc-telemetry 2.0.0",
"sp-api 2.0.0",
@@ -5169,6 +5164,7 @@ dependencies = [
"sc-executor 2.0.0",
"sc-keystore 2.0.0",
"sc-network 2.0.0",
"sc-network-test 2.0.0",
"sc-service 2.0.0",
"sc-telemetry 2.0.0",
"schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5259,8 +5255,6 @@ dependencies = [
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-client-api 2.0.0",
"sc-offchain 2.0.0",
"sc-runtime-test 2.0.0",
"sp-core 2.0.0",
"sp-externalities 2.0.0",
@@ -5298,6 +5292,7 @@ dependencies = [
"sc-client-api 2.0.0",
"sc-keystore 2.0.0",
"sc-network 2.0.0",
"sc-network-test 2.0.0",
"sc-telemetry 2.0.0",
"serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
"sp-api 2.0.0",
@@ -5374,8 +5369,8 @@ dependencies = [
"sp-core 2.0.0",
"sp-keyring 2.0.0",
"sp-runtime 2.0.0",
"sp-test-primitives 2.0.0",
"substrate-test-client 2.0.0",
"substrate-test-runtime 2.0.0",
"substrate-test-runtime-client 2.0.0",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5385,6 +5380,33 @@ dependencies = [
"zeroize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "sc-network-test"
version = "2.0.0"
dependencies = [
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-block-builder 2.0.0",
"sc-client 2.0.0",
"sc-client-api 2.0.0",
"sc-network 2.0.0",
"sp-blockchain 2.0.0",
"sp-consensus 2.0.0",
"sp-consensus-babe 2.0.0",
"sp-core 2.0.0",
"sp-runtime 2.0.0",
"substrate-test-runtime 2.0.0",
"substrate-test-runtime-client 2.0.0",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "sc-offchain"
version = "2.0.0"
@@ -6090,8 +6112,8 @@ dependencies = [
"sp-inherents 2.0.0",
"sp-runtime 2.0.0",
"sp-std 2.0.0",
"sp-test-primitives 2.0.0",
"sp-version 2.0.0",
"substrate-test-runtime-client 2.0.0",
]
[[package]]
@@ -6326,7 +6348,6 @@ dependencies = [
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-executor 2.0.0",
"sp-core 2.0.0",
"sp-externalities 2.0.0",
"sp-io 2.0.0",
@@ -6350,6 +6371,18 @@ dependencies = [
"syn 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "sp-runtime-interface-test"
version = "2.0.0"
dependencies = [
"sc-executor 2.0.0",
"sp-core 2.0.0",
"sp-io 2.0.0",
"sp-runtime-interface 2.0.0",
"sp-runtime-interface-test-wasm 2.0.0",
"sp-state-machine 2.0.0",
]
[[package]]
name = "sp-runtime-interface-test-wasm"
version = "2.0.0"