break sp-api dependency cycle (#4352)

* move benches into tests, ignore non-passing doctests

* Rename sr-api folder

* Move test-primitives to primitives, use that for sp-api doctests
This commit is contained in:
Benjamin Kampmann
2019-12-10 20:18:01 +01:00
committed by Bastian Köcher
parent f6f0f1cc16
commit 8721d98dd6
71 changed files with 62 additions and 60 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ parking_lot = { version = "0.9.0" }
primitives = { package = "sp-core", path = "../primitives/core" }
sp-std = { path = "../primitives/std" }
runtime-version = { package = "sp-version", path = "../primitives/sr-version" }
sp-api = { path = "../primitives/sr-api" }
sp-api = { path = "../primitives/api" }
sp-runtime = { path = "../primitives/runtime" }
sp-blockchain = { path = "../primitives/blockchain" }
state-machine = { package = "sp-state-machine", path = "../primitives/state-machine" }
+2 -2
View File
@@ -23,7 +23,7 @@ parking_lot = { version = "0.9.0" }
primitives = { package = "sp-core", path = "../../primitives/core", default-features = false }
sp-std = { path = "../../primitives/std", default-features = false }
runtime-version = { package = "sp-version", path = "../../primitives/sr-version", default-features = false }
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
sp-runtime = { path = "../../primitives/runtime", default-features = false }
state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
sc-telemetry = { path = "../telemetry" }
@@ -34,7 +34,7 @@ txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/tra
env_logger = "0.7.0"
tempfile = "3.1.0"
client-db = { package = "sc-client-db", path = "../db", features = ["kvdb-rocksdb"] }
test-primitives = { package = "substrate-test-primitives", path = "../../test/utils/primitives" }
test-primitives = { package = "sp-test-primitives", path = "../../primitives/test-primitives" }
test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
kvdb-memorydb = "0.1.2"
panic-handler = { package = "sp-panic-handler", path = "../../primitives/panic-handler" }
@@ -31,4 +31,4 @@ env_logger = "0.7.0"
parking_lot = "0.9.0"
peerset = { package = "sc-peerset", path = "../peerset" }
test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
+1 -1
View File
@@ -11,4 +11,4 @@ sp-blockchain = { path = "../../primitives/blockchain" }
primitives = { package = "sp-core", path = "../../primitives/core" }
codec = { package = "parity-scale-codec", version = "1.0.6", features = ["derive"] }
runtime_api = { package = "sp-block-builder", path = "../../primitives/block-builder/runtime-api" }
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
+1 -1
View File
@@ -26,7 +26,7 @@ sp-blockchain = { path = "../../../primitives/blockchain" }
sp-io = { path = "../../../primitives/io" }
runtime_version = { package = "sp-version", path = "../../../primitives/sr-version" }
slots = { package = "sc-consensus-slots", path = "../slots" }
sp-api = { path = "../../../primitives/sr-api" }
sp-api = { path = "../../../primitives/api" }
sp-runtime = { path = "../../../primitives/runtime" }
sp-timestamp = { path = "../../../primitives/timestamp" }
sc-telemetry = { path = "../../telemetry" }
+1 -1
View File
@@ -21,7 +21,7 @@ sc-telemetry = { path = "../../telemetry" }
keystore = { package = "sc-keystore", path = "../../keystore" }
client-api = { package = "sc-client-api", path = "../../api" }
client = { package = "sc-client", path = "../../" }
sp-api = { path = "../../../primitives/sr-api" }
sp-api = { path = "../../../primitives/api" }
block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api" }
sp-blockchain = { path = "../../../primitives/blockchain" }
consensus-common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
+1 -1
View File
@@ -39,4 +39,4 @@ state_machine = { package = "sp-state-machine", path = "../../primitives/state-m
env_logger = "0.7.0"
tokio = "0.1.22"
tempfile = "3.1.0"
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
+1 -1
View File
@@ -9,7 +9,7 @@ edition = "2018"
[dependencies]
bytes = "0.4.12"
client-api = { package = "sc-client-api", path = "../api" }
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
fnv = "1.0.6"
futures01 = { package = "futures", version = "0.1" }
futures = "0.3.1"
+1 -1
View File
@@ -8,7 +8,7 @@ edition = "2018"
api = { package = "sc-rpc-api", path = "./api" }
client-api = { package = "sc-client-api", path = "../api" }
client = { package = "sc-client", path = "../" }
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
futures = { version = "0.3.1", features = ["compat"] }
jsonrpc-pubsub = "14.0.3"
+1 -1
View File
@@ -40,7 +40,7 @@ network = { package = "sc-network", path = "../network" }
chain-spec = { package = "sc-chain-spec", path = "../chain-spec" }
client-api = { package = "sc-client-api", path = "../api" }
client = { package = "sc-client", path = "../" }
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
client_db = { package = "sc-client-db", path = "../db" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
sc-executor = { path = "../executor" }
+1 -1
View File
@@ -11,7 +11,7 @@ futures = { version = "0.3.1", features = ["compat"] }
log = "0.4.8"
parking_lot = "0.9.0"
primitives = { package = "sp-core", path = "../../primitives/core" }
sp-api = { path = "../../primitives/sr-api" }
sp-api = { path = "../../primitives/api" }
sp-runtime = { path = "../../primitives/runtime" }
txpool = { package = "sc-transaction-graph", path = "./graph" }
txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" }