Fix folder names in primitives (#4358)

* sr-arithmetic -> arithmetic

* sr-sandbox -> sandbox

* primitives/sr-staking-primitives -> primitives/staking

* primitives/sr-version -> primitives/version

* primitives/block-builder/runtime-api -> primitives/block-builder

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",

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" }

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 }

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" }

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" }

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" }

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" }

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" }

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" }

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"

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 }
 

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"] }

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" }

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" }

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"]

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" }
 

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 }
 

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 }

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 }
 

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 }
 

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 }

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"] }

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"

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"
 

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]

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" }

substrate/primitives/block-builder/Cargo.toml

@@ -5,11 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 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" ]

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" }

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"

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 }

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 }

substrate/test/utils/transaction-factory/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 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" }