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
@@ -102,6 +102,7 @@ TO_RENAME=(
"substrate-service-test sc-service-test"
"substrate-state-db sc-state-db"
"substrate-telemetry sc-telemetry"
"substrate-test-primitives sp-test-primitives"
"substrate-tracing sc-tracing"
);
+14 -14
View File
@@ -5081,10 +5081,10 @@ dependencies = [
"sp-runtime 2.0.0",
"sp-state-machine 2.0.0",
"sp-std 2.0.0",
"sp-test-primitives 2.0.0",
"sp-transaction-pool-api 2.0.0",
"sp-trie 2.0.0",
"sp-version 2.0.0",
"substrate-test-primitives 2.0.0",
"substrate-test-runtime-client 2.0.0",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -5968,15 +5968,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "sp-api"
version = "2.0.0"
dependencies = [
"criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sp-api-proc-macro 2.0.0",
"sp-core 2.0.0",
"sp-runtime 2.0.0",
"sp-state-machine 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]]
@@ -5994,6 +5993,7 @@ dependencies = [
name = "sp-api-test"
version = "2.0.0"
dependencies = [
"criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustversion 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sp-api 2.0.0",
@@ -6419,6 +6419,17 @@ dependencies = [
name = "sp-std"
version = "2.0.0"
[[package]]
name = "sp-test-primitives"
version = "2.0.0"
dependencies = [
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-application-crypto 2.0.0",
"serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
"sp-core 2.0.0",
"sp-runtime 2.0.0",
]
[[package]]
name = "sp-timestamp"
version = "2.0.0"
@@ -6657,17 +6668,6 @@ dependencies = [
"sp-state-machine 2.0.0",
]
[[package]]
name = "substrate-test-primitives"
version = "2.0.0"
dependencies = [
"parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sc-application-crypto 2.0.0",
"serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
"sp-core 2.0.0",
"sp-runtime 2.0.0",
]
[[package]]
name = "substrate-test-runtime"
version = "2.0.0"
+4 -4
View File
@@ -115,9 +115,9 @@ members = [
"primitives/runtime-interface/test-wasm",
"primitives/serializer",
"primitives/session",
"primitives/sr-api",
"primitives/sr-api/proc-macro",
"primitives/sr-api/test",
"primitives/api",
"primitives/api/proc-macro",
"primitives/api/test",
"primitives/sr-arithmetic",
"primitives/io",
"primitives/runtime",
@@ -127,12 +127,12 @@ members = [
"primitives/sr-version",
"primitives/state-machine",
"primitives/timestamp",
"primitives/test-primitives",
"primitives/transaction-pool",
"primitives/trie",
"primitives/wasm-interface",
"test/utils/chain-spec-builder",
"test/utils/client",
"test/utils/primitives",
"test/utils/runtime",
"test/utils/runtime/client",
"test/utils/transaction-factory",
@@ -21,7 +21,7 @@ sp-std = { path = "../../../primitives/std", default-features = false }
sp-io = { path = "../../../primitives/io", default-features = false }
safe-mix = { version = "1.0.0", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
sp-api = { path = "../../../primitives/sr-api", default-features = false }
sp-api = { path = "../../../primitives/api", default-features = false }
sp-runtime = { path = "../../../primitives/runtime", default-features = false }
sp-session = { path = "../../../primitives/session", default-features = false }
sudo = { package = "pallet-sudo", path = "../../../frame/sudo", default-features = false }
+1 -1
View File
@@ -22,7 +22,7 @@ node-primitives = { path = "../primitives", default-features = false }
offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false }
primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
sp-std = { path = "../../../primitives/std", default-features = false }
sp-api = { path = "../../../primitives/sr-api", default-features = false }
sp-api = { path = "../../../primitives/api", default-features = false }
sp-runtime = { path = "../../../primitives/runtime", default-features = false }
sp-staking = { path = "../../../primitives/sr-staking-primitives", default-features = false }
sp-keyring = { path = "../../../primitives/keyring", optional = true }
+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" }
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
sp-api = { path = "../../../../primitives/sr-api", default-features = false }
sp-api = { path = "../../../../primitives/api", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
sp-std = { path = "../../../../primitives/std", default-features = false }
sp-runtime = { path = "../../../../primitives/runtime", default-features = false }
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
sp-api = { path = "../../../../primitives/sr-api", default-features = false }
sp-api = { path = "../../../../primitives/api", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
[features]
@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
serde = { version = "1.0.101", optional = true, features = ["derive"] }
sp-api = { path = "../../../../primitives/sr-api", default-features = false }
sp-api = { path = "../../../../primitives/api", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] }
sp-std = { path = "../../../../primitives/std", default-features = false }
sp-runtime = { path = "../../../../primitives/runtime", default-features = false }
@@ -14,14 +14,7 @@ sp-version = { path = "../sr-version", default-features = false }
state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine", optional = true }
[dev-dependencies]
criterion = "0.3.0"
test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
sp-runtime = { path = "../runtime" }
sp-version = { path = "../sr-version" }
[[bench]]
name = "bench"
harness = false
sp-test-primitives = { path = "../test-primitives" }
[features]
default = [ "std" ]
@@ -158,7 +158,7 @@ pub use sp_api_proc_macro::decl_runtime_apis;
/// use sp_version::create_runtime_str;
/// #
/// # use sp_runtime::traits::GetNodeBlockType;
/// # use test_client::runtime::{Block, Header};
/// # use sp_test_primitives::{Block, Header};
/// #
/// # /// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType`
/// # /// trait are done by the `construct_runtime!` macro in a real runtime.
@@ -16,6 +16,14 @@ state-machine = { package = "sp-state-machine", path = "../../../primitives/stat
trybuild = "1.0.17"
rustversion = "1.0.0"
[dev-dependencies]
criterion = "0.3.0"
test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" }
[[bench]]
name = "bench"
harness = false
# We only need this to generate the correct code.
[features]
default = [ "std" ]
@@ -9,7 +9,7 @@ edition = "2018"
app-crypto = { package = "sc-application-crypto", path = "../application-crypto", default-features = false }
codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
sp-std = { path = "../std", default-features = false }
sp-api = { path = "../sr-api", default-features = false }
sp-api = { path = "../api", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
[features]
@@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
sp-runtime = { path = "../../runtime", default-features = false }
sp-api = { path = "../../sr-api", default-features = false }
sp-api = { path = "../../api", default-features = false }
sp-std = { path = "../../std", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false }
inherents = { package = "sp-inherents", path = "../../inherents", default-features = false }
@@ -9,7 +9,7 @@ edition = "2018"
app-crypto = { package = "sc-application-crypto", path = "../../application-crypto", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sp-std = { path = "../../std", default-features = false }
sp-api = { path = "../../sr-api", default-features = false }
sp-api = { path = "../../api", default-features = false }
sp-runtime = { path = "../../runtime", default-features = false }
inherents = { package = "sp-inherents", path = "../../inherents", default-features = false }
sp-timestamp = { path = "../../timestamp", default-features = false }
@@ -10,7 +10,7 @@ app-crypto = { package = "sc-application-crypto", path = "../../application-cryp
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sp-std = { path = "../../std", default-features = false }
schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"], optional = true }
sp-api = { path = "../../sr-api", default-features = false }
sp-api = { path = "../../api", default-features = false }
sp-consensus = { path = "../common", optional = true }
sp-inherents = { package = "sp-inherents", path = "../../inherents", default-features = false }
sp-runtime = { path = "../../runtime", default-features = false }
@@ -6,7 +6,7 @@ description = "Primitives for Aura consensus"
edition = "2018"
[dependencies]
sp-api = { path = "../../sr-api", default-features = false }
sp-api = { path = "../../api", default-features = false }
sp-std = { path = "../../std", default-features = false }
sp-runtime = { path = "../../runtime", default-features = false }
primitives = { package = "sp-core", path = "../../core", default-features = false }
@@ -9,7 +9,7 @@ app-crypto = { package = "sc-application-crypto", path = "../application-crypto"
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
sp-std = { path = "../std", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
sp-api = { path = "../sr-api", default-features = false }
sp-api = { path = "../api", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
[features]
+1 -1
View File
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
sp-api = { path = "../sr-api", default-features = false }
sp-api = { path = "../api", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
[features]
+1 -1
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
sp-api = { path = "../sr-api", default-features = false }
sp-api = { path = "../api", default-features = false }
sp-std = { path = "../std", default-features = false }
sp-runtime = { path = "../runtime", optional = true }
@@ -1,15 +1,15 @@
[package]
name = "substrate-test-primitives"
name = "sp-test-primitives"
version = "2.0.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
app-crypto = { package = "sc-application-crypto", path = "../../../primitives/application-crypto", default-features = false }
app-crypto = { package = "sc-application-crypto", path = "../application-crypto", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
primitives = { package = "sp-core", path = "../core", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
sp-runtime = { path = "../../../primitives/runtime", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
[features]
default = [
+1 -1
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
sp-api = { path = "../sr-api", default-features = false }
sp-api = { path = "../api", default-features = false }
sp-std = { path = "../std", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
@@ -10,7 +10,7 @@ derive_more = { version = "0.99.2", optional = true }
futures = { version = "0.3.1", optional = true }
log = { version = "0.4.8", optional = true }
serde = { version = "1.0.101", features = ["derive"], optional = true}
sp-api = { path = "../sr-api", default-features = false }
sp-api = { path = "../api", default-features = false }
sp-runtime = { path = "../runtime", default-features = false }
[features]
+1 -1
View File
@@ -26,7 +26,7 @@ runtime_support = { package = "frame-support", path = "../../../frame/support",
runtime_version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false }
serde = { version = "1.0.101", optional = true, features = ["derive"] }
session = { package = "sp-session", path = "../../../primitives/session", default-features = false }
sp-api = { path = "../../../primitives/sr-api", default-features = false }
sp-api = { path = "../../../primitives/api", default-features = false }
sp-runtime = { path = "../../../primitives/runtime", default-features = false }
pallet-babe = { path = "../../../frame/babe", default-features = false }
frame-system = { path = "../../../frame/system", default-features = false }
@@ -13,7 +13,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive
consensus_common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
log = "0.4.8"
primitives = { package = "sp-core", path = "../../../primitives/core" }
sp-api = { path = "../../../primitives/sr-api" }
sp-api = { path = "../../../primitives/api" }
sp-runtime = { path = "../../../primitives/runtime" }
sc-service = { path = "../../../client/service" }
sp-blockchain = { path = "../../../primitives/blockchain" }