diff --git a/substrate/.maintain/rename-crates-for-2.0.sh b/substrate/.maintain/rename-crates-for-2.0.sh index 9eefb2918c..ecfbfd4453 100644 --- a/substrate/.maintain/rename-crates-for-2.0.sh +++ b/substrate/.maintain/rename-crates-for-2.0.sh @@ -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" ); diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 1e55146e2a..616f5a600e 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -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" diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index fbae35a522..1c4ad549b9 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -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", diff --git a/substrate/bin/node-template/runtime/Cargo.toml b/substrate/bin/node-template/runtime/Cargo.toml index 438a9f93ed..0df7c99016 100644 --- a/substrate/bin/node-template/runtime/Cargo.toml +++ b/substrate/bin/node-template/runtime/Cargo.toml @@ -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 } diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml index 9a43cc08af..978583f8cc 100644 --- a/substrate/bin/node/runtime/Cargo.toml +++ b/substrate/bin/node/runtime/Cargo.toml @@ -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 } diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index e87ce727dd..42158f88ef 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -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" } diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml index 0946a863d2..6aa4a144f6 100644 --- a/substrate/client/api/Cargo.toml +++ b/substrate/client/api/Cargo.toml @@ -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" } diff --git a/substrate/client/authority-discovery/Cargo.toml b/substrate/client/authority-discovery/Cargo.toml index 4608e5ca43..330165e0aa 100644 --- a/substrate/client/authority-discovery/Cargo.toml +++ b/substrate/client/authority-discovery/Cargo.toml @@ -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" } diff --git a/substrate/client/block-builder/Cargo.toml b/substrate/client/block-builder/Cargo.toml index 7986948c0e..4ef763d037 100644 --- a/substrate/client/block-builder/Cargo.toml +++ b/substrate/client/block-builder/Cargo.toml @@ -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" } diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml index a2f0eeda38..f9b56fd399 100644 --- a/substrate/client/consensus/aura/Cargo.toml +++ b/substrate/client/consensus/aura/Cargo.toml @@ -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" } diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml index 7f86960c0c..4d6e77a0b8 100644 --- a/substrate/client/consensus/babe/Cargo.toml +++ b/substrate/client/consensus/babe/Cargo.toml @@ -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" } diff --git a/substrate/client/finality-grandpa/Cargo.toml b/substrate/client/finality-grandpa/Cargo.toml index cbadd6dba6..121491fd3d 100644 --- a/substrate/client/finality-grandpa/Cargo.toml +++ b/substrate/client/finality-grandpa/Cargo.toml @@ -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" } diff --git a/substrate/client/offchain/Cargo.toml b/substrate/client/offchain/Cargo.toml index 953f525d5c..3d3046ff41 100644 --- a/substrate/client/offchain/Cargo.toml +++ b/substrate/client/offchain/Cargo.toml @@ -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" diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml index 534764bfd2..0b3282c7c2 100644 --- a/substrate/client/rpc/Cargo.toml +++ b/substrate/client/rpc/Cargo.toml @@ -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" diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml index 8dfb81996f..cdd5b948ca 100644 --- a/substrate/client/service/Cargo.toml +++ b/substrate/client/service/Cargo.toml @@ -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" } diff --git a/substrate/client/transaction-pool/Cargo.toml b/substrate/client/transaction-pool/Cargo.toml index 01d9bfcdf8..ff2a5e8f79 100644 --- a/substrate/client/transaction-pool/Cargo.toml +++ b/substrate/client/transaction-pool/Cargo.toml @@ -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" } diff --git a/substrate/frame/contracts/rpc/runtime-api/Cargo.toml b/substrate/frame/contracts/rpc/runtime-api/Cargo.toml index ab127a7361..05fb0d5609 100644 --- a/substrate/frame/contracts/rpc/runtime-api/Cargo.toml +++ b/substrate/frame/contracts/rpc/runtime-api/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] 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 } diff --git a/substrate/frame/system/rpc/runtime-api/Cargo.toml b/substrate/frame/system/rpc/runtime-api/Cargo.toml index 29b7b142eb..dfe18b11c2 100644 --- a/substrate/frame/system/rpc/runtime-api/Cargo.toml +++ b/substrate/frame/system/rpc/runtime-api/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] 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] diff --git a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml index d55919a60d..076bd2afc7 100644 --- a/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml +++ b/substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml @@ -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 } diff --git a/substrate/primitives/sr-api/Cargo.toml b/substrate/primitives/api/Cargo.toml similarity index 76% rename from substrate/primitives/sr-api/Cargo.toml rename to substrate/primitives/api/Cargo.toml index 68287c1fda..fb41802e4e 100644 --- a/substrate/primitives/sr-api/Cargo.toml +++ b/substrate/primitives/api/Cargo.toml @@ -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" ] diff --git a/substrate/primitives/sr-api/proc-macro/Cargo.toml b/substrate/primitives/api/proc-macro/Cargo.toml similarity index 100% rename from substrate/primitives/sr-api/proc-macro/Cargo.toml rename to substrate/primitives/api/proc-macro/Cargo.toml diff --git a/substrate/primitives/sr-api/proc-macro/src/decl_runtime_apis.rs b/substrate/primitives/api/proc-macro/src/decl_runtime_apis.rs similarity index 100% rename from substrate/primitives/sr-api/proc-macro/src/decl_runtime_apis.rs rename to substrate/primitives/api/proc-macro/src/decl_runtime_apis.rs diff --git a/substrate/primitives/sr-api/proc-macro/src/impl_runtime_apis.rs b/substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs similarity index 100% rename from substrate/primitives/sr-api/proc-macro/src/impl_runtime_apis.rs rename to substrate/primitives/api/proc-macro/src/impl_runtime_apis.rs diff --git a/substrate/primitives/sr-api/proc-macro/src/lib.rs b/substrate/primitives/api/proc-macro/src/lib.rs similarity index 100% rename from substrate/primitives/sr-api/proc-macro/src/lib.rs rename to substrate/primitives/api/proc-macro/src/lib.rs diff --git a/substrate/primitives/sr-api/proc-macro/src/utils.rs b/substrate/primitives/api/proc-macro/src/utils.rs similarity index 100% rename from substrate/primitives/sr-api/proc-macro/src/utils.rs rename to substrate/primitives/api/proc-macro/src/utils.rs diff --git a/substrate/primitives/sr-api/src/lib.rs b/substrate/primitives/api/src/lib.rs similarity index 99% rename from substrate/primitives/sr-api/src/lib.rs rename to substrate/primitives/api/src/lib.rs index 9892bbddf6..7d1f91e339 100644 --- a/substrate/primitives/sr-api/src/lib.rs +++ b/substrate/primitives/api/src/lib.rs @@ -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. diff --git a/substrate/primitives/sr-api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml similarity index 80% rename from substrate/primitives/sr-api/test/Cargo.toml rename to substrate/primitives/api/test/Cargo.toml index 61d3a87547..489069a170 100644 --- a/substrate/primitives/sr-api/test/Cargo.toml +++ b/substrate/primitives/api/test/Cargo.toml @@ -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" ] diff --git a/substrate/primitives/sr-api/benches/bench.rs b/substrate/primitives/api/test/benches/bench.rs similarity index 100% rename from substrate/primitives/sr-api/benches/bench.rs rename to substrate/primitives/api/test/benches/bench.rs diff --git a/substrate/primitives/sr-api/test/tests/decl_and_impl.rs b/substrate/primitives/api/test/tests/decl_and_impl.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/decl_and_impl.rs rename to substrate/primitives/api/test/tests/decl_and_impl.rs diff --git a/substrate/primitives/sr-api/test/tests/runtime_calls.rs b/substrate/primitives/api/test/tests/runtime_calls.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/runtime_calls.rs rename to substrate/primitives/api/test/tests/runtime_calls.rs diff --git a/substrate/primitives/sr-api/test/tests/trybuild.rs b/substrate/primitives/api/test/tests/trybuild.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/trybuild.rs rename to substrate/primitives/api/test/tests/trybuild.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/adding_self_parameter.rs b/substrate/primitives/api/test/tests/ui/adding_self_parameter.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/adding_self_parameter.rs rename to substrate/primitives/api/test/tests/ui/adding_self_parameter.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/adding_self_parameter.stderr b/substrate/primitives/api/test/tests/ui/adding_self_parameter.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/adding_self_parameter.stderr rename to substrate/primitives/api/test/tests/ui/adding_self_parameter.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/changed_in_unknown_version.rs b/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/changed_in_unknown_version.rs rename to substrate/primitives/api/test/tests/ui/changed_in_unknown_version.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/changed_in_unknown_version.stderr b/substrate/primitives/api/test/tests/ui/changed_in_unknown_version.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/changed_in_unknown_version.stderr rename to substrate/primitives/api/test/tests/ui/changed_in_unknown_version.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/declaring_old_block.rs b/substrate/primitives/api/test/tests/ui/declaring_old_block.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/declaring_old_block.rs rename to substrate/primitives/api/test/tests/ui/declaring_old_block.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/declaring_old_block.stderr b/substrate/primitives/api/test/tests/ui/declaring_old_block.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/declaring_old_block.stderr rename to substrate/primitives/api/test/tests/ui/declaring_old_block.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/declaring_own_block_with_different_name.rs b/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/declaring_own_block_with_different_name.rs rename to substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/declaring_own_block_with_different_name.stderr b/substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/declaring_own_block_with_different_name.stderr rename to substrate/primitives/api/test/tests/ui/declaring_own_block_with_different_name.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/empty_impl_runtime_apis_call.rs b/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/empty_impl_runtime_apis_call.rs rename to substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/empty_impl_runtime_apis_call.stderr b/substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/empty_impl_runtime_apis_call.stderr rename to substrate/primitives/api/test/tests/ui/empty_impl_runtime_apis_call.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/impl_incorrect_method_signature.rs b/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/impl_incorrect_method_signature.rs rename to substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/impl_incorrect_method_signature.stderr b/substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/impl_incorrect_method_signature.stderr rename to substrate/primitives/api/test/tests/ui/impl_incorrect_method_signature.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/impl_two_traits_with_same_name.rs b/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/impl_two_traits_with_same_name.rs rename to substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/impl_two_traits_with_same_name.stderr b/substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/impl_two_traits_with_same_name.stderr rename to substrate/primitives/api/test/tests/ui/impl_two_traits_with_same_name.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/invalid_api_version.rs b/substrate/primitives/api/test/tests/ui/invalid_api_version.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/invalid_api_version.rs rename to substrate/primitives/api/test/tests/ui/invalid_api_version.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/invalid_api_version.stderr b/substrate/primitives/api/test/tests/ui/invalid_api_version.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/invalid_api_version.stderr rename to substrate/primitives/api/test/tests/ui/invalid_api_version.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/invalid_api_version_2.rs b/substrate/primitives/api/test/tests/ui/invalid_api_version_2.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/invalid_api_version_2.rs rename to substrate/primitives/api/test/tests/ui/invalid_api_version_2.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/invalid_api_version_2.stderr b/substrate/primitives/api/test/tests/ui/invalid_api_version_2.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/invalid_api_version_2.stderr rename to substrate/primitives/api/test/tests/ui/invalid_api_version_2.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/invalid_api_version_3.rs b/substrate/primitives/api/test/tests/ui/invalid_api_version_3.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/invalid_api_version_3.rs rename to substrate/primitives/api/test/tests/ui/invalid_api_version_3.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/invalid_api_version_3.stderr b/substrate/primitives/api/test/tests/ui/invalid_api_version_3.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/invalid_api_version_3.stderr rename to substrate/primitives/api/test/tests/ui/invalid_api_version_3.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/missing_block_generic_parameter.rs b/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/missing_block_generic_parameter.rs rename to substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/missing_block_generic_parameter.stderr b/substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/missing_block_generic_parameter.stderr rename to substrate/primitives/api/test/tests/ui/missing_block_generic_parameter.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/missing_path_for_trait.rs b/substrate/primitives/api/test/tests/ui/missing_path_for_trait.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/missing_path_for_trait.rs rename to substrate/primitives/api/test/tests/ui/missing_path_for_trait.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/missing_path_for_trait.stderr b/substrate/primitives/api/test/tests/ui/missing_path_for_trait.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/missing_path_for_trait.stderr rename to substrate/primitives/api/test/tests/ui/missing_path_for_trait.stderr diff --git a/substrate/primitives/sr-api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs b/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs rename to substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.rs diff --git a/substrate/primitives/sr-api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr b/substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr similarity index 100% rename from substrate/primitives/sr-api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr rename to substrate/primitives/api/test/tests/ui/type_reference_in_impl_runtime_apis_call.stderr diff --git a/substrate/primitives/authority-discovery/Cargo.toml b/substrate/primitives/authority-discovery/Cargo.toml index 1924add0a6..79df9e4169 100644 --- a/substrate/primitives/authority-discovery/Cargo.toml +++ b/substrate/primitives/authority-discovery/Cargo.toml @@ -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] diff --git a/substrate/primitives/block-builder/runtime-api/Cargo.toml b/substrate/primitives/block-builder/runtime-api/Cargo.toml index ba6705fa2a..f8983fcdd2 100644 --- a/substrate/primitives/block-builder/runtime-api/Cargo.toml +++ b/substrate/primitives/block-builder/runtime-api/Cargo.toml @@ -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 } diff --git a/substrate/primitives/consensus/aura/Cargo.toml b/substrate/primitives/consensus/aura/Cargo.toml index ef0af6d292..599083b17f 100644 --- a/substrate/primitives/consensus/aura/Cargo.toml +++ b/substrate/primitives/consensus/aura/Cargo.toml @@ -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 } diff --git a/substrate/primitives/consensus/babe/Cargo.toml b/substrate/primitives/consensus/babe/Cargo.toml index a77813aee9..675363e5a9 100644 --- a/substrate/primitives/consensus/babe/Cargo.toml +++ b/substrate/primitives/consensus/babe/Cargo.toml @@ -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 } diff --git a/substrate/primitives/consensus/pow/Cargo.toml b/substrate/primitives/consensus/pow/Cargo.toml index dfe646c00d..0baff76a9b 100644 --- a/substrate/primitives/consensus/pow/Cargo.toml +++ b/substrate/primitives/consensus/pow/Cargo.toml @@ -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 } diff --git a/substrate/primitives/finality-grandpa/Cargo.toml b/substrate/primitives/finality-grandpa/Cargo.toml index d12b2d9bbf..0e05cab228 100644 --- a/substrate/primitives/finality-grandpa/Cargo.toml +++ b/substrate/primitives/finality-grandpa/Cargo.toml @@ -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] diff --git a/substrate/primitives/offchain/Cargo.toml b/substrate/primitives/offchain/Cargo.toml index 0a85e487c3..4b739dc45b 100644 --- a/substrate/primitives/offchain/Cargo.toml +++ b/substrate/primitives/offchain/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Parity Technologies "] 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] diff --git a/substrate/primitives/session/Cargo.toml b/substrate/primitives/session/Cargo.toml index ab37c021ec..56a7660c74 100644 --- a/substrate/primitives/session/Cargo.toml +++ b/substrate/primitives/session/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] 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 } diff --git a/substrate/test/utils/primitives/Cargo.toml b/substrate/primitives/test-primitives/Cargo.toml similarity index 54% rename from substrate/test/utils/primitives/Cargo.toml rename to substrate/primitives/test-primitives/Cargo.toml index f0199032a4..e54a6f5095 100644 --- a/substrate/test/utils/primitives/Cargo.toml +++ b/substrate/primitives/test-primitives/Cargo.toml @@ -1,15 +1,15 @@ [package] -name = "substrate-test-primitives" +name = "sp-test-primitives" version = "2.0.0" authors = ["Parity Technologies "] 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 = [ diff --git a/substrate/test/utils/primitives/src/lib.rs b/substrate/primitives/test-primitives/src/lib.rs similarity index 100% rename from substrate/test/utils/primitives/src/lib.rs rename to substrate/primitives/test-primitives/src/lib.rs diff --git a/substrate/primitives/timestamp/Cargo.toml b/substrate/primitives/timestamp/Cargo.toml index f8f4fc9315..8661a44a44 100644 --- a/substrate/primitives/timestamp/Cargo.toml +++ b/substrate/primitives/timestamp/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] 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"] } diff --git a/substrate/primitives/transaction-pool/Cargo.toml b/substrate/primitives/transaction-pool/Cargo.toml index 456d1f94e6..e1a55d6b37 100644 --- a/substrate/primitives/transaction-pool/Cargo.toml +++ b/substrate/primitives/transaction-pool/Cargo.toml @@ -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] diff --git a/substrate/test/utils/runtime/Cargo.toml b/substrate/test/utils/runtime/Cargo.toml index 8a2f516fb1..87f9fd75bb 100644 --- a/substrate/test/utils/runtime/Cargo.toml +++ b/substrate/test/utils/runtime/Cargo.toml @@ -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 } diff --git a/substrate/test/utils/transaction-factory/Cargo.toml b/substrate/test/utils/transaction-factory/Cargo.toml index 1cfc1b7696..f0c6c25ccc 100644 --- a/substrate/test/utils/transaction-factory/Cargo.toml +++ b/substrate/test/utils/transaction-factory/Cargo.toml @@ -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" }