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