diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index 6b59b68e1c..6c0da92499 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -94,7 +94,7 @@ members = [ "primitives/application-crypto/test", "primitives/authority-discovery", "primitives/authorship", - "primitives/block-builder/runtime-api", + "primitives/block-builder", "primitives/blockchain", "primitives/consensus/aura", "primitives/consensus/babe", @@ -121,13 +121,13 @@ members = [ "primitives/api", "primitives/api/proc-macro", "primitives/api/test", - "primitives/sr-arithmetic", + "primitives/arithmetic", "primitives/io", "primitives/runtime", - "primitives/sr-sandbox", - "primitives/sr-staking-primitives", + "primitives/sandbox", + "primitives/staking", "primitives/std", - "primitives/sr-version", + "primitives/version", "primitives/state-machine", "primitives/timestamp", "primitives/test-primitives", diff --git a/substrate/bin/node-template/runtime/Cargo.toml b/substrate/bin/node-template/runtime/Cargo.toml index 0df7c99016..f4e1ecb972 100644 --- a/substrate/bin/node-template/runtime/Cargo.toml +++ b/substrate/bin/node-template/runtime/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" aura = { package = "pallet-aura", path = "../../../frame/aura", default-features = false } aura-primitives = { package = "sp-consensus-aura", path = "../../../primitives/consensus/aura", default-features = false } balances = { package = "pallet-balances", path = "../../../frame/balances", default-features = false } -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api", default-features = false} +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder", default-features = false} codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } executive = { package = "frame-executive", path = "../../../frame/executive", default-features = false } grandpa = { package = "pallet-grandpa", path = "../../../frame/grandpa", default-features = false } @@ -30,7 +30,7 @@ system = { package = "frame-system", path = "../../../frame/system", default-fea timestamp = { package = "pallet-timestamp", path = "../../../frame/timestamp", default-features = false } transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment", default-features = false } sp-transaction-pool = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool", default-features = false } -version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false } +version = { package = "sp-version", path = "../../../primitives/version", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" } diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml index 978583f8cc..e1971e8162 100644 --- a/substrate/bin/node/runtime/Cargo.toml +++ b/substrate/bin/node/runtime/Cargo.toml @@ -16,7 +16,7 @@ serde = { version = "1.0.102", optional = true } # primitives authority-discovery-primitives = { package = "sp-authority-discovery", path = "../../../primitives/authority-discovery", default-features = false } babe-primitives = { package = "sp-consensus-babe", path = "../../../primitives/consensus/babe", default-features = false } -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api", default-features = false} +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder", default-features = false} inherents = { package = "sp-inherents", path = "../../../primitives/inherents", default-features = false } node-primitives = { path = "../primitives", default-features = false } offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false } @@ -24,11 +24,11 @@ primitives = { package = "sp-core", path = "../../../primitives/core", default- sp-std = { path = "../../../primitives/std", 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-staking = { path = "../../../primitives/staking", default-features = false } sp-keyring = { path = "../../../primitives/keyring", optional = true } sp-session = { path = "../../../primitives/session", default-features = false } sp-transaction-pool = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool", default-features = false } -version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false } +version = { package = "sp-version", path = "../../../primitives/version", default-features = false } # frame dependencies authority-discovery = { package = "pallet-authority-discovery", path = "../../../frame/authority-discovery", default-features = false } diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index 42158f88ef..328a61d43a 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -23,7 +23,7 @@ log = { version = "0.4.8" } 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" } +runtime-version = { package = "sp-version", path = "../primitives/version" } sp-api = { path = "../primitives/api" } sp-runtime = { path = "../primitives/runtime" } sp-blockchain = { path = "../primitives/blockchain" } diff --git a/substrate/client/api/Cargo.toml b/substrate/client/api/Cargo.toml index b8a77bde07..ccaad2b86d 100644 --- a/substrate/client/api/Cargo.toml +++ b/substrate/client/api/Cargo.toml @@ -22,7 +22,7 @@ log = { version = "0.4.8" } 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 } +runtime-version = { package = "sp-version", path = "../../primitives/version", default-features = false } sp-api = { path = "../../primitives/api" } sp-runtime = { path = "../../primitives/runtime", default-features = false } state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" } diff --git a/substrate/client/block-builder/Cargo.toml b/substrate/client/block-builder/Cargo.toml index 4ef763d037..3ed6d56ba8 100644 --- a/substrate/client/block-builder/Cargo.toml +++ b/substrate/client/block-builder/Cargo.toml @@ -10,5 +10,5 @@ sp-runtime = { path = "../../primitives/runtime" } 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" } +runtime_api = { package = "sp-block-builder", path = "../../primitives/block-builder" } sp-api = { path = "../../primitives/api" } diff --git a/substrate/client/consensus/aura/Cargo.toml b/substrate/client/consensus/aura/Cargo.toml index 5823a6ce6b..ad0e5621e2 100644 --- a/substrate/client/consensus/aura/Cargo.toml +++ b/substrate/client/consensus/aura/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" [dependencies] app-crypto = { package = "sp-application-crypto", path = "../../../primitives/application-crypto" } aura_primitives = { package = "sp-consensus-aura", path = "../../../primitives/consensus/aura" } -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api" } +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder" } client = { package = "sc-client", path = "../../" } client-api = { package = "sc-client-api", path = "../../api" } codec = { package = "parity-scale-codec", version = "1.0.0" } @@ -24,7 +24,7 @@ parking_lot = "0.9.0" primitives = { package = "sp-core", path = "../../../primitives/core" } sp-blockchain = { path = "../../../primitives/blockchain" } sp-io = { path = "../../../primitives/io" } -runtime_version = { package = "sp-version", path = "../../../primitives/sr-version" } +runtime_version = { package = "sp-version", path = "../../../primitives/version" } slots = { package = "sc-consensus-slots", path = "../slots" } sp-api = { path = "../../../primitives/api" } sp-runtime = { path = "../../../primitives/runtime" } diff --git a/substrate/client/consensus/babe/Cargo.toml b/substrate/client/consensus/babe/Cargo.toml index 8f68da5bbc..5003a4bb0e 100644 --- a/substrate/client/consensus/babe/Cargo.toml +++ b/substrate/client/consensus/babe/Cargo.toml @@ -13,7 +13,7 @@ app-crypto = { package = "sp-application-crypto", path = "../../../primitives/ap num-bigint = "0.2.3" num-rational = "0.2.2" num-traits = "0.2.8" -runtime-version = { package = "sp-version", path = "../../../primitives/sr-version" } +runtime-version = { package = "sp-version", path = "../../../primitives/version" } sp-io = { path = "../../../primitives/io" } inherents = { package = "sp-inherents", path = "../../../primitives/inherents" } sp-timestamp = { path = "../../../primitives/timestamp" } @@ -22,7 +22,7 @@ keystore = { package = "sc-keystore", path = "../../keystore" } client-api = { package = "sc-client-api", path = "../../api" } client = { package = "sc-client", path = "../../" } sp-api = { path = "../../../primitives/api" } -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api" } +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder" } sp-blockchain = { path = "../../../primitives/blockchain" } consensus-common = { package = "sp-consensus", path = "../../../primitives/consensus/common" } uncles = { package = "sc-consensus-uncles", path = "../uncles" } diff --git a/substrate/client/consensus/pow/Cargo.toml b/substrate/client/consensus/pow/Cargo.toml index 60b88d46e7..b4195c0e0e 100644 --- a/substrate/client/consensus/pow/Cargo.toml +++ b/substrate/client/consensus/pow/Cargo.toml @@ -11,7 +11,7 @@ primitives = { package = "sp-core", path = "../../../primitives/core" } sp-blockchain = { path = "../../../primitives/blockchain" } sp-runtime = { path = "../../../primitives/runtime" } client-api = { package = "sc-client-api", path = "../../api" } -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api" } +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder" } inherents = { package = "sp-inherents", path = "../../../primitives/inherents" } pow-primitives = { package = "sp-consensus-pow", path = "../../../primitives/consensus/pow" } consensus-common = { package = "sp-consensus", path = "../../../primitives/consensus/common" } diff --git a/substrate/client/executor/Cargo.toml b/substrate/client/executor/Cargo.toml index 6a0723099b..84ba2a9da0 100644 --- a/substrate/client/executor/Cargo.toml +++ b/substrate/client/executor/Cargo.toml @@ -11,7 +11,7 @@ sp-io = { path = "../../primitives/io" } primitives = { package = "sp-core", path = "../../primitives/core" } trie = { package = "sp-trie", path = "../../primitives/trie" } serializer = { package = "sp-serializer", path = "../../primitives/serializer" } -runtime_version = { package = "sp-version", path = "../../primitives/sr-version" } +runtime_version = { package = "sp-version", path = "../../primitives/version" } panic-handler = { package = "sp-panic-handler", path = "../../primitives/panic-handler" } wasmi = "0.6.2" parity-wasm = "0.41.0" diff --git a/substrate/client/executor/runtime-test/Cargo.toml b/substrate/client/executor/runtime-test/Cargo.toml index 9b103aa1ca..07b0dac21d 100644 --- a/substrate/client/executor/runtime-test/Cargo.toml +++ b/substrate/client/executor/runtime-test/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] sp-std = { path = "../../../primitives/std", default-features = false } sp-io = { path = "../../../primitives/io", default-features = false } -sandbox = { package = "sp-sandbox", path = "../../../primitives/sr-sandbox", default-features = false } +sandbox = { package = "sp-sandbox", path = "../../../primitives/sandbox", default-features = false } primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false } sp-runtime = { package = "sp-runtime", path = "../../../primitives/runtime", default-features = false } diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml index ac00c48cd7..e2a8e688ad 100644 --- a/substrate/client/network/Cargo.toml +++ b/substrate/client/network/Cargo.toml @@ -29,7 +29,7 @@ client = { package = "sc-client", path = "../" } client-api = { package = "sc-client-api", path = "../api" } sp-blockchain = { path = "../../primitives/blockchain" } sp-runtime = { path = "../../primitives/runtime" } -sp-arithmetic = { path = "../../primitives/sr-arithmetic" } +sp-arithmetic = { path = "../../primitives/arithmetic" } primitives = { package = "sp-core", path = "../../primitives/core" } block-builder = { package = "sc-block-builder", path = "../block-builder" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } diff --git a/substrate/client/rpc/Cargo.toml b/substrate/client/rpc/Cargo.toml index 0b3282c7c2..4ecc413f58 100644 --- a/substrate/client/rpc/Cargo.toml +++ b/substrate/client/rpc/Cargo.toml @@ -15,7 +15,7 @@ jsonrpc-pubsub = "14.0.3" log = "0.4.8" primitives = { package = "sp-core", path = "../../primitives/core" } rpc = { package = "jsonrpc-core", version = "14.0.3" } -runtime_version = { package = "sp-version", path = "../../primitives/sr-version" } +runtime_version = { package = "sp-version", path = "../../primitives/version" } serde_json = "1.0.41" session = { package = "sp-session", path = "../../primitives/session" } sp-runtime = { path = "../../primitives/runtime" } diff --git a/substrate/client/rpc/api/Cargo.toml b/substrate/client/rpc/api/Cargo.toml index 533744ae84..6ec73965df 100644 --- a/substrate/client/rpc/api/Cargo.toml +++ b/substrate/client/rpc/api/Cargo.toml @@ -15,7 +15,7 @@ jsonrpc-pubsub = "14.0.3" log = "0.4.8" parking_lot = "0.9.0" primitives = { package = "sp-core", path = "../../../primitives/core" } -runtime_version = { package = "sp-version", path = "../../../primitives/sr-version" } +runtime_version = { package = "sp-version", path = "../../../primitives/version" } serde = { version = "1.0.101", features = ["derive"] } serde_json = "1.0.41" txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" } diff --git a/substrate/frame/authority-discovery/Cargo.toml b/substrate/frame/authority-discovery/Cargo.toml index 7909006901..a6c5d65659 100644 --- a/substrate/frame/authority-discovery/Cargo.toml +++ b/substrate/frame/authority-discovery/Cargo.toml @@ -18,7 +18,7 @@ support = { package = "frame-support", path = "../support", default-features = f system = { package = "frame-system", path = "../system", default-features = false } [dev-dependencies] -sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false } +sp-staking = { path = "../../primitives/staking", default-features = false } [features] default = ["std"] diff --git a/substrate/frame/babe/Cargo.toml b/substrate/frame/babe/Cargo.toml index c51b7a2ab4..4cc325c0e1 100644 --- a/substrate/frame/babe/Cargo.toml +++ b/substrate/frame/babe/Cargo.toml @@ -11,7 +11,7 @@ serde = { version = "1.0.101", optional = true } inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false } sp-std = { path = "../../primitives/std", default-features = false } sp-runtime = { path = "../../primitives/runtime", default-features = false } -sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false } +sp-staking = { path = "../../primitives/staking", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } system = { package = "frame-system", path = "../system", default-features = false } timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false } @@ -23,7 +23,7 @@ sp-io ={ path = "../../primitives/io", default-features = false } [dev-dependencies] lazy_static = "1.4.0" parking_lot = "0.9.0" -sp-version = { path = "../../primitives/sr-version", default-features = false } +sp-version = { path = "../../primitives/version", default-features = false } primitives = { package = "sp-core", path = "../../primitives/core" } test-runtime = { package = "substrate-test-runtime", path = "../../test/utils/runtime" } diff --git a/substrate/frame/contracts/Cargo.toml b/substrate/frame/contracts/Cargo.toml index 06bc0925bb..b5bd460dee 100644 --- a/substrate/frame/contracts/Cargo.toml +++ b/substrate/frame/contracts/Cargo.toml @@ -14,7 +14,7 @@ primitives = { package = "sp-core", path = "../../primitives/core", default-fea sp-runtime = { path = "../../primitives/runtime", default-features = false } sp-io = { path = "../../primitives/io", default-features = false } sp-std = { path = "../../primitives/std", default-features = false } -sandbox = { package = "sp-sandbox", path = "../../primitives/sr-sandbox", default-features = false } +sandbox = { package = "sp-sandbox", path = "../../primitives/sandbox", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } system = { package = "frame-system", path = "../system", default-features = false } diff --git a/substrate/frame/grandpa/Cargo.toml b/substrate/frame/grandpa/Cargo.toml index c7e61844c9..49cb393315 100644 --- a/substrate/frame/grandpa/Cargo.toml +++ b/substrate/frame/grandpa/Cargo.toml @@ -11,7 +11,7 @@ primitives = { package = "sp-core", path = "../../primitives/core", default-fea sp-finality-grandpa = { path = "../../primitives/finality-grandpa", default-features = false } sp-std = { path = "../../primitives/std", default-features = false } sp-runtime = { path = "../../primitives/runtime", default-features = false } -sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false } +sp-staking = { path = "../../primitives/staking", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } system = { package = "frame-system", path = "../system", default-features = false } session = { package = "pallet-session", path = "../session", default-features = false } diff --git a/substrate/frame/im-online/Cargo.toml b/substrate/frame/im-online/Cargo.toml index cac2d49c5c..e71a2f41c4 100644 --- a/substrate/frame/im-online/Cargo.toml +++ b/substrate/frame/im-online/Cargo.toml @@ -14,7 +14,7 @@ serde = { version = "1.0.101", optional = true } session = { package = "pallet-session", path = "../session", default-features = false } sp-io = { path = "../../primitives/io", default-features = false } sp-runtime = { path = "../../primitives/runtime", default-features = false } -sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false } +sp-staking = { path = "../../primitives/staking", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } system = { package = "frame-system", path = "../system", default-features = false } diff --git a/substrate/frame/offences/Cargo.toml b/substrate/frame/offences/Cargo.toml index 4aac6d0860..db60c463a0 100644 --- a/substrate/frame/offences/Cargo.toml +++ b/substrate/frame/offences/Cargo.toml @@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features = sp-std = { path = "../../primitives/std", default-features = false } serde = { version = "1.0.101", optional = true } sp-runtime = { path = "../../primitives/runtime", default-features = false } -sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false } +sp-staking = { path = "../../primitives/staking", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } system = { package = "frame-system", path = "../system", default-features = false } diff --git a/substrate/frame/session/Cargo.toml b/substrate/frame/session/Cargo.toml index b5a6efc476..98f5221cf1 100644 --- a/substrate/frame/session/Cargo.toml +++ b/substrate/frame/session/Cargo.toml @@ -10,7 +10,7 @@ safe-mix = { version = "1.0.0", 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 } -sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false } +sp-staking = { path = "../../primitives/staking", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } system = { package = "frame-system", path = "../system", default-features = false } timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false } diff --git a/substrate/frame/staking/Cargo.toml b/substrate/frame/staking/Cargo.toml index 320a82ac2d..b125327f18 100644 --- a/substrate/frame/staking/Cargo.toml +++ b/substrate/frame/staking/Cargo.toml @@ -13,7 +13,7 @@ sp-std = { path = "../../primitives/std", default-features = false } phragmen = { package = "sp-phragmen", path = "../../primitives/phragmen", default-features = false } sp-io ={ path = "../../primitives/io", default-features = false } sp-runtime = { path = "../../primitives/runtime", default-features = false } -sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false } +sp-staking = { path = "../../primitives/staking", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } system = { package = "frame-system", path = "../system", default-features = false } session = { package = "pallet-session", path = "../session", default-features = false, features = ["historical"] } diff --git a/substrate/frame/support/Cargo.toml b/substrate/frame/support/Cargo.toml index 94b392fb50..4312cbceeb 100644 --- a/substrate/frame/support/Cargo.toml +++ b/substrate/frame/support/Cargo.toml @@ -13,7 +13,7 @@ sp-std = { path = "../../primitives/std", default-features = false } sp-io ={ path = "../../primitives/io", default-features = false } sp-runtime = { path = "../../primitives/runtime", default-features = false } primitives = { package = "sp-core", path = "../../primitives/core", default-features = false } -sp-arithmetic = { path = "../../primitives/sr-arithmetic", default-features = false } +sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false } inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false } frame-support-procedural = { package = "frame-support-procedural", path = "./procedural" } paste = "0.1.6" diff --git a/substrate/frame/system/Cargo.toml b/substrate/frame/system/Cargo.toml index 3fb128e96b..78c8884e42 100644 --- a/substrate/frame/system/Cargo.toml +++ b/substrate/frame/system/Cargo.toml @@ -12,7 +12,7 @@ primitives = { package = "sp-core", path = "../../primitives/core", default-fea sp-std = { path = "../../primitives/std", default-features = false } sp-io ={ path = "../../primitives/io", default-features = false } sp-runtime = { path = "../../primitives/runtime", default-features = false } -sp-version = { path = "../../primitives/sr-version", default-features = false } +sp-version = { path = "../../primitives/version", default-features = false } support = { package = "frame-support", path = "../support", default-features = false } impl-trait-for-tuples = "0.1.3" diff --git a/substrate/primitives/api/Cargo.toml b/substrate/primitives/api/Cargo.toml index fb41802e4e..ef36a7b47a 100644 --- a/substrate/primitives/api/Cargo.toml +++ b/substrate/primitives/api/Cargo.toml @@ -10,7 +10,7 @@ sp-api-proc-macro = { path = "proc-macro" } primitives = { package = "sp-core", path = "../core", default-features = false } sp-std = { path = "../std", default-features = false } sp-runtime = { path = "../runtime", default-features = false } -sp-version = { path = "../sr-version", default-features = false } +sp-version = { path = "../version", default-features = false } state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine", optional = true } [dev-dependencies] diff --git a/substrate/primitives/api/test/Cargo.toml b/substrate/primitives/api/test/Cargo.toml index 489069a170..9e0718a0d5 100644 --- a/substrate/primitives/api/test/Cargo.toml +++ b/substrate/primitives/api/test/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] sp-api = { path = "../" } test-client = { package = "substrate-test-runtime-client", path = "../../../test/utils/runtime/client" } -sp-version = { path = "../../sr-version" } +sp-version = { path = "../../version" } sp-runtime = { path = "../../runtime" } sp-blockchain = { path = "../../blockchain" } consensus_common = { package = "sp-consensus", path = "../../../primitives/consensus/common" } diff --git a/substrate/primitives/sr-arithmetic/Cargo.toml b/substrate/primitives/arithmetic/Cargo.toml similarity index 100% rename from substrate/primitives/sr-arithmetic/Cargo.toml rename to substrate/primitives/arithmetic/Cargo.toml diff --git a/substrate/primitives/sr-arithmetic/benches/bench.rs b/substrate/primitives/arithmetic/benches/bench.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/benches/bench.rs rename to substrate/primitives/arithmetic/benches/bench.rs diff --git a/substrate/primitives/sr-arithmetic/fuzzer/.gitignore b/substrate/primitives/arithmetic/fuzzer/.gitignore similarity index 100% rename from substrate/primitives/sr-arithmetic/fuzzer/.gitignore rename to substrate/primitives/arithmetic/fuzzer/.gitignore diff --git a/substrate/primitives/sr-arithmetic/fuzzer/Cargo.lock b/substrate/primitives/arithmetic/fuzzer/Cargo.lock similarity index 100% rename from substrate/primitives/sr-arithmetic/fuzzer/Cargo.lock rename to substrate/primitives/arithmetic/fuzzer/Cargo.lock diff --git a/substrate/primitives/sr-arithmetic/fuzzer/Cargo.toml b/substrate/primitives/arithmetic/fuzzer/Cargo.toml similarity index 100% rename from substrate/primitives/sr-arithmetic/fuzzer/Cargo.toml rename to substrate/primitives/arithmetic/fuzzer/Cargo.toml diff --git a/substrate/primitives/sr-arithmetic/fuzzer/src/biguint.rs b/substrate/primitives/arithmetic/fuzzer/src/biguint.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/fuzzer/src/biguint.rs rename to substrate/primitives/arithmetic/fuzzer/src/biguint.rs diff --git a/substrate/primitives/sr-arithmetic/fuzzer/src/rational128.rs b/substrate/primitives/arithmetic/fuzzer/src/rational128.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/fuzzer/src/rational128.rs rename to substrate/primitives/arithmetic/fuzzer/src/rational128.rs diff --git a/substrate/primitives/sr-arithmetic/src/biguint.rs b/substrate/primitives/arithmetic/src/biguint.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/src/biguint.rs rename to substrate/primitives/arithmetic/src/biguint.rs diff --git a/substrate/primitives/sr-arithmetic/src/fixed64.rs b/substrate/primitives/arithmetic/src/fixed64.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/src/fixed64.rs rename to substrate/primitives/arithmetic/src/fixed64.rs diff --git a/substrate/primitives/sr-arithmetic/src/helpers_128bit.rs b/substrate/primitives/arithmetic/src/helpers_128bit.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/src/helpers_128bit.rs rename to substrate/primitives/arithmetic/src/helpers_128bit.rs diff --git a/substrate/primitives/sr-arithmetic/src/lib.rs b/substrate/primitives/arithmetic/src/lib.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/src/lib.rs rename to substrate/primitives/arithmetic/src/lib.rs diff --git a/substrate/primitives/sr-arithmetic/src/per_things.rs b/substrate/primitives/arithmetic/src/per_things.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/src/per_things.rs rename to substrate/primitives/arithmetic/src/per_things.rs diff --git a/substrate/primitives/sr-arithmetic/src/rational128.rs b/substrate/primitives/arithmetic/src/rational128.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/src/rational128.rs rename to substrate/primitives/arithmetic/src/rational128.rs diff --git a/substrate/primitives/sr-arithmetic/src/traits.rs b/substrate/primitives/arithmetic/src/traits.rs similarity index 100% rename from substrate/primitives/sr-arithmetic/src/traits.rs rename to substrate/primitives/arithmetic/src/traits.rs diff --git a/substrate/primitives/block-builder/runtime-api/Cargo.toml b/substrate/primitives/block-builder/Cargo.toml similarity index 56% rename from substrate/primitives/block-builder/runtime-api/Cargo.toml rename to substrate/primitives/block-builder/Cargo.toml index f8983fcdd2..c454a1516d 100644 --- a/substrate/primitives/block-builder/runtime-api/Cargo.toml +++ b/substrate/primitives/block-builder/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -sp-runtime = { path = "../../runtime", default-features = false } -sp-api = { path = "../../api", default-features = false } -sp-std = { path = "../../std", default-features = false } +sp-runtime = { path = "../runtime", 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 } +inherents = { package = "sp-inherents", path = "../inherents", default-features = false } [features] default = [ "std" ] diff --git a/substrate/primitives/block-builder/runtime-api/src/lib.rs b/substrate/primitives/block-builder/src/lib.rs similarity index 100% rename from substrate/primitives/block-builder/runtime-api/src/lib.rs rename to substrate/primitives/block-builder/src/lib.rs diff --git a/substrate/primitives/blockchain/Cargo.toml b/substrate/primitives/blockchain/Cargo.toml index 67bb815cf4..598af8153e 100644 --- a/substrate/primitives/blockchain/Cargo.toml +++ b/substrate/primitives/blockchain/Cargo.toml @@ -12,5 +12,5 @@ derive_more = "0.99.2" parity-scale-codec = { version = "1.0.0", default-features = false, features = ["derive"] } sp_consensus = { package = "sp-consensus", path = "../consensus/common" } sp-runtime = { path = "../runtime" } -sp-block-builder-runtime-api = { package = "sp-block-builder", path = "../block-builder/runtime-api" } +sp-block-builder-runtime-api = { package = "sp-block-builder", path = "../block-builder" } sp-state-machine = { package = "sp-state-machine", path = "../state-machine" } diff --git a/substrate/primitives/consensus/common/Cargo.toml b/substrate/primitives/consensus/common/Cargo.toml index 128d42c20c..17aec7bca2 100644 --- a/substrate/primitives/consensus/common/Cargo.toml +++ b/substrate/primitives/consensus/common/Cargo.toml @@ -14,7 +14,7 @@ inherents = { package = "sp-inherents", path = "../../inherents" } futures = { version = "0.3.1", features = ["thread-pool"] } futures-timer = "0.4.0" sp-std = { path = "../../std" } -runtime_version = { package = "sp-version", path = "../../sr-version" } +runtime_version = { package = "sp-version", path = "../../version" } sp-runtime = { path = "../../runtime" } codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] } parking_lot = "0.9.0" diff --git a/substrate/primitives/runtime/Cargo.toml b/substrate/primitives/runtime/Cargo.toml index d149aa089e..3c8377666a 100644 --- a/substrate/primitives/runtime/Cargo.toml +++ b/substrate/primitives/runtime/Cargo.toml @@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] } codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } primitives = { package = "sp-core", path = "../core", default-features = false } app-crypto = { package = "sp-application-crypto", path = "../application-crypto", default-features = false } -arithmetic = { package = "sp-arithmetic", path = "../sr-arithmetic", default-features = false } +arithmetic = { package = "sp-arithmetic", path = "../arithmetic", default-features = false } sp-std = { path = "../std", default-features = false } sp-io = { path = "../io", default-features = false } log = { version = "0.4.8", optional = true } diff --git a/substrate/primitives/sr-sandbox/Cargo.toml b/substrate/primitives/sandbox/Cargo.toml similarity index 100% rename from substrate/primitives/sr-sandbox/Cargo.toml rename to substrate/primitives/sandbox/Cargo.toml diff --git a/substrate/primitives/sr-sandbox/src/lib.rs b/substrate/primitives/sandbox/src/lib.rs similarity index 100% rename from substrate/primitives/sr-sandbox/src/lib.rs rename to substrate/primitives/sandbox/src/lib.rs diff --git a/substrate/primitives/sr-sandbox/with_std.rs b/substrate/primitives/sandbox/with_std.rs similarity index 100% rename from substrate/primitives/sr-sandbox/with_std.rs rename to substrate/primitives/sandbox/with_std.rs diff --git a/substrate/primitives/sr-sandbox/without_std.rs b/substrate/primitives/sandbox/without_std.rs similarity index 100% rename from substrate/primitives/sr-sandbox/without_std.rs rename to substrate/primitives/sandbox/without_std.rs diff --git a/substrate/primitives/sr-staking-primitives/Cargo.toml b/substrate/primitives/staking/Cargo.toml similarity index 100% rename from substrate/primitives/sr-staking-primitives/Cargo.toml rename to substrate/primitives/staking/Cargo.toml diff --git a/substrate/primitives/sr-staking-primitives/src/lib.rs b/substrate/primitives/staking/src/lib.rs similarity index 100% rename from substrate/primitives/sr-staking-primitives/src/lib.rs rename to substrate/primitives/staking/src/lib.rs diff --git a/substrate/primitives/sr-staking-primitives/src/offence.rs b/substrate/primitives/staking/src/offence.rs similarity index 100% rename from substrate/primitives/sr-staking-primitives/src/offence.rs rename to substrate/primitives/staking/src/offence.rs diff --git a/substrate/primitives/sr-version/Cargo.toml b/substrate/primitives/version/Cargo.toml similarity index 100% rename from substrate/primitives/sr-version/Cargo.toml rename to substrate/primitives/version/Cargo.toml diff --git a/substrate/primitives/sr-version/src/lib.rs b/substrate/primitives/version/src/lib.rs similarity index 100% rename from substrate/primitives/sr-version/src/lib.rs rename to substrate/primitives/version/src/lib.rs diff --git a/substrate/test/utils/runtime/Cargo.toml b/substrate/test/utils/runtime/Cargo.toml index 69a4396f4a..549cbd24e7 100644 --- a/substrate/test/utils/runtime/Cargo.toml +++ b/substrate/test/utils/runtime/Cargo.toml @@ -9,7 +9,7 @@ build = "build.rs" app-crypto = { package = "sp-application-crypto", path = "../../../primitives/application-crypto", default-features = false } aura-primitives = { package = "sp-consensus-aura", path = "../../../primitives/consensus/aura", default-features = false } babe-primitives = { package = "sp-consensus-babe", path = "../../../primitives/consensus/babe", default-features = false } -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api", default-features = false } +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder", default-features = false } cfg-if = "0.1.10" codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] } executive = { package = "frame-executive", path = "../../../frame/executive", default-features = false } @@ -23,7 +23,7 @@ sp-std = { path = "../../../primitives/std", default-features = false } runtime-interface = { package = "sp-runtime-interface", path = "../../../primitives/runtime-interface", default-features = false} sp-io = { path = "../../../primitives/io", default-features = false } runtime_support = { package = "frame-support", path = "../../../frame/support", default-features = false } -runtime_version = { package = "sp-version", path = "../../../primitives/sr-version", default-features = false } +runtime_version = { package = "sp-version", path = "../../../primitives/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/api", default-features = false } diff --git a/substrate/test/utils/transaction-factory/Cargo.toml b/substrate/test/utils/transaction-factory/Cargo.toml index f0c6c25ccc..956e58b88a 100644 --- a/substrate/test/utils/transaction-factory/Cargo.toml +++ b/substrate/test/utils/transaction-factory/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder/runtime-api" } +block-builder-api = { package = "sp-block-builder", path = "../../../primitives/block-builder" } cli = { package = "sc-cli", path = "../../../client/cli" } client-api = { package = "sc-client-api", path = "../../../client/api" } client = { package = "sc-client", path = "../../../client" }