From 9891eabe2a27d24734d6c58fc91e437e04e9a7bd Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Tue, 19 May 2020 11:36:59 +0200
Subject: [PATCH] Clean a number of sp_io imports (#6072)

---
 frame/aura/Cargo.toml                  | 8 +++-----
 frame/authority-discovery/Cargo.toml   | 6 ++----
 frame/authorship/Cargo.toml            | 8 ++++----
 frame/babe/Cargo.toml                  | 4 ++--
 frame/balances/Cargo.toml              | 3 +--
 frame/benchmarking/Cargo.toml          | 2 +-
 frame/executive/Cargo.toml             | 2 +-
 frame/offences/benchmarking/Cargo.toml | 4 +---
 frame/session/Cargo.toml               | 5 ++---
 frame/session/benchmarking/Cargo.toml  | 2 +-
 frame/society/Cargo.toml               | 3 +--
 frame/support/test/Cargo.toml          | 2 +-
 frame/system/Cargo.toml                | 2 +-
 frame/system/benchmarking/Cargo.toml   | 2 +-
 frame/vesting/Cargo.toml               | 3 +--
 15 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/frame/aura/Cargo.toml b/frame/aura/Cargo.toml
index cd7f17ba13673..5a8445d270c18 100644
--- a/frame/aura/Cargo.toml
+++ b/frame/aura/Cargo.toml
@@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-application-crypto = { version = "2.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0-dev", default-features = false, path = "../../primitives/inherents" }
-sp-core = { version = "2.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0-dev", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
 pallet-session = { version = "2.0.0-dev", default-features = false, path = "../session" }
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../primitives/runtime" }
-sp-io ={ path = "../../primitives/io", default-features = false , version = "2.0.0-dev"}
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
-sp-consensus-aura = { path = "../../primitives/consensus/aura", default-features = false, version = "0.8.0-dev"}
+sp-consensus-aura = { version = "0.8.0-dev", path = "../../primitives/consensus/aura", default-features = false }
 frame-system = { version = "2.0.0-dev", default-features = false, path = "../system" }
 sp-timestamp = { version = "2.0.0-dev", default-features = false, path = "../../primitives/timestamp" }
 pallet-timestamp = { version = "2.0.0-dev", default-features = false, path = "../timestamp" }
 
 
 [dev-dependencies]
+sp-core = { version = "2.0.0-dev", default-features = false, path = "../../primitives/core" }
+sp-io ={ version = "2.0.0-dev", path = "../../primitives/io" }
 lazy_static = "1.4.0"
 parking_lot = "0.10.0"
 
@@ -38,8 +38,6 @@ std = [
 	"sp-application-crypto/std",
 	"codec/std",
 	"sp-inherents/std",
-	"sp-io/std",
-	"sp-core/std",
 	"sp-std/std",
 	"serde",
 	"sp-runtime/std",
diff --git a/frame/authority-discovery/Cargo.toml b/frame/authority-discovery/Cargo.toml
index 134dff4017aa7..24cbdbde0a95e 100644
--- a/frame/authority-discovery/Cargo.toml
+++ b/frame/authority-discovery/Cargo.toml
@@ -15,16 +15,16 @@ targets = ["x86_64-unknown-linux-gnu"]
 sp-authority-discovery = { version = "2.0.0-dev", default-features = false, path = "../../primitives/authority-discovery" }
 sp-application-crypto = { version = "2.0.0-dev", default-features = false, path = "../../primitives/application-crypto" }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
-sp-core = { version = "2.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0-dev", default-features = false, path = "../../primitives/std" }
 serde = { version = "1.0.101", optional = true }
-sp-io = { version = "2.0.0-dev", default-features = false, path = "../../primitives/io" }
 pallet-session = { version = "2.0.0-dev", features = ["historical" ], path = "../session", default-features = false }
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
+sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
+sp-io = { version = "2.0.0-dev", path = "../../primitives/io" }
 sp-staking = { version = "2.0.0-dev", default-features = false, path = "../../primitives/staking" }
 
 [features]
@@ -33,8 +33,6 @@ std = [
 	"sp-application-crypto/std",
 	"sp-authority-discovery/std",
 	"codec/std",
-	"sp-core/std",
-	"sp-io/std",
 	"sp-std/std",
 	"serde",
 	"pallet-session/std",
diff --git a/frame/authorship/Cargo.toml b/frame/authorship/Cargo.toml
index d5769783a9c25..43a48b02a0322 100644
--- a/frame/authorship/Cargo.toml
+++ b/frame/authorship/Cargo.toml
@@ -12,7 +12,6 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-core = { version = "2.0.0-dev", default-features = false, path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
 sp-inherents = { version = "2.0.0-dev", default-features = false, path = "../../primitives/inherents" }
 sp-authorship = { version = "2.0.0-dev", default-features = false, path = "../../primitives/authorship" }
@@ -20,19 +19,20 @@ sp-std = { version = "2.0.0-dev", default-features = false, path = "../../primit
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0-dev", default-features = false, path = "../system" }
-sp-io ={ path = "../../primitives/io", default-features = false , version = "2.0.0-dev"}
 impl-trait-for-tuples = "0.1.3"
 
+[dev-dependencies]
+sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
+sp-io ={ version = "2.0.0-dev", path = "../../primitives/io" }
+
 [features]
 default = ["std"]
 std = [
 	"codec/std",
-	"sp-core/std",
 	"sp-inherents/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-io/std",
 	"sp-authorship/std",
 ]
diff --git a/frame/babe/Cargo.toml b/frame/babe/Cargo.toml
index 685e508a3dd29..23946203f32c3 100644
--- a/frame/babe/Cargo.toml
+++ b/frame/babe/Cargo.toml
@@ -26,7 +26,7 @@ sp-timestamp = { version = "2.0.0-dev", default-features = false, path = "../../
 pallet-session = { version = "2.0.0-dev", default-features = false, path = "../session" }
 sp-consensus-babe = { version = "0.8.0-dev", default-features = false, path = "../../primitives/consensus/babe" }
 sp-consensus-vrf = { version = "0.8.0-dev", default-features = false, path = "../../primitives/consensus/vrf" }
-sp-io = { path = "../../primitives/io", default-features = false , version = "2.0.0-dev"}
+sp-io = { version = "2.0.0-dev", default-features = false, path = "../../primitives/io" }
 
 [dev-dependencies]
 sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
@@ -34,8 +34,8 @@ sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
 [features]
 default = ["std"]
 std = [
-	"serde",
 	"codec/std",
+	"serde",
 	"sp-std/std",
 	"sp-application-crypto/std",
 	"frame-support/std",
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 3916d5605f859..18b6fe8ceda08 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -15,13 +15,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
 sp-std = { version = "2.0.0-dev", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-benchmarking = { version = "2.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0-dev", default-features = false, path = "../system" }
 
 [dev-dependencies]
+sp-io = { version = "2.0.0-dev", path = "../../primitives/io" }
 sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
 pallet-transaction-payment = { version = "2.0.0-dev", path = "../transaction-payment" }
 
@@ -31,7 +31,6 @@ std = [
 	"serde",
 	"codec/std",
 	"sp-std/std",
-	"sp-io/std",
 	"sp-runtime/std",
 	"frame-benchmarking/std",
 	"frame-support/std",
diff --git a/frame/benchmarking/Cargo.toml b/frame/benchmarking/Cargo.toml
index fcc8e0bf92c7f..dd7de60c576d3 100644
--- a/frame/benchmarking/Cargo.toml
+++ b/frame/benchmarking/Cargo.toml
@@ -19,7 +19,7 @@ sp-api = { version = "2.0.0-dev", path = "../../primitives/api", default-feature
 sp-runtime-interface = { version = "2.0.0-dev", path = "../../primitives/runtime-interface", default-features = false }
 sp-runtime = { version = "2.0.0-dev", path = "../../primitives/runtime", default-features = false }
 sp-std = { version = "2.0.0-dev", path = "../../primitives/std", default-features = false }
-sp-io = { path = "../../primitives/io", default-features = false, version = "2.0.0-dev"}
+sp-io = { version = "2.0.0-dev", path = "../../primitives/io", default-features = false }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0-dev", default-features = false, path = "../system" }
 
diff --git a/frame/executive/Cargo.toml b/frame/executive/Cargo.toml
index 84918f7361850..edfd207bc9b90 100644
--- a/frame/executive/Cargo.toml
+++ b/frame/executive/Cargo.toml
@@ -24,7 +24,7 @@ sp-io = { version = "2.0.0-dev", default-features = false, path = "../../primiti
 [dev-dependencies]
 hex-literal = "0.2.1"
 sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
-sp-io ={ path = "../../primitives/io", version = "2.0.0-dev"}
+sp-io ={ version = "2.0.0-dev", path = "../../primitives/io" }
 pallet-indices = { version = "2.0.0-dev", path = "../indices" }
 pallet-balances = { version = "2.0.0-dev", path = "../balances" }
 pallet-transaction-payment = { version = "2.0.0-dev", path = "../transaction-payment" }
diff --git a/frame/offences/benchmarking/Cargo.toml b/frame/offences/benchmarking/Cargo.toml
index ff77497db0bd2..e9cd2be005274 100644
--- a/frame/offences/benchmarking/Cargo.toml
+++ b/frame/offences/benchmarking/Cargo.toml
@@ -23,7 +23,6 @@ pallet-im-online = { version = "2.0.0-dev", default-features = false, path = "..
 pallet-offences = { version = "2.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../offences" }
 pallet-session = { version = "2.0.0-dev", default-features = false, path = "../../session" }
 pallet-staking = { version = "2.0.0-dev", default-features = false, features = ["runtime-benchmarks"], path = "../../staking" }
-sp-io = { path = "../../../primitives/io", default-features = false, version = "2.0.0-dev"}
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../../primitives/runtime" }
 sp-staking = { version = "2.0.0-dev", default-features = false, path = "../../../primitives/staking" }
 sp-std = { version = "2.0.0-dev", default-features = false, path = "../../../primitives/std" }
@@ -34,7 +33,7 @@ pallet-staking-reward-curve = { version = "2.0.0-dev", path = "../../staking/rew
 pallet-timestamp = { version = "2.0.0-dev", path = "../../timestamp" }
 serde = { version = "1.0.101" }
 sp-core = { version = "2.0.0-dev", path = "../../../primitives/core" }
-sp-io ={ path = "../../../primitives/io", version = "2.0.0-dev"}
+sp-io = { version = "2.0.0-dev", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
@@ -52,5 +51,4 @@ std = [
 	"sp-runtime/std",
 	"sp-staking/std",
 	"sp-std/std",
-	"sp-io/std",
 ]
diff --git a/frame/session/Cargo.toml b/frame/session/Cargo.toml
index b03eea494a111..8031804fcd73f 100644
--- a/frame/session/Cargo.toml
+++ b/frame/session/Cargo.toml
@@ -21,12 +21,12 @@ sp-staking = { version = "2.0.0-dev", default-features = false, path = "../../pr
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0-dev", default-features = false, path = "../system" }
 pallet-timestamp = { version = "2.0.0-dev", default-features = false, path = "../timestamp" }
-sp-trie = { optional = true, path = "../../primitives/trie", default-features = false, version = "2.0.0-dev"}
-sp-io ={ path = "../../primitives/io", default-features = false , version = "2.0.0-dev"}
+sp-trie = { version = "2.0.0-dev", optional = true, default-features = false, path = "../../primitives/trie" }
 impl-trait-for-tuples = "0.1.3"
 
 [dev-dependencies]
 sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
+sp-io ={ version = "2.0.0-dev", path = "../../primitives/io" }
 sp-application-crypto = { version = "2.0.0-dev", path = "../../primitives/application-crypto" }
 lazy_static = "1.4.0"
 
@@ -43,5 +43,4 @@ std = [
 	"sp-staking/std",
 	"pallet-timestamp/std",
 	"sp-trie/std",
-	"sp-io/std",
 ]
diff --git a/frame/session/benchmarking/Cargo.toml b/frame/session/benchmarking/Cargo.toml
index d263e1af9a64a..20ef9c6eb61ce 100644
--- a/frame/session/benchmarking/Cargo.toml
+++ b/frame/session/benchmarking/Cargo.toml
@@ -25,7 +25,7 @@ serde = { version = "1.0.101" }
 codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] }
 sp-core = { version = "2.0.0-dev", path = "../../../primitives/core" }
 pallet-staking-reward-curve = { version = "2.0.0-dev", path = "../../staking/reward-curve" }
-sp-io ={ path = "../../../primitives/io", version = "2.0.0-dev"}
+sp-io ={ version = "2.0.0-dev", path = "../../../primitives/io" }
 pallet-timestamp = { version = "2.0.0-dev", path = "../../timestamp" }
 pallet-balances = { version = "2.0.0-dev", path = "../../balances" }
 
diff --git a/frame/society/Cargo.toml b/frame/society/Cargo.toml
index 24380aff555ce..86c800d571cee 100644
--- a/frame/society/Cargo.toml
+++ b/frame/society/Cargo.toml
@@ -14,7 +14,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
-sp-io ={ path = "../../primitives/io", default-features = false , version = "2.0.0-dev"}
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-std = { version = "2.0.0-dev", default-features = false, path = "../../primitives/std" }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
@@ -23,6 +22,7 @@ rand_chacha = { version = "0.2", default-features = false }
 
 [dev-dependencies]
 sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
+sp-io ={ version = "2.0.0-dev", path = "../../primitives/io" }
 pallet-balances = { version = "2.0.0-dev", path = "../balances" }
 
 [features]
@@ -30,7 +30,6 @@ default = ["std"]
 std = [
 	"codec/std",
 	"serde",
-	"sp-io/std",
 	"sp-runtime/std",
 	"rand_chacha/std",
 	"sp-std/std",
diff --git a/frame/support/test/Cargo.toml b/frame/support/test/Cargo.toml
index 59014d893c642..e676106e17739 100644
--- a/frame/support/test/Cargo.toml
+++ b/frame/support/test/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 serde = { version = "1.0.101", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
-sp-io ={ path = "../../../primitives/io", default-features = false , version = "2.0.0-dev"}
+sp-io ={ version = "2.0.0-dev", path = "../../../primitives/io", default-features = false }
 sp-state-machine = { version = "0.8.0-dev", optional = true, path = "../../../primitives/state-machine" }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../" }
 sp-inherents = { version = "2.0.0-dev", default-features = false, path = "../../../primitives/inherents" }
diff --git a/frame/system/Cargo.toml b/frame/system/Cargo.toml
index 099290f2c7d11..254938df2b8c3 100644
--- a/frame/system/Cargo.toml
+++ b/frame/system/Cargo.toml
@@ -16,7 +16,7 @@ serde = { version = "1.0.101", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
 sp-core = { version = "2.0.0-dev", default-features = false, path = "../../primitives/core" }
 sp-std = { version = "2.0.0-dev", default-features = false, path = "../../primitives/std" }
-sp-io = { path = "../../primitives/io", default-features = false, version = "2.0.0-dev"}
+sp-io = { version = "2.0.0-dev", path = "../../primitives/io", default-features = false }
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 sp-version = { version = "2.0.0-dev", default-features = false, path = "../../primitives/version" }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
diff --git a/frame/system/benchmarking/Cargo.toml b/frame/system/benchmarking/Cargo.toml
index 60ee030011217..7ce619f413f3f 100644
--- a/frame/system/benchmarking/Cargo.toml
+++ b/frame/system/benchmarking/Cargo.toml
@@ -22,7 +22,7 @@ sp-core = { version = "2.0.0-dev", default-features = false, path = "../../../pr
 
 [dev-dependencies]
 serde = { version = "1.0.101" }
-sp-io ={ path = "../../../primitives/io", version = "2.0.0-dev"}
+sp-io ={ version = "2.0.0-dev", path = "../../../primitives/io" }
 
 [features]
 default = ["std"]
diff --git a/frame/vesting/Cargo.toml b/frame/vesting/Cargo.toml
index 96282db360811..70c97006df25c 100644
--- a/frame/vesting/Cargo.toml
+++ b/frame/vesting/Cargo.toml
@@ -16,13 +16,13 @@ serde = { version = "1.0.101", optional = true }
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
 enumflags2 = { version = "0.6.2" }
 sp-std = { version = "2.0.0-dev", default-features = false, path = "../../primitives/std" }
-sp-io = { version = "2.0.0-dev", default-features = false, path = "../../primitives/io" }
 sp-runtime = { version = "2.0.0-dev", default-features = false, path = "../../primitives/runtime" }
 frame-support = { version = "2.0.0-dev", default-features = false, path = "../support" }
 frame-system = { version = "2.0.0-dev", default-features = false, path = "../system" }
 frame-benchmarking = { version = "2.0.0-dev", default-features = false, path = "../benchmarking", optional = true }
 
 [dev-dependencies]
+sp-io = { version = "2.0.0-dev", path = "../../primitives/io" }
 sp-core = { version = "2.0.0-dev", path = "../../primitives/core" }
 pallet-balances = { version = "2.0.0-dev", path = "../balances" }
 sp-storage = { version = "2.0.0-dev", path = "../../primitives/storage" }
@@ -34,7 +34,6 @@ std = [
 	"serde",
 	"codec/std",
 	"sp-std/std",
-	"sp-io/std",
 	"sp-runtime/std",
 	"frame-support/std",
 	"frame-system/std",