Rename folder: primitives/sr-primitives -> primitives/runtime (#4280)

* primitives/sr-primitives -> primitives/runtime

* update

substrate/Cargo.toml

@@ -119,7 +119,7 @@ members = [
 	"primitives/sr-api/test",
 	"primitives/sr-arithmetic",
 	"primitives/sr-io",
-	"primitives/sr-primitives",
+	"primitives/runtime",
 	"primitives/sr-sandbox",
 	"primitives/sr-staking-primitives",
 	"primitives/sr-std",

substrate/bin/node-template/Cargo.toml

@@ -34,7 +34,7 @@ grandpa = { package = "sc-finality-grandpa", path = "../../client/finality-grand
 grandpa-primitives = { package = "sp-finality-grandpa", path = "../../primitives/finality-grandpa" }
 sc-client = {  path = "../../client/" }
 runtime = { package = "node-template-runtime", path = "runtime" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 basic-authorship = { package = "sc-basic-authority", path  = "../../client/basic-authorship"}
 
 [build-dependencies]

substrate/bin/node-template/runtime/Cargo.toml

@@ -22,7 +22,7 @@ runtime-io = { package = "sp-io", path = "../../../primitives/sr-io", default-fe
 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-runtime = { path = "../../../primitives/sr-primitives", 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 }
 support = { package = "frame-support", path = "../../../frame/support", default-features = false }

substrate/bin/node/cli/Cargo.toml

@@ -36,14 +36,15 @@ structopt = "0.3.3"
 # primitives
 authority-discovery-primitives = { package = "sp-authority-discovery", path = "../../../primitives/authority-discovery"}
 babe-primitives = { package = "sp-consensus-babe", path = "../../../primitives/consensus/babe" }
-grandpa_primitives = { package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
+grandpa-primitives = { package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
 primitives = { package = "sp-core", path = "../../../primitives/core" }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 sp-timestamp = { path = "../../../primitives/timestamp", default-features = false }
 sp-finality-tracker = { path = "../../../primitives/finality-tracker", default-features = false }
 inherents = { package = "sp-inherents", path = "../../../primitives/inherents" }
 keyring = { package = "sp-keyring", path = "../../../primitives/keyring" }
 runtime-io = { package = "sp-io", path = "../../../primitives/sr-io" }
+consensus-common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
 
 # client dependencies
 client-api = { package = "sc-client-api", path = "../../../client/api" }
@@ -54,14 +55,13 @@ txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/
 network = { package = "sc-network", path = "../../../client/network" }
 babe = { package = "sc-consensus-babe", path = "../../../client/consensus/babe" }
 grandpa = { package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
-client_db = { package = "sc-client-db", path = "../../../client/db", default-features = false }
+client-db = { package = "sc-client-db", path = "../../../client/db", default-features = false }
 offchain = { package = "sc-offchain", path = "../../../client/offchain" }
-sc-rpc = { package = "sc-rpc", path = "../../../client/rpc" }
+sc-rpc = { path = "../../../client/rpc" }
 sc-basic-authority = { path = "../../../client/basic-authorship" }
 sc-service = { path = "../../../client/service", default-features = false }
-sc-telemetry = { package = "sc-telemetry", path = "../../../client/telemetry" }
+sc-telemetry = { path = "../../../client/telemetry" }
 authority-discovery = { package = "sc-authority-discovery", path = "../../../client/authority-discovery"}
-consensus-common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
 
 # frame dependencies
 indices = { package = "pallet-indices", path = "../../../frame/indices" }

substrate/bin/node/executor/Cargo.toml

@@ -19,7 +19,7 @@ node-runtime = { path = "../runtime" }
 [dev-dependencies]
 node-testing = { path = "../testing" }
 test-client = { package = "substrate-test-client", path = "../../../test/utils/client" }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 runtime_support = { package = "frame-support", path = "../../../frame/support" }
 balances = { package = "pallet-balances", path = "../../../frame/balances" }
 transaction-payment = { package = "pallet-transaction-payment", path = "../../../frame/transaction-payment" }
@@ -45,4 +45,3 @@ stress-test = []
 [[bench]]
 name = "bench"
 harness = false
-

substrate/bin/node/primitives/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
-sp-runtime = { path = "../../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../../primitives/runtime", default-features = false }
 
 [dev-dependencies]
 sp-serializer = { path = "../../../primitives/serializer" }

substrate/bin/node/rpc/Cargo.toml

@@ -9,7 +9,7 @@ client = { package = "sc-client", path = "../../../client/" }
 jsonrpc-core = "14.0.3"
 node-primitives = { path = "../primitives" }
 node-runtime = { path = "../runtime" }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 pallet-contracts-rpc = { path = "../../../frame/contracts/rpc/" }
 pallet-transaction-payment-rpc = { path = "../../../frame/transaction-payment/rpc/" }
 substrate-frame-rpc-system = { path = "../../../utils/frame/rpc/system" }

substrate/bin/node/runtime/Cargo.toml

@@ -23,7 +23,7 @@ offchain-primitives = { package = "sp-offchain", path = "../../../primitives/off
 primitives = { package = "sp-core",  path = "../../../primitives/core", default-features = false }
 rstd = { package = "sp-std", path = "../../../primitives/sr-std", default-features = false }
 sp-api = { path = "../../../primitives/sr-api", default-features = false }
-sp-runtime = { path = "../../../primitives/sr-primitives", 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 }
 sp-session = { path = "../../../primitives/session", default-features = false }

substrate/bin/node/testing/Cargo.toml

@@ -20,7 +20,7 @@ primitives = { package = "sp-core", path = "../../../primitives/core" }
 runtime-io = { package = "sp-io", path = "../../../primitives/sr-io" }
 runtime_support = { package = "frame-support", path = "../../../frame/support" }
 session = { package = "pallet-session", path = "../../../frame/session" }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 staking = { package = "pallet-staking", path = "../../../frame/staking" }
 sc-executor = { path = "../../../client/executor" }
 system = { package = "frame-system", path = "../../../frame/system" }

substrate/bin/subkey/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 primitives = { package = "sp-core",  version = "*", path = "../../primitives/core" }
 node-runtime = { version = "*", path = "../node/runtime" }
 node-primitives = { version = "*", path = "../node/primitives" }
-sp-runtime = { version = "*", path = "../../primitives/sr-primitives" }
+sp-runtime = { version = "*", path = "../../primitives/runtime" }
 rand = "0.7.2"
 clap = "2.33.0"
 tiny-bip39 = "0.6.2"

substrate/client/Cargo.toml

@@ -25,7 +25,7 @@ primitives = { package = "sp-core", path = "../primitives/core" }
 rstd = { package = "sp-std", path = "../primitives/sr-std" }
 runtime-version = { package = "sp-version", path = "../primitives/sr-version" }
 sp-api = { path = "../primitives/sr-api" }
-sp-runtime = { path = "../primitives/sr-primitives" }
+sp-runtime = { path = "../primitives/runtime" }
 sp-blockchain = { path = "../primitives/blockchain" }
 state-machine = { package = "sp-state-machine", path = "../primitives/state-machine" }
 sc-telemetry = { path = "telemetry" }

substrate/client/api/Cargo.toml

@@ -25,7 +25,7 @@ primitives = { package = "sp-core", path = "../../primitives/core", default-feat
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-version = { package = "sp-version", path = "../../primitives/sr-version", default-features = false }
 sp-api = { path = "../../primitives/sr-api" }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
 sc-telemetry = { path = "../telemetry" }
 trie = { package = "sp-trie", path = "../../primitives/trie" }
@@ -39,4 +39,3 @@ test-primitives = { package = "substrate-test-primitives", path = "../../test/ut
 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" }
-

substrate/client/authority-discovery/Cargo.toml

@@ -24,7 +24,7 @@ primitives = { package = "sp-core", path = "../../primitives/core" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 prost = "0.5.0"
 serde_json = "1.0.41"
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 
 [dev-dependencies]
 env_logger = "0.7.0"

substrate/client/basic-authorship/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 log = "0.4.8"
 futures = "0.3.1"
 codec = { package = "parity-scale-codec", version = "1.0.0" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 primitives = { package = "sp-core", path = "../../primitives/core" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 client = { package = "sc-client", path = "../" }

substrate/client/block-builder/Cargo.toml

@@ -6,10 +6,9 @@ edition = "2018"
 
 [dependencies]
 state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+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" }
 sp-api = { path = "../../primitives/sr-api" }
-

substrate/client/chain-spec/Cargo.toml

@@ -11,5 +11,5 @@ network = { package = "sc-network", path = "../network" }
 primitives = { package = "sp-core", path = "../../primitives/core" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 tel = { package = "sc-telemetry", path = "../telemetry" }

substrate/client/cli/Cargo.toml

@@ -24,7 +24,7 @@ panic-handler = { package = "sp-panic-handler", path = "../../primitives/panic-h
 client-api = { package = "sc-client-api", path = "../api" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 network = { package = "sc-network", path = "../network" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 primitives = { package = "sp-core", path = "../../primitives/core" }
 service = { package = "sc-service", path = "../service", default-features = false }
 state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }

substrate/client/consensus/aura/Cargo.toml

@@ -27,7 +27,7 @@ runtime_io = { package = "sp-io", path = "../../../primitives/sr-io" }
 runtime_version = { package = "sp-version", path = "../../../primitives/sr-version" }
 slots = { package = "sc-consensus-slots", path = "../slots" }
 sp-api = { path = "../../../primitives/sr-api" }
-sp-runtime = {  path = "../../../primitives/sr-primitives" }
+sp-runtime = {  path = "../../../primitives/runtime" }
 sp-timestamp = {  path = "../../../primitives/timestamp" }
 sc-telemetry = { path = "../../telemetry" }
 

substrate/client/consensus/babe/Cargo.toml

@@ -27,7 +27,7 @@ sp-blockchain = { path = "../../../primitives/blockchain" }
 consensus-common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
 uncles = { package = "sc-consensus-uncles", path = "../uncles" }
 slots = { package = "sc-consensus-slots", path = "../slots"  }
-sp-runtime = {  path = "../../../primitives/sr-primitives" }
+sp-runtime = {  path = "../../../primitives/runtime" }
 fork-tree = { path = "../../../utils/fork-tree" }
 futures = { version = "0.3.1", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1" }

substrate/client/consensus/pow/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
 primitives = { package = "sp-core", path = "../../../primitives/core" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+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" }
 inherents = { package = "sp-inherents", path = "../../../primitives/inherents" }

substrate/client/consensus/slots/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0" }
 client-api = { package = "sc-client-api", path = "../../api" }
 primitives = { package = "sp-core", path = "../../../primitives/core" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
-sp-runtime = {  path = "../../../primitives/sr-primitives" }
+sp-runtime = {  path = "../../../primitives/runtime" }
 sc-telemetry = { path = "../../telemetry" }
 consensus_common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
 inherents = { package = "sp-inherents", path = "../../../primitives/inherents" }

substrate/client/consensus/uncles/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 client-api = { package = "sc-client-api", path = "../../api" }
 primitives = { package = "sp-core", path = "../../../primitives/core" }
-sp-runtime = {  path = "../../../primitives/sr-primitives" }
+sp-runtime = {  path = "../../../primitives/runtime" }
 sp-authorship = {  path = "../../../primitives/authorship" }
 consensus_common = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
 inherents = { package = "sp-inherents", path = "../../../primitives/inherents" }

substrate/client/db/Cargo.toml

@@ -14,7 +14,7 @@ linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
 client-api = { package = "sc-client-api", path = "../api" }
 primitives = { package = "sp-core", path = "../../primitives/core" }
-sp-runtime = {  path = "../../primitives/sr-primitives" }
+sp-runtime = {  path = "../../primitives/runtime" }
 client = { package = "sc-client", path = "../" }
 state-machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
 codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }

substrate/client/executor/runtime-test/Cargo.toml

@@ -10,7 +10,7 @@ rstd = { package = "sp-std", path = "../../../primitives/sr-std", default-featur
 runtime_io = { package = "sp-io", path = "../../../primitives/sr-io", default-features = false }
 sandbox = { package = "sp-sandbox", path = "../../../primitives/sr-sandbox", default-features = false }
 primitives = { package = "sp-core",  path = "../../../primitives/core", default-features = false }
-sp-runtime = { package = "sp-runtime",  path = "../../../primitives/sr-primitives", default-features = false }
+sp-runtime = { package = "sp-runtime",  path = "../../../primitives/runtime", default-features = false }
 
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", path = "../../../client/utils/wasm-builder-runner", version = "1.0.4" }

substrate/client/finality-grandpa/Cargo.toml

@@ -14,7 +14,7 @@ tokio-executor = "0.1.8"
 tokio-timer = "0.2.11"
 rand = "0.7.2"
 codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
-sp-runtime = {  path = "../../primitives/sr-primitives" }
+sp-runtime = {  path = "../../primitives/runtime" }
 consensus_common = { package = "sp-consensus", path = "../../primitives/consensus/common" }
 primitives = { package = "sp-core",  path = "../../primitives/core" }
 sc-telemetry = { path = "../telemetry" }

substrate/client/network/Cargo.toml

@@ -28,7 +28,7 @@ consensus = { package = "sp-consensus", path = "../../primitives/consensus/commo
 client = { package = "sc-client", path = "../" }
 client-api = { package = "sc-client-api", path = "../api" }
 sp-blockchain = { path = "../../primitives/blockchain" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 sp-arithmetic = { path = "../../primitives/sr-arithmetic" }
 primitives = { package = "sp-core", path = "../../primitives/core" }
 block-builder = { package = "sc-block-builder", path = "../block-builder" }

substrate/client/offchain/Cargo.toml

@@ -22,7 +22,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive
 parking_lot = "0.9.0"
 primitives = { package = "sp-core", path = "../../primitives/core" }
 rand = "0.7.2"
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 network = { package = "sc-network", path = "../network" }
 keystore = { package = "sc-keystore", path = "../keystore" }
 

substrate/client/rpc-servers/Cargo.toml

@@ -10,7 +10,7 @@ pubsub = { package = "jsonrpc-pubsub", version = "14.0.3" }
 log = "0.4.8"
 serde = "1.0.101"
 serde_json = "1.0.41"
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
 http = { package = "jsonrpc-http-server", version = "14.0.3" }

substrate/client/rpc/Cargo.toml

@@ -18,7 +18,7 @@ rpc = { package = "jsonrpc-core", version = "14.0.3" }
 runtime_version = { package = "sp-version", path = "../../primitives/sr-version" }
 serde_json = "1.0.41"
 session = { package = "sp-session", path = "../../primitives/session" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 rpc-primitives = { package = "sp-rpc", path = "../../primitives/rpc" }
 state_machine = { package = "sp-state-machine", path = "../../primitives/state-machine" }
 sc-executor = { path = "../executor" }

substrate/client/service/Cargo.toml

@@ -30,7 +30,7 @@ sysinfo = "0.9.5"
 target_info = "0.1.0"
 keystore = { package = "sc-keystore", path = "../keystore" }
 sp-io = { path = "../../primitives/sr-io" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 sp-blockchain = { path = "../../primitives/blockchain" }
 primitives = { package = "sp-core", path = "../../primitives/core" }
 session = { package = "sp-session", path = "../../primitives/session" }

substrate/client/service/test/Cargo.toml

@@ -16,6 +16,6 @@ service = { package = "sc-service", path = "../../service", default-features = f
 network = { package = "sc-network", path = "../../network" }
 consensus = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
 client = { package = "sc-client", path = "../../" }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 primitives = { package = "sp-core", path = "../../../primitives/core" }
 txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" }

substrate/client/transaction-pool/Cargo.toml

@@ -12,7 +12,7 @@ log = "0.4.8"
 parking_lot = "0.9.0"
 primitives = { package = "sp-core",  path = "../../primitives/core" }
 sp-api = { path = "../../primitives/sr-api" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 txpool = { package = "sc-transaction-graph", path = "./graph" }
 txpool-api = { package = "sp-transaction-pool-api", path = "../../primitives/transaction-pool" }
 client-api = { package = "sc-client-api", path = "../api" }

substrate/client/transaction-pool/graph/Cargo.toml

@@ -11,7 +11,7 @@ log = "0.4.8"
 parking_lot = "0.9.0"
 serde = { version = "1.0.101", features = ["derive"] }
 primitives = { package = "sp-core",  path = "../../../primitives/core" }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 txpool-api = { package = "sp-transaction-pool-api", path = "../../../primitives/transaction-pool" }
 
 [dev-dependencies]

substrate/docs/CODEOWNERS

@@ -62,7 +62,7 @@
 /bin/node/executor/ @kianenigma
 
 # Transaction weight stuff
-/primitives/sr-primitives/src/weights.rs @kianenigma
+/primitives/runtime/src/weights.rs @kianenigma
 
 # Support crates
 /frame/support/ @thiolliere @kianenigma

substrate/frame/assets/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 # Needed for various traits. In our case, `OnFinalize`.
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 # Needed for type-safe access to storage DB.
 support = { package = "frame-support", path = "../support", default-features = false }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.

substrate/frame/aura/Cargo.toml

@@ -12,7 +12,7 @@ primitives = { package = "sp-core",  path = "../../primitives/core", default-fea
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true }
 session = { package = "pallet-session", path = "../session", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 runtime-io ={ package = "sp-io", path = "../../primitives/sr-io", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 sp-consensus-aura = { path = "../../primitives/consensus/aura", default-features = false}

substrate/frame/authority-discovery/Cargo.toml

@@ -12,8 +12,8 @@ primitives = { package = "sp-core",  path = "../../primitives/core", default-fea
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-session = { package = "pallet-session", path = "../session", default-features = false, features = ["historical"] }
+session = { package = "pallet-session", path = "../session", default-features = false, features = ["historical" ] }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 

substrate/frame/authorship/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
 sp-authorship = { path = "../../primitives/authorship", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 runtime-io ={ package = "sp-io", path = "../../primitives/sr-io", default-features = false }

substrate/frame/babe/Cargo.toml

@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 serde = { version = "1.0.101", optional = true }
 inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/balances/Cargo.toml

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true }
 safe-mix = { version = "1.0.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 

substrate/frame/collective/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 

substrate/frame/contracts/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 parity-wasm = { version = "0.41.0", default-features = false }
 wasmi-validation = { version = "0.3.0", default-features = false }
 primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 sandbox = { package = "sp-sandbox", path = "../../primitives/sr-sandbox", default-features = false }

substrate/frame/contracts/rpc/Cargo.toml

@@ -13,7 +13,7 @@ sp-blockchain = { path = "../../../primitives/blockchain" }
 primitives = { package = "sp-core",  path = "../../../primitives/core" }
 rpc-primitives = { package = "sp-rpc", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 pallet-contracts-rpc-runtime-api = { path = "./runtime-api" }
 
 [dev-dependencies]

substrate/frame/contracts/rpc/runtime-api/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 sp-api = { path = "../../../../primitives/sr-api", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../../../primitives/runtime", default-features = false }
 
 [features]
 default = ["std"]

substrate/frame/democracy/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"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 

substrate/frame/elections-phragmen/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 phragmen = { package = "sp-phragmen", path = "../../primitives/phragmen", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/elections/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 

substrate/frame/evm/Cargo.toml

@@ -12,7 +12,7 @@ system = { package = "frame-system", path = "../system", default-features = fals
 timestamp = { package = "pallet-timestamp", path = "../timestamp", default-features = false }
 balances = { package = "pallet-balances", path = "../balances", default-features = false }
 primitives = { package = "sp-core", path = "../../primitives/core", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
 primitive-types = { version = "0.6", default-features = false, features = ["rlp"] }

substrate/frame/example/Cargo.toml

@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 balances = { package = "pallet-balances", path = "../balances", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
 

substrate/frame/executive/Cargo.toml

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io ={ package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 

substrate/frame/finality-tracker/Cargo.toml

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-finality-tracker = { path = "../../primitives/finality-tracker", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 frame-system = { path = "../system", default-features = false }

substrate/frame/generic-asset/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", 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

@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
 sp-finality-grandpa = { path = "../../primitives/finality-grandpa", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/im-online/Cargo.toml

@@ -13,7 +13,7 @@ rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features
 serde = { version = "1.0.101", optional = true }
 session = { package = "pallet-session", path = "../session", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/indices/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 sp-keyring = { path = "../../primitives/keyring", optional = true }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/membership/Cargo.toml

@@ -11,7 +11,7 @@ rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "sp-core",  path = "../../primitives/core" }

substrate/frame/nicks/Cargo.toml

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", 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

@@ -9,7 +9,7 @@ balances = { package = "pallet-balances", path = "../balances", default-features
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/randomness-collective-flip/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 safe-mix = { version = "1.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }

substrate/frame/scored-pool/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", 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

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true }
 safe-mix = { version = "1.0.0", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/staking/Cargo.toml

@@ -12,7 +12,7 @@ sp-keyring = { path = "../../primitives/keyring", optional = true }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 phragmen = { package = "sp-phragmen", path = "../../primitives/phragmen", default-features = false }
 runtime-io ={ package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-staking = { path = "../../primitives/sr-staking-primitives", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/staking/reward-curve/Cargo.toml

@@ -14,4 +14,4 @@ proc-macro2 = "1.0.6"
 proc-macro-crate = "0.1.4"
 
 [dev-dependencies]
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }

substrate/frame/sudo/Cargo.toml

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 

substrate/frame/support/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.6", default-features =
 frame-metadata = { path = "../metadata", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io ={ package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", 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 }
 inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }

substrate/frame/support/test/Cargo.toml

@@ -11,7 +11,7 @@ runtime-io ={ package = "sp-io", path = "../../../primitives/sr-io", default-fea
 state-machine ={ package = "sp-state-machine", path = "../../../primitives/state-machine", optional = true }
 support = { package = "frame-support", version = "2", path = "../", default-features = false }
 inherents = { package = "sp-inherents", path = "../../../primitives/inherents", default-features = false }
-sp-runtime = { package = "sp-runtime", path = "../../../primitives/sr-primitives", default-features = false }
+sp-runtime = { package = "sp-runtime", path = "../../../primitives/runtime", default-features = false }
 primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
 trybuild = "1.0.17"
 pretty_assertions = "0.6.1"

substrate/frame/system/Cargo.toml

@@ -11,7 +11,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 primitives = { package = "sp-core",  path = "../../primitives/core", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io ={ package = "sp-io", path = "../../primitives/sr-io", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-version = { path = "../../primitives/sr-version", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 impl-trait-for-tuples = "0.1.3"

substrate/frame/timestamp/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 inherents = { package = "sp-inherents", path = "../../primitives/inherents", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }

substrate/frame/transaction-payment/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 transaction-payment-rpc-runtime-api = { package = "pallet-transaction-payment-rpc-runtime-api", path = "./rpc/runtime-api", default-features = false }

substrate/frame/transaction-payment/rpc/Cargo.toml

@@ -12,6 +12,6 @@ jsonrpc-derive = "14.0.3"
 primitives = { package = "sp-core",  path = "../../../primitives/core" }
 rpc-primitives = { package = "sp-rpc", path = "../../../primitives/rpc" }
 serde = { version = "1.0.101", features = ["derive"] }
-sp-runtime = { path = "../../../primitives/sr-primitives" }
+sp-runtime = { path = "../../../primitives/runtime" }
 sp-blockchain = { path = "../../../primitives/blockchain" }
 pallet-transaction-payment-rpc-runtime-api = { path = "./runtime-api" }

substrate/frame/transaction-payment/rpc/runtime-api/Cargo.toml

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { path = "../../../../primitives/sr-api", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../../../support", default-features = false }
 
 [dev-dependencies]

substrate/frame/treasury/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
 balances = { package = "pallet-balances", path = "../balances", default-features = false }

substrate/frame/utility/Cargo.toml

@@ -9,7 +9,7 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 support = { package = "frame-support", path = "../support", default-features = false }
 system = { package = "frame-system", path = "../system", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 rstd = { package = "sp-std", path = "../../primitives/sr-std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-features = false }
 

substrate/primitives/application-crypto/Cargo.toml

@@ -14,7 +14,7 @@ runtime-io = { package = "sp-io", path = "../../primitives/sr-io", default-featu
 
 [dev-dependencies]
 test-client = { package = "substrate-test-runtime-client", path = "../../test/utils/runtime/client" }
-sp-runtime = { path = "../../primitives/sr-primitives" }
+sp-runtime = { path = "../../primitives/runtime" }
 
 [features]
 default = [ "std" ]

substrate/primitives/authority-discovery/Cargo.toml

@@ -10,7 +10,7 @@ app-crypto = { package = "sc-application-crypto", path = "../application-crypto"
 codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
 rstd = { package = "sp-std", path = "../sr-std", default-features = false }
 sp-api = { path = "../sr-api", default-features = false }
-sp-runtime = { path = "../sr-primitives", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
 
 [features]
 default = ["std"]

substrate/primitives/block-builder/runtime-api/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-sp-runtime = { path = "../../sr-primitives", default-features = false }
+sp-runtime = { path = "../../runtime", default-features = false }
 sp-api = { path = "../../sr-api", default-features = false }
 rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.6", default-features = false }

substrate/primitives/blockchain/Cargo.toml

@@ -11,7 +11,6 @@ parking_lot = "0.9.0"
 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 = "../sr-primitives" }
+sp-runtime = { path = "../runtime" }
 sp-block-builder-runtime-api = { package = "sp-block-builder", path = "../block-builder/runtime-api" }
 sp-state-machine = { package = "sp-state-machine", path = "../state-machine" }
-

substrate/primitives/consensus/aura/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 }
 rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
 sp-api = { path = "../../sr-api", default-features = false }
-sp-runtime = { path = "../../sr-primitives", 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 }
 

substrate/primitives/consensus/babe/Cargo.toml

@@ -12,7 +12,7 @@ rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
 schnorrkel = { version = "0.8.5", features = ["preaudit_deprecated"], optional = true }
 slots = { package = "sc-consensus-slots", path = "../../../client/consensus/slots", optional = true }
 sp-api = { path = "../../sr-api", default-features = false }
-sp-runtime = {  path = "../../sr-primitives", default-features = false }
+sp-runtime = {  path = "../../runtime", default-features = false }
 sp-inherents = { package = "sp-inherents", path = "../../inherents", default-features = false }
 sp-timestamp = { path = "../../timestamp", default-features = false }
 

substrate/primitives/consensus/common/Cargo.toml

@@ -15,7 +15,7 @@ futures = { version = "0.3.1", features = ["thread-pool"] }
 futures-timer = "0.4.0"
 rstd = { package = "sp-std", path = "../../sr-std" }
 runtime_version = { package = "sp-version", path = "../../sr-version" }
-sp-runtime = {  path = "../../sr-primitives" }
+sp-runtime = {  path = "../../runtime" }
 codec = { package = "parity-scale-codec", version = "1.0.0", features = ["derive"] }
 parking_lot = "0.9.0"
 

substrate/primitives/consensus/pow/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 [dependencies]
 sp-api = { path = "../../sr-api", default-features = false }
 rstd = { package = "sp-std", path = "../../sr-std", default-features = false }
-sp-runtime = { path = "../../sr-primitives", default-features = false }
+sp-runtime = { path = "../../runtime", default-features = false }
 primitives = { package = "sp-core", path = "../../core", default-features = false }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 

substrate/primitives/finality-grandpa/Cargo.toml

@@ -10,7 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sp-std", path = "../sr-std", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 sp-api = { path = "../sr-api", default-features = false }
-sp-runtime = { path = "../sr-primitives", default-features = false }
+sp-runtime = { path = "../runtime", default-features = false }
 
 [features]
 default = ["std"]

substrate/primitives/keyring/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2018"
 
 [dependencies]
 primitives = { package = "sp-core",  path = "../core" }
-sp-runtime = { path = "../sr-primitives" }
+sp-runtime = { path = "../runtime" }
 lazy_static = "1.4.0"
 strum = { version = "0.16.0", features = ["derive"] }

substrate/primitives/offchain/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 sp-api = { path = "../sr-api", default-features = false }
-sp-runtime = {  path = "../sr-primitives", default-features = false }
+sp-runtime = {  path = "../runtime", default-features = false }
 
 [features]
 default = ["std"]

substrate/primitives/phragmen/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
 rstd = { package = "sp-std", path = "../sr-std", default-features = false }
-sp-runtime = { path = "../../primitives/sr-primitives", default-features = false }
+sp-runtime = { path = "../../primitives/runtime", default-features = false }
 
 [dev-dependencies]
 substrate-test-utils = { path = "../../test/utils" }