Normalize Crate Names in SRML/Node Template (#3543)

* Fix some instances of `runtime-io`

* Patch a bunch

* More patches for consistancy

* more patch

* Fix various build issues

* Fix tests

* Patch `srml-support-*` crates

* Fix doc tests

* Revert "Fix doc tests"

This reverts commit ba2ec61da7acc36821a70e76a31a6a5bf13bbe95.

* Revert "Patch `srml-support-*` crates"

This reverts commit 9a6070450107dec17784ba34af4b871023f6dc81.

* Missed one

* Fix doc tests

substrate/Cargo.lock

@@ -4210,7 +4210,6 @@ dependencies = [
  "sr-primitives 2.0.0",
  "sr-std 2.0.0",
  "srml-support 2.0.0",
- "srml-support-procedural 2.0.0",
  "srml-system 2.0.0",
  "substrate-primitives 2.0.0",
 ]

substrate/core/application-crypto/Cargo.toml

@@ -10,7 +10,7 @@ primitives = { package = "substrate-primitives", path = "../primitives", default
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 rstd = { package = "sr-std", path = "../sr-std", default-features = false }
-rio = { package = "sr-io", path = "../sr-io", default-features = false }
+runtime-io = { package = "sr-io", path = "../sr-io", default-features = false }
 
 [dev-dependencies]
 test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" }
@@ -18,4 +18,4 @@ sr-primitives = { path = "../sr-primitives" }
 
 [features]
 default = [ "std" ]
-std = [ "primitives/std", "codec/std", "serde", "rstd/std", "rio/std" ]
+std = [ "primitives/std", "codec/std", "serde", "rstd/std", "runtime-io/std" ]

substrate/core/application-crypto/src/ed25519.rs

@@ -34,19 +34,19 @@ impl RuntimePublic for Public {
 	type Signature = Signature;
 
 	fn all(key_type: KeyTypeId) -> crate::Vec<Self> {
-		rio::ed25519_public_keys(key_type)
+		runtime_io::ed25519_public_keys(key_type)
 	}
 
 	fn generate_pair(key_type: KeyTypeId, seed: Option<&str>) -> Self {
-		rio::ed25519_generate(key_type, seed)
+		runtime_io::ed25519_generate(key_type, seed)
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		rio::ed25519_sign(key_type, self, msg)
+		runtime_io::ed25519_sign(key_type, self, msg)
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {
-		rio::ed25519_verify(&signature, msg.as_ref(), self)
+		runtime_io::ed25519_verify(&signature, msg.as_ref(), self)
 	}
 }
 

substrate/core/application-crypto/src/sr25519.rs

@@ -34,19 +34,19 @@ impl RuntimePublic for Public {
 	type Signature = Signature;
 
 	fn all(key_type: KeyTypeId) -> crate::Vec<Self> {
-		rio::sr25519_public_keys(key_type)
+		runtime_io::sr25519_public_keys(key_type)
 	}
 
 	fn generate_pair(key_type: KeyTypeId, seed: Option<&str>) -> Self {
-		rio::sr25519_generate(key_type, seed)
+		runtime_io::sr25519_generate(key_type, seed)
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		rio::sr25519_sign(key_type, self, msg)
+		runtime_io::sr25519_sign(key_type, self, msg)
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {
-		rio::sr25519_verify(&signature, msg.as_ref(), self)
+		runtime_io::sr25519_verify(&signature, msg.as_ref(), self)
 	}
 }
 

substrate/srml/assets/Cargo.toml

@@ -10,14 +10,14 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 # Needed for various traits. In our case, `OnFinalize`.
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 # Needed for type-safe access to storage DB.
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 # `system` module provides us with all sorts of useful stuff and macros depend on it being around.
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
 rstd = { package = "sr-std", path = "../../core/sr-std" }
-runtime_io = { package = "sr-io", path = "../../core/sr-io" }
+runtime-io = { package = "sr-io", path = "../../core/sr-io" }
 
 [features]
 default = ["std"]
@@ -25,6 +25,6 @@ std = [
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
 ]

substrate/srml/assets/src/lib.rs

@@ -130,7 +130,7 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage, ensure};
+use support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage, ensure};
 use sr_primitives::traits::{Member, SimpleArithmetic, Zero, StaticLookup};
 use system::ensure_signed;
 use sr_primitives::traits::One;
@@ -240,7 +240,7 @@ mod tests {
 	use super::*;
 
 	use runtime_io::with_externalities;
-	use srml_support::{impl_outer_origin, assert_ok, assert_noop, parameter_types};
+	use support::{impl_outer_origin, assert_ok, assert_noop, parameter_types};
 	use primitives::{H256, Blake2Hasher};
 	// The testing primitives are very useful for avoiding having to work with signatures
 	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.

substrate/srml/aura/Cargo.toml

@@ -13,8 +13,8 @@ rstd = { package = "sr-std", path = "../../core/sr-std", default-features = fals
 serde = { version = "1.0", optional = true }
 session = { package = "srml-session", path = "../session", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false, features = [ "wasm-nice-panic-message" ] }
-srml-support = { path = "../support", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false, features = [ "wasm-nice-panic-message" ] }
+support = { package = "srml-support", path = "../support", default-features = false }
 substrate-consensus-aura-primitives = { path = "../../core/consensus/aura/primitives", default-features = false}
 system = { package = "srml-system", path = "../system", default-features = false }
 timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false }
@@ -29,12 +29,12 @@ std = [
 	"app-crypto/std",
 	"codec/std",
 	"inherents/std",
-	"runtime_io/std",
+	"runtime-io/std",
 	"primitives/std",
 	"rstd/std",
 	"serde",
 	"sr-primitives/std",
-	"srml-support/std",
+	"support/std",
 	"substrate-consensus-aura-primitives/std",
 	"system/std",
 	"timestamp/std",

substrate/srml/aura/src/lib.rs

@@ -49,7 +49,7 @@ pub use timestamp;
 
 use rstd::{result, prelude::*};
 use codec::{Encode, Decode};
-use srml_support::{
+use support::{
 	decl_storage, decl_module, Parameter, storage::StorageValue, traits::{Get, FindAuthor},
 	ConsensusEngineId,
 };

substrate/srml/aura/src/mock.rs

@@ -24,7 +24,7 @@ use sr_primitives::{
 	traits::IdentityLookup, Perbill,
 	testing::{Header, UintAuthorityId},
 };
-use srml_support::{impl_outer_origin, parameter_types};
+use support::{impl_outer_origin, parameter_types};
 use runtime_io;
 use primitives::{H256, Blake2Hasher};
 

substrate/srml/authority-discovery/Cargo.toml

@@ -13,8 +13,8 @@ rstd = { package = "sr-std", path = "../../core/sr-std", default-features = fals
 serde = { version = "1.0", optional = true }
 session = { package = "srml-session", path = "../session", default-features = false }
 im-online = { package = "srml-im-online", path = "../im-online", default-features = false }
-srml-support = { path = "../support", default-features = false }
-sr-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
+runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
@@ -30,8 +30,8 @@ std = [
 	"serde",
 	"session/std",
 	"im-online/std",
-	"srml-support/std",
-	"sr-io/std",
+	"support/std",
+	"runtime-io/std",
 	"system/std",
 	"app-crypto/std",
 ]

substrate/srml/authority-discovery/src/lib.rs

@@ -31,7 +31,7 @@
 use app_crypto::RuntimeAppPublic;
 use codec::{Decode, Encode};
 use rstd::prelude::*;
-use srml_support::{decl_module, decl_storage, StorageValue};
+use support::{decl_module, decl_storage, StorageValue};
 
 pub trait Trait: system::Trait + session::Trait + im_online::Trait {}
 
@@ -132,13 +132,13 @@ mod tests {
 	use app_crypto::Pair;
 	use primitives::testing::KeyStore;
 	use primitives::{crypto::key_types, sr25519, traits::BareCryptoStore, H256};
-	use sr_io::{with_externalities, TestExternalities};
+	use runtime_io::{with_externalities, TestExternalities};
 	use sr_primitives::generic::UncheckedExtrinsic;
 	use sr_primitives::testing::{Header, UintAuthorityId};
 	use sr_primitives::traits::{ConvertInto, IdentityLookup, OpaqueKeys};
 	use sr_primitives::Perbill;
 	use sr_staking_primitives::CurrentElectedSet;
-	use srml_support::{impl_outer_origin, parameter_types};
+	use support::{impl_outer_origin, parameter_types};
 
 	type AuthorityDiscovery = Module<Test>;
 	type SessionIndex = u32;

substrate/srml/authorship/Cargo.toml

@@ -11,9 +11,9 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 
 [features]
 default = ["std"]
@@ -23,7 +23,7 @@ std = [
 	"inherents/std",
 	"sr-primitives/std",
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
-	"runtime_io/std",
+	"runtime-io/std",
 ]

substrate/srml/authorship/src/lib.rs

@@ -22,9 +22,9 @@
 
 use rstd::{result, prelude::*};
 use rstd::collections::btree_set::BTreeSet;
-use srml_support::{decl_module, decl_storage, for_each_tuple, StorageValue};
-use srml_support::traits::{FindAuthor, VerifySeal, Get};
-use srml_support::dispatch::Result as DispatchResult;
+use support::{decl_module, decl_storage, for_each_tuple, StorageValue};
+use support::traits::{FindAuthor, VerifySeal, Get};
+use support::dispatch::Result as DispatchResult;
 use codec::{Encode, Decode};
 use system::ensure_none;
 use sr_primitives::traits::{Header as HeaderT, One, Zero};
@@ -441,7 +441,7 @@ mod tests {
 	use sr_primitives::testing::Header;
 	use sr_primitives::generic::DigestItem;
 	use sr_primitives::Perbill;
-	use srml_support::{parameter_types, impl_outer_origin, ConsensusEngineId};
+	use support::{parameter_types, impl_outer_origin, ConsensusEngineId};
 
 	impl_outer_origin!{
 		pub enum Origin for Test {}

substrate/srml/babe/Cargo.toml

@@ -12,12 +12,12 @@ inherents = { package = "substrate-inherents", path = "../../core/inherents", de
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false }
 session = { package = "srml-session", path = "../session", default-features = false }
 babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../../core/consensus/babe/primitives", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false, features = [ "wasm-nice-panic-message" ] }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false, features = [ "wasm-nice-panic-message" ] }
 
 [dev-dependencies]
 lazy_static = "1.3.0"
@@ -30,7 +30,7 @@ std = [
 	"serde",
 	"codec/std",
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"sr-primitives/std",
 	"sr-staking-primitives/std",
 	"system/std",
@@ -38,5 +38,5 @@ std = [
 	"inherents/std",
 	"babe-primitives/std",
 	"session/std",
-	"runtime_io/std",
+	"runtime-io/std",
 ]

substrate/srml/babe/src/lib.rs

@@ -26,7 +26,7 @@
 pub use timestamp;
 
 use rstd::{result, prelude::*};
-use srml_support::{decl_storage, decl_module, StorageValue, StorageMap, traits::FindAuthor, traits::Get};
+use support::{decl_storage, decl_module, StorageValue, StorageMap, traits::FindAuthor, traits::Get};
 use timestamp::{OnTimestampSet};
 use sr_primitives::{generic::DigestItem, ConsensusEngineId, Perbill};
 use sr_primitives::traits::{IsMember, SaturatedConversion, Saturating, RandomnessBeacon};

substrate/srml/balances/Cargo.toml

@@ -11,11 +11,11 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 substrate-keyring = { path = "../../core/keyring", optional = true }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
 
 [features]
@@ -26,7 +26,7 @@ std = [
 	"substrate-keyring",
 	"codec/std",
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"sr-primitives/std",
 	"system/std",
 ]

substrate/srml/balances/src/lib.rs

@@ -106,7 +106,7 @@
 //! The Contract module uses the `Currency` trait to handle gas payment, and its types inherit from `Currency`:
 //!
 //! ```
-//! use srml_support::traits::Currency;
+//! use support::traits::Currency;
 //! # pub trait Trait: system::Trait {
 //! # 	type Currency: Currency<Self::AccountId>;
 //! # }
@@ -120,14 +120,14 @@
 //! The Staking module uses the `LockableCurrency` trait to lock a stash account's funds:
 //!
 //! ```
-//! use srml_support::traits::{WithdrawReasons, LockableCurrency};
+//! use support::traits::{WithdrawReasons, LockableCurrency};
 //! use sr_primitives::traits::Bounded;
 //! pub trait Trait: system::Trait {
 //! 	type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
 //! }
 //! # struct StakingLedger<T: Trait> {
 //! # 	stash: <T as system::Trait>::AccountId,
-//! # 	total: <<T as Trait>::Currency as srml_support::traits::Currency<<T as system::Trait>::AccountId>>::Balance,
+//! # 	total: <<T as Trait>::Currency as support::traits::Currency<<T as system::Trait>::AccountId>>::Balance,
 //! # 	phantom: std::marker::PhantomData<T>,
 //! # }
 //! # const STAKING_ID: [u8; 8] = *b"staking ";
@@ -161,13 +161,13 @@
 use rstd::prelude::*;
 use rstd::{cmp, result, mem};
 use codec::{Codec, Encode, Decode};
-use srml_support::{StorageValue, StorageMap, Parameter, decl_event, decl_storage, decl_module};
-use srml_support::traits::{
+use support::{StorageValue, StorageMap, Parameter, decl_event, decl_storage, decl_module};
+use support::traits::{
 	UpdateBalanceOutcome, Currency, OnFreeBalanceZero, OnUnbalanced,
 	WithdrawReason, WithdrawReasons, LockIdentifier, LockableCurrency, ExistenceRequirement,
 	Imbalance, SignedImbalance, ReservableCurrency, Get,
 };
-use srml_support::dispatch::Result;
+use support::dispatch::Result;
 use sr_primitives::traits::{
 	Zero, SimpleArithmetic, StaticLookup, Member, CheckedAdd, CheckedSub, MaybeSerializeDebug,
 	Saturating, Bounded, SignedExtension, SaturatedConversion, DispatchError, Convert,

substrate/srml/balances/src/mock.rs

@@ -22,8 +22,8 @@ use sr_primitives::{Perbill, traits::{Convert, IdentityLookup}, testing::Header,
 	weights::{DispatchInfo, Weight}};
 use primitives::{H256, Blake2Hasher};
 use runtime_io;
-use srml_support::{impl_outer_origin, parameter_types};
-use srml_support::traits::Get;
+use support::{impl_outer_origin, parameter_types};
+use support::traits::Get;
 use std::cell::RefCell;
 use crate::{GenesisConfig, Module, Trait};
 

substrate/srml/balances/src/tests.rs

@@ -21,7 +21,7 @@
 use super::*;
 use mock::{Balances, ExtBuilder, Runtime, System, info_from_weight, CALL};
 use runtime_io::with_externalities;
-use srml_support::{
+use support::{
 	assert_noop, assert_ok, assert_err,
 	traits::{LockableCurrency, LockIdentifier, WithdrawReason, WithdrawReasons,
 	Currency, ReservableCurrency}

substrate/srml/collective/Cargo.toml

@@ -10,9 +10,9 @@ safe-mix = { version = "1.0", default-features = false}
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
@@ -27,8 +27,8 @@ std = [
 	"primitives/std",
 	"rstd/std",
 	"serde",
-	"runtime_io/std",
-	"srml-support/std",
+	"runtime-io/std",
+	"support/std",
 	"sr-primitives/std",
 	"system/std",
 ]

substrate/srml/collective/src/lib.rs

@@ -27,7 +27,7 @@ use rstd::{prelude::*, result};
 use primitives::u32_trait::Value as U32;
 use sr_primitives::traits::{Hash, EnsureOrigin};
 use sr_primitives::weights::SimpleDispatchInfo;
-use srml_support::{
+use support::{
 	dispatch::{Dispatchable, Parameter}, codec::{Encode, Decode},
 	traits::{ChangeMembers, InitializeMembers}, StorageValue, StorageMap, decl_module, decl_event,
 	decl_storage, ensure,
@@ -379,7 +379,7 @@ impl<
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use srml_support::{Hashable, assert_ok, assert_noop, parameter_types};
+	use support::{Hashable, assert_ok, assert_noop, parameter_types};
 	use system::{EventRecord, Phase};
 	use hex_literal::hex;
 	use runtime_io::with_externalities;
@@ -427,7 +427,7 @@ mod tests {
 	pub type Block = sr_primitives::generic::Block<Header, UncheckedExtrinsic>;
 	pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic<u32, u64, Call, ()>;
 
-	srml_support::construct_runtime!(
+	support::construct_runtime!(
 		pub enum Test where
 			Block = Block,
 			NodeBlock = Block,

substrate/srml/contracts/Cargo.toml

@@ -15,7 +15,7 @@ sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sandbox = { package = "sr-sandbox", path = "../../core/sr-sandbox", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false }
 
@@ -39,7 +39,7 @@ std = [
 	"runtime-io/std",
 	"rstd/std",
 	"sandbox/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
 	"timestamp/std",
 	"parity-wasm/std",

substrate/srml/contracts/src/account_db.rs

@@ -26,8 +26,8 @@ use rstd::collections::btree_map::{BTreeMap, Entry};
 use rstd::prelude::*;
 use runtime_io::blake2_256;
 use sr_primitives::traits::{Bounded, Zero};
-use srml_support::traits::{Currency, Get, Imbalance, SignedImbalance, UpdateBalanceOutcome};
-use srml_support::{storage::child, StorageMap};
+use support::traits::{Currency, Get, Imbalance, SignedImbalance, UpdateBalanceOutcome};
+use support::{storage::child, StorageMap};
 use system;
 
 // Note: we don't provide Option<Contract> because we can't create

substrate/srml/contracts/src/exec.rs

@@ -22,7 +22,7 @@ use crate::rent;
 
 use rstd::prelude::*;
 use sr_primitives::traits::{Bounded, CheckedAdd, CheckedSub, Zero};
-use srml_support::traits::{WithdrawReason, Currency};
+use support::traits::{WithdrawReason, Currency};
 use timestamp;
 
 pub type AccountIdOf<T> = <T as system::Trait>::AccountId;

substrate/srml/contracts/src/gas.rs

@@ -18,8 +18,8 @@ use crate::{GasSpent, Module, Trait, BalanceOf, NegativeImbalanceOf};
 use rstd::convert::TryFrom;
 use sr_primitives::BLOCK_FULL;
 use sr_primitives::traits::{CheckedMul, Zero, SaturatedConversion, SimpleArithmetic, UniqueSaturatedInto};
-use srml_support::StorageValue;
-use srml_support::traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReason};
+use support::StorageValue;
+use support::traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReason};
 
 #[cfg(test)]
 use std::{any::Any, fmt::Debug};

substrate/srml/contracts/src/lib.rs

@@ -103,12 +103,12 @@ use runtime_io::blake2_256;
 use sr_primitives::traits::{
 	Hash, StaticLookup, Zero, MaybeSerializeDebug, Member
 };
-use srml_support::dispatch::{Result, Dispatchable};
-use srml_support::{
+use support::dispatch::{Result, Dispatchable};
+use support::{
 	Parameter, StorageMap, StorageValue, decl_module, decl_event, decl_storage, storage::child,
 	parameter_types,
 };
-use srml_support::traits::{OnFreeBalanceZero, OnUnbalanced, Currency, Get};
+use support::traits::{OnFreeBalanceZero, OnUnbalanced, Currency, Get};
 use system::{ensure_signed, RawOrigin, ensure_root};
 use primitives::storage::well_known_keys::CHILD_STORAGE_KEY_PREFIX;
 use timestamp;

substrate/srml/contracts/src/rent.rs

@@ -17,8 +17,8 @@
 use crate::{BalanceOf, ContractInfo, ContractInfoOf, TombstoneContractInfo, Trait, AliveContractInfo};
 use sr_primitives::traits::{Bounded, CheckedDiv, CheckedMul, Saturating, Zero,
 	SaturatedConversion};
-use srml_support::traits::{Currency, ExistenceRequirement, Get, WithdrawReason};
-use srml_support::StorageMap;
+use support::traits::{Currency, ExistenceRequirement, Get, WithdrawReason};
+use support::StorageMap;
 
 #[derive(PartialEq, Eq, Copy, Clone)]
 #[must_use]

substrate/srml/contracts/src/tests.rs

@@ -33,7 +33,7 @@ use runtime_io::with_externalities;
 use sr_primitives::testing::{Digest, DigestItem, Header, UintAuthorityId, H256};
 use sr_primitives::traits::{BlakeTwo256, Hash, IdentityLookup};
 use sr_primitives::{Perbill, BuildStorage};
-use srml_support::{
+use support::{
 	assert_ok, assert_err, impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types,
 	storage::child, StorageMap, StorageValue, traits::{Currency, Get},
 };
@@ -49,7 +49,7 @@ mod contract {
 	// needs to give a name for the current crate.
 	// This hack is required for `impl_outer_event!`.
 	pub use super::super::*;
-	use srml_support::impl_outer_event;
+	use support::impl_outer_event;
 }
 impl_outer_event! {
 	pub enum MetaEvent for Test {

substrate/srml/contracts/src/wasm/code_cache.rs

@@ -31,7 +31,7 @@ use crate::wasm::{prepare, runtime::Env, PrefabWasmModule};
 use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Trait};
 use rstd::prelude::*;
 use sr_primitives::traits::{Hash, Bounded};
-use srml_support::StorageMap;
+use support::StorageMap;
 
 /// Gas metering token that used for charging storing code into the code storage.
 ///

substrate/srml/council/src/lib.rs

@@ -39,8 +39,8 @@ mod tests {
 	// These re-exports are here for a reason, edit with care
 	pub use super::*;
 	pub use runtime_io::with_externalities;
-	use srml_support::{impl_outer_origin, impl_outer_event, impl_outer_dispatch, parameter_types};
-	use srml_support::traits::Get;
+	use support::{impl_outer_origin, impl_outer_event, impl_outer_dispatch, parameter_types};
+	use support::traits::Get;
 	pub use primitives::{H256, Blake2Hasher, u32_trait::{_1, _2, _3, _4}};
 	pub use sr_primitives::traits::{BlakeTwo256, IdentityLookup};
 	pub use sr_primitives::testing::{Digest, DigestItem, Header};

substrate/srml/democracy/Cargo.toml

@@ -9,9 +9,9 @@ serde = { version = "1.0", optional = true, features = ["derive"] }
 safe-mix = { version = "1.0", default-features = false}
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
@@ -25,8 +25,8 @@ std = [
 	"safe-mix/std",
 	"codec/std",
 	"rstd/std",
-	"runtime_io/std",
-	"srml-support/std",
+	"runtime-io/std",
+	"support/std",
 	"sr-primitives/std",
 	"system/std",
 ]

substrate/srml/democracy/src/lib.rs

@@ -23,7 +23,7 @@ use rstd::{result, convert::TryFrom};
 use sr_primitives::traits::{Zero, Bounded, CheckedMul, CheckedDiv, EnsureOrigin, Hash};
 use sr_primitives::weights::SimpleDispatchInfo;
 use codec::{Encode, Decode, Input, Output, Error};
-use srml_support::{
+use support::{
 	decl_module, decl_storage, decl_event, ensure, StorageValue, StorageMap, StorageLinkedMap,
 	Parameter, Dispatchable,
 	traits::{
@@ -31,7 +31,7 @@ use srml_support::{
 		OnFreeBalanceZero
 	}
 };
-use srml_support::dispatch::Result;
+use support::dispatch::Result;
 use system::{ensure_signed, ensure_root};
 
 mod vote_threshold;
@@ -970,7 +970,7 @@ impl<T: Trait> OnFreeBalanceZero<T::AccountId> for Module<T> {
 mod tests {
 	use super::*;
 	use runtime_io::with_externalities;
-	use srml_support::{
+	use support::{
 		impl_outer_origin, impl_outer_dispatch, assert_noop, assert_ok, parameter_types,
 		traits::Contains
 	};

substrate/srml/elections/Cargo.toml

@@ -10,9 +10,9 @@ safe-mix = { version = "1.0", default-features = false}
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
@@ -27,8 +27,8 @@ std = [
 	"primitives/std",
 	"rstd/std",
 	"serde",
-	"runtime_io/std",
-	"srml-support/std",
+	"runtime-io/std",
+	"support/std",
 	"sr-primitives/std",
 	"system/std",
 ]

substrate/srml/elections/src/lib.rs

@@ -27,7 +27,7 @@ use rstd::prelude::*;
 use sr_primitives::traits::{Zero, One, StaticLookup, Bounded, Saturating};
 use sr_primitives::weights::SimpleDispatchInfo;
 use runtime_io::print;
-use srml_support::{
+use support::{
 	StorageValue, StorageMap,
 	dispatch::Result, decl_storage, decl_event, ensure, decl_module,
 	traits::{
@@ -1102,7 +1102,7 @@ impl<T: Trait> Module<T> {
 mod tests {
 	use super::*;
 	use std::cell::RefCell;
-	use srml_support::{assert_ok, assert_err, assert_noop, parameter_types};
+	use support::{assert_ok, assert_err, assert_noop, parameter_types};
 	use runtime_io::with_externalities;
 	use primitives::{H256, Blake2Hasher};
 	use sr_primitives::{
@@ -1227,7 +1227,7 @@ mod tests {
 	pub type Block = sr_primitives::generic::Block<Header, UncheckedExtrinsic>;
 	pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic<u32, u64, Call, ()>;
 
-	srml_support::construct_runtime!(
+	support::construct_runtime!(
 		pub enum Test where
 			Block = Block,
 			NodeBlock = Block,

substrate/srml/example/Cargo.toml

@@ -7,12 +7,12 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 balances = { package = "srml-balances", path = "../balances", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-rio = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
@@ -23,9 +23,9 @@ std = [
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
 	"balances/std",
-	"rio/std",
+	"runtime-io/std",
 	"rstd/std"
 ]

substrate/srml/example/src/lib.rs

@@ -254,7 +254,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use rstd::marker::PhantomData;
-use srml_support::{StorageValue, dispatch::Result, decl_module, decl_storage, decl_event};
+use support::{StorageValue, dispatch::Result, decl_module, decl_storage, decl_event};
 use system::{ensure_signed, ensure_root};
 use codec::{Encode, Decode};
 use sr_primitives::{
@@ -576,7 +576,7 @@ impl<T: Trait + Send + Sync> SignedExtension for WatchDummy<T> {
 		// check for `set_dummy`
 		match call {
 			Call::set_dummy(..) => {
-				rio::print("set_dummy was received.");
+				runtime_io::print("set_dummy was received.");
 
 				let mut valid_tx = ValidTransaction::default();
 				valid_tx.priority = Bounded::max_value();
@@ -591,8 +591,8 @@ impl<T: Trait + Send + Sync> SignedExtension for WatchDummy<T> {
 mod tests {
 	use super::*;
 
-	use srml_support::{assert_ok, impl_outer_origin, parameter_types};
-	use rio::with_externalities;
+	use support::{assert_ok, impl_outer_origin, parameter_types};
+	use runtime_io::with_externalities;
 	use primitives::{H256, Blake2Hasher};
 	// The testing primitives are very useful for avoiding having to work with signatures
 	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
@@ -662,7 +662,7 @@ mod tests {
 
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mockup.
-	fn new_test_ext() -> rio::TestExternalities<Blake2Hasher> {
+	fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
 		let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
 		balances::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();

substrate/srml/executive/Cargo.toml

@@ -8,9 +8,9 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
@@ -23,10 +23,10 @@ balances = { package = "srml-balances", path = "../balances" }
 default = ["std"]
 std = [
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"serde",
 	"codec/std",
 	"sr-primitives/std",
-	"runtime_io/std",
+	"runtime-io/std",
 	"system/std",
 ]

substrate/srml/executive/src/lib.rs

@@ -81,7 +81,7 @@ use sr_primitives::{generic::Digest, traits::{
 	self, Header, Zero, One, Checkable, Applyable, CheckEqual, OnFinalize,
 	OnInitialize, NumberFor, Block as BlockT, OffchainWorker, ValidateUnsigned
 }};
-use srml_support::Dispatchable;
+use support::Dispatchable;
 use codec::{Codec, Encode};
 use system::{extrinsics_root, DigestOf};
 use sr_primitives::{ApplyOutcome, ApplyError};
@@ -362,8 +362,8 @@ mod tests {
 	use sr_primitives::weights::Weight;
 	use sr_primitives::traits::{Header as HeaderT, BlakeTwo256, IdentityLookup, ConvertInto};
 	use sr_primitives::testing::{Digest, Header, Block};
-	use srml_support::{impl_outer_event, impl_outer_origin, parameter_types};
-	use srml_support::traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons, WithdrawReason};
+	use support::{impl_outer_event, impl_outer_origin, parameter_types};
+	use support::traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons, WithdrawReason};
 	use system;
 	use hex_literal::hex;
 

substrate/srml/finality-tracker/Cargo.toml

@@ -10,12 +10,12 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 srml-system = { path = "../system", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
-sr-io = { path = "../../core/sr-io", default-features = false }
+runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 
 [features]
 default = ["std"]
@@ -23,7 +23,7 @@ std = [
 	"serde/std",
 	"codec/std",
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"sr-primitives/std",
 	"srml-system/std",
 	"inherents/std",

substrate/srml/finality-tracker/src/lib.rs

@@ -22,12 +22,12 @@ use inherents::{
 	RuntimeString, InherentIdentifier, ProvideInherent,
 	InherentData, MakeFatalError,
 };
-use srml_support::StorageValue;
+use support::StorageValue;
 use sr_primitives::traits::{One, Zero, SaturatedConversion};
 use rstd::{prelude::*, result, cmp, vec};
 use codec::Decode;
-use srml_support::{decl_module, decl_storage, for_each_tuple};
-use srml_support::traits::Get;
+use support::{decl_module, decl_storage, for_each_tuple};
+use support::traits::Get;
 use srml_system::{ensure_none, Trait as SystemTrait};
 
 #[cfg(feature = "std")]
@@ -265,12 +265,12 @@ impl<T: Trait> ProvideInherent for Module<T> {
 mod tests {
 	use super::*;
 
-	use sr_io::{with_externalities, TestExternalities};
+	use runtime_io::{with_externalities, TestExternalities};
 	use primitives::H256;
 	use sr_primitives::traits::{BlakeTwo256, IdentityLookup, OnFinalize, Header as HeaderT};
 	use sr_primitives::testing::Header;
 	use sr_primitives::Perbill;
-	use srml_support::{assert_ok, impl_outer_origin, parameter_types};
+	use support::{assert_ok, impl_outer_origin, parameter_types};
 	use srml_system as system;
 	use std::cell::RefCell;
 

substrate/srml/generic-asset/Cargo.toml

@@ -13,7 +13,7 @@ support = { package = "srml-support", path = "../support", default-features = fa
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
-runtime_io = { package = "sr-io", path = "../../core/sr-io" }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io" }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
 
 [features]

substrate/srml/grandpa/Cargo.toml

@@ -10,16 +10,15 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
 substrate-finality-grandpa-primitives = { path = "../../core/finality-grandpa/primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false, features = [ "wasm-nice-panic-message" ] }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 session = { package = "srml-session", path = "../session", default-features = false }
 finality-tracker = { package = "srml-finality-tracker", path = "../finality-tracker", default-features = false }
 
 [dev-dependencies]
-runtime_io = { package = "sr-io", path = "../../core/sr-io" }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io" }
 
 [features]
 default = ["std"]
@@ -29,7 +28,7 @@ std = [
 	"primitives/std",
 	"substrate-finality-grandpa-primitives/std",
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"sr-primitives/std",
 	"sr-staking-primitives/std",
 	"system/std",

substrate/srml/grandpa/src/lib.rs

@@ -32,7 +32,7 @@ pub use substrate_finality_grandpa_primitives as fg_primitives;
 
 use rstd::prelude::*;
 use codec::{self as codec, Encode, Decode, Error};
-use srml_support::{
+use support::{
 	decl_event, decl_storage, decl_module, dispatch::Result,
 	storage::StorageValue, storage::StorageMap,
 };

substrate/srml/grandpa/src/mock.rs

@@ -20,7 +20,7 @@
 
 use sr_primitives::{Perbill, DigestItem, traits::IdentityLookup, testing::{Header, UintAuthorityId}};
 use runtime_io;
-use srml_support::{impl_outer_origin, impl_outer_event, parameter_types};
+use support::{impl_outer_origin, impl_outer_event, parameter_types};
 use primitives::{H256, Blake2Hasher};
 use codec::{Encode, Decode};
 use crate::{AuthorityId, GenesisConfig, Trait, Module, ConsensusLog};

substrate/srml/im-online/Cargo.toml

@@ -11,10 +11,10 @@ primitives = { package="substrate-primitives", path = "../../core/primitives", d
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 serde = { version = "1.0", optional = true }
 session = { package = "srml-session", path = "../session", default-features = false }
-sr-io = { path = "../../core/sr-io", default-features = false }
+runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [features]
@@ -26,9 +26,9 @@ std = [
 	"rstd/std",
 	"serde",
 	"session/std",
-	"sr-io/std",
+	"runtime-io/std",
 	"sr-primitives/std",
 	"sr-staking-primitives/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
 ]

substrate/srml/im-online/src/lib.rs

@@ -42,7 +42,7 @@
 //! ## Usage
 //!
 //! ```
-//! use srml_support::{decl_module, dispatch::Result};
+//! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
 //! use srml_im_online::{self as im_online};
 //!
@@ -72,7 +72,7 @@ use codec::{Encode, Decode};
 use primitives::offchain::{OpaqueNetworkState, StorageKind};
 use rstd::prelude::*;
 use session::historical::IdentificationTuple;
-use sr_io::Printable;
+use runtime_io::Printable;
 use sr_primitives::{
 	Perbill, ApplyError,
 	traits::{Convert, Member},
@@ -82,7 +82,7 @@ use sr_staking_primitives::{
 	SessionIndex, CurrentElectedSet,
 	offence::{ReportOffence, Offence, Kind},
 };
-use srml_support::{
+use support::{
 	decl_module, decl_event, decl_storage, print, ensure,
 	Parameter, StorageValue, StorageDoubleMap,
 };
@@ -277,7 +277,7 @@ decl_module! {
 		// Runs after every block.
 		fn offchain_worker(now: T::BlockNumber) {
 			// Only send messages if we are a potential validator.
-			if sr_io::is_validator() {
+			if runtime_io::is_validator() {
 				Self::offchain(now);
 			}
 		}
@@ -332,7 +332,7 @@ impl<T: Trait> Module<T> {
 					.map(|location| (index as u32, &local_keys[location]))
 			})
 		{
-			let network_state = sr_io::network_state().map_err(|_| OffchainErr::NetworkState)?;
+			let network_state = runtime_io::network_state().map_err(|_| OffchainErr::NetworkState)?;
 			let heartbeat_data = Heartbeat {
 				block_number,
 				network_state,
@@ -362,7 +362,7 @@ impl<T: Trait> Module<T> {
 			done,
 			gossipping_at,
 		};
-		sr_io::local_storage_compare_and_set(
+		runtime_io::local_storage_compare_and_set(
 			StorageKind::PERSISTENT,
 			DB_KEY,
 			curr_worker_status.as_ref().map(Vec::as_slice),
@@ -378,7 +378,7 @@ impl<T: Trait> Module<T> {
 			done,
 			gossipping_at,
 		};
-		sr_io::local_storage_set(
+		runtime_io::local_storage_set(
 			StorageKind::PERSISTENT, DB_KEY, &enc.encode());
 	}
 
@@ -389,7 +389,7 @@ impl<T: Trait> Module<T> {
 		now: T::BlockNumber,
 		next_gossip: T::BlockNumber,
 	) -> Result<(Option<Vec<u8>>, bool), OffchainErr> {
-		let last_gossip = sr_io::local_storage_get(StorageKind::PERSISTENT, DB_KEY);
+		let last_gossip = runtime_io::local_storage_get(StorageKind::PERSISTENT, DB_KEY);
 		match last_gossip {
 			Some(last) => {
 				let worker_status: WorkerStatus<T::BlockNumber> = Decode::decode(&mut &last[..])
@@ -486,10 +486,10 @@ impl<T: Trait> session::OneSessionHandler<T::AccountId> for Module<T> {
 	}
 }
 
-impl<T: Trait> srml_support::unsigned::ValidateUnsigned for Module<T> {
+impl<T: Trait> support::unsigned::ValidateUnsigned for Module<T> {
 	type Call = Call<T>;
 
-	fn validate_unsigned(call: &Self::Call) -> srml_support::unsigned::TransactionValidity {
+	fn validate_unsigned(call: &Self::Call) -> support::unsigned::TransactionValidity {
 		if let Call::heartbeat(heartbeat, signature) = call {
 			if <Module<T>>::is_online_in_current_session(heartbeat.authority_index) {
 				// we already received a heartbeat for this authority

substrate/srml/indices/Cargo.toml

@@ -13,7 +13,7 @@ rstd = { package = "sr-std", path = "../../core/sr-std", default-features = fals
 runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
@@ -29,7 +29,7 @@ std = [
 	"primitives/std",
 	"rstd/std",
 	"runtime-io/std",
-	"srml-support/std",
+	"support/std",
 	"sr-primitives/std",
 	"system/std",
 ]

substrate/srml/indices/src/lib.rs

@@ -21,7 +21,7 @@
 
 use rstd::{prelude::*, result, marker::PhantomData, convert::TryInto};
 use codec::{Encode, Codec};
-use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage};
+use support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage};
 use sr_primitives::traits::{One, SimpleArithmetic, StaticLookup, Member};
 use system::{IsDeadAccount, OnNewAccount};
 

substrate/srml/indices/src/mock.rs

@@ -23,7 +23,7 @@ use ref_thread_local::{ref_thread_local, RefThreadLocal};
 use sr_primitives::testing::Header;
 use sr_primitives::Perbill;
 use primitives::{H256, Blake2Hasher};
-use srml_support::{impl_outer_origin, parameter_types};
+use support::{impl_outer_origin, parameter_types};
 use {runtime_io, system};
 use crate::{GenesisConfig, Module, Trait, IsDeadAccount, OnNewAccount, ResolveHint};
 

substrate/srml/membership/Cargo.toml

@@ -8,8 +8,8 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-sr-io = { path = "../../core/sr-io", default-features = false }
-srml-support = { path = "../support", default-features = false }
+runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 
@@ -23,7 +23,7 @@ std = [
 	"codec/std",
 	"sr-primitives/std",
 	"rstd/std",
-	"sr-io/std",
-	"srml-support/std",
+	"runtime-io/std",
+	"support/std",
 	"system/std",
 ]

substrate/srml/membership/src/lib.rs

@@ -23,7 +23,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use rstd::prelude::*;
-use srml_support::{
+use support::{
 	StorageValue, decl_module, decl_storage, decl_event, traits::{ChangeMembers, InitializeMembers},
 };
 use system::ensure_root;
@@ -192,8 +192,8 @@ mod tests {
 	use super::*;
 
 	use std::cell::RefCell;
-	use srml_support::{assert_ok, assert_noop, impl_outer_origin, parameter_types};
-	use sr_io::with_externalities;
+	use support::{assert_ok, assert_noop, impl_outer_origin, parameter_types};
+	use runtime_io::with_externalities;
 	use primitives::{H256, Blake2Hasher};
 	// The testing primitives are very useful for avoiding having to work with signatures
 	// or public keys. `u64` is used as the `AccountId` and no `Signature`s are requried.
@@ -281,7 +281,7 @@ mod tests {
 
 	// This function basically just builds a genesis storage key/value store according to
 	// our desired mockup.
-	fn new_test_ext() -> sr_io::TestExternalities<Blake2Hasher> {
+	fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
 		let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
 		GenesisConfig::<Test>{

substrate/srml/offences/Cargo.toml

@@ -15,7 +15,7 @@ support = { package = "srml-support", path = "../support", default-features = fa
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 substrate-primitives = { path = "../../core/primitives" }
 
 [features]

substrate/srml/scored-pool/Cargo.toml

@@ -7,10 +7,10 @@ edition = "2018"
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0", optional = true }
-sr-io = { path = "../../core/sr-io", default-features = false }
+runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
@@ -22,9 +22,9 @@ default = ["std"]
 std = [
 	"codec/std",
 	"serde",
-	"sr-io/std",
+	"runtime-io/std",
 	"sr-primitives/std",
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
 ]

substrate/srml/scored-pool/src/lib.rs

@@ -53,7 +53,7 @@
 //! ## Usage
 //!
 //! ```
-//! use srml_support::{decl_module, dispatch::Result};
+//! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
 //! use srml_scored_pool::{self as scored_pool};
 //!
@@ -90,7 +90,7 @@ mod tests;
 
 use codec::{Encode, Decode};
 use rstd::prelude::*;
-use srml_support::{
+use support::{
 	StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure,
 	traits::{ChangeMembers, InitializeMembers, Currency, Get, ReservableCurrency},
 };

substrate/srml/scored-pool/src/mock.rs

@@ -19,7 +19,7 @@
 use super::*;
 
 use std::cell::RefCell;
-use srml_support::{impl_outer_origin, parameter_types};
+use support::{impl_outer_origin, parameter_types};
 use primitives::{H256, Blake2Hasher};
 // The testing primitives are very useful for avoiding having to work with signatures
 // or public keys. `u64` is used as the `AccountId` and no `Signature`s are requried.
@@ -132,7 +132,7 @@ impl Trait for Test {
 
 // This function basically just builds a genesis storage key/value store according to
 // our desired mockup.
-pub fn new_test_ext() -> sr_io::TestExternalities<Blake2Hasher> {
+pub fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
 	let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	// We use default for brevity, but you can configure as desired if needed.
 	balances::GenesisConfig::<Test> {

substrate/srml/scored-pool/src/tests.rs

@@ -19,8 +19,8 @@
 use super::*;
 use mock::*;
 
-use srml_support::{assert_ok, assert_noop};
-use sr_io::with_externalities;
+use support::{assert_ok, assert_noop};
+use runtime_io::with_externalities;
 use sr_primitives::traits::OnInitialize;
 
 type ScoredPool = Module<Test>;

substrate/srml/session/Cargo.toml

@@ -11,11 +11,11 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false }
 substrate-trie = { path = "../../core/trie", default-features = false, optional = true }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 
 [dev-dependencies]
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
@@ -30,7 +30,7 @@ std = [
 	"safe-mix/std",
 	"codec/std",
 	"rstd/std",
-	"srml-support/std",
+	"support/std",
 	"sr-primitives/std",
 	"sr-staking-primitives/std",
 	"timestamp/std",

substrate/srml/session/src/historical.rs

@@ -29,10 +29,10 @@ use rstd::prelude::*;
 use codec::{Encode, Decode};
 use sr_primitives::KeyTypeId;
 use sr_primitives::traits::{Convert, OpaqueKeys, Hash as HashT};
-use srml_support::{
+use support::{
 	StorageValue, StorageMap, decl_module, decl_storage,
 };
-use srml_support::{Parameter, print};
+use support::{Parameter, print};
 use substrate_trie::{MemoryDB, Trie, TrieMut, Recorder, EMPTY_PREFIX};
 use substrate_trie::trie_types::{TrieDBMut, TrieDB};
 use super::{SessionIndex, Module as SessionModule};
@@ -277,7 +277,7 @@ pub struct Proof {
 	trie_nodes: Vec<Vec<u8>>,
 }
 
-impl<T: Trait, D: AsRef<[u8]>> srml_support::traits::KeyOwnerProofSystem<(KeyTypeId, D)>
+impl<T: Trait, D: AsRef<[u8]>> support::traits::KeyOwnerProofSystem<(KeyTypeId, D)>
 	for Module<T>
 {
 	type Proof = Proof;
@@ -321,7 +321,7 @@ mod tests {
 		NEXT_VALIDATORS, force_new_session,
 		set_next_validators, Test, System, Session,
 	};
-	use srml_support::traits::KeyOwnerProofSystem;
+	use support::traits::KeyOwnerProofSystem;
 
 	type Historical = Module<Test>;
 

substrate/srml/session/src/lib.rs

@@ -125,11 +125,11 @@ use sr_primitives::{KeyTypeId, AppKey};
 use sr_primitives::weights::SimpleDispatchInfo;
 use sr_primitives::traits::{Convert, Zero, Member, OpaqueKeys};
 use sr_staking_primitives::SessionIndex;
-use srml_support::{
+use support::{
 	dispatch::Result, ConsensusEngineId, StorageValue, StorageDoubleMap, for_each_tuple,
 	decl_module, decl_event, decl_storage,
 };
-use srml_support::{ensure, traits::{OnFreeBalanceZero, Get, FindAuthor}, Parameter};
+use support::{ensure, traits::{OnFreeBalanceZero, Get, FindAuthor}, Parameter};
 use system::{self, ensure_signed};
 
 #[cfg(test)]
@@ -651,7 +651,7 @@ impl<T: Trait, Inner: FindAuthor<u32>> FindAuthor<T::ValidatorId>
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use srml_support::assert_ok;
+	use support::assert_ok;
 	use runtime_io::with_externalities;
 	use primitives::{Blake2Hasher, crypto::key_types::DUMMY};
 	use sr_primitives::{

substrate/srml/session/src/mock.rs

@@ -18,7 +18,7 @@
 
 use super::*;
 use std::cell::RefCell;
-use srml_support::{impl_outer_origin, parameter_types};
+use support::{impl_outer_origin, parameter_types};
 use primitives::{crypto::key_types::DUMMY, H256};
 use sr_primitives::{
 	Perbill, impl_opaque_keys, traits::{BlakeTwo256, IdentityLookup, ConvertInto},

substrate/srml/staking/Cargo.toml

@@ -11,10 +11,10 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 substrate-keyring = { path = "../../core/keyring", optional = true }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 phragmen = { package = "substrate-phragmen", path = "../../core/phragmen", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 sr-staking-primitives = { path = "../../core/sr-staking-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 session = { package = "srml-session", path = "../session", default-features = false, features = ["historical"] }
 authorship = { package = "srml-authorship", path = "../authorship", default-features = false }
@@ -36,8 +36,8 @@ std = [
 	"codec/std",
 	"rstd/std",
 	"phragmen/std",
-	"runtime_io/std",
-	"srml-support/std",
+	"runtime-io/std",
+	"support/std",
 	"sr-primitives/std",
 	"sr-staking-primitives/std",
 	"session/std",

substrate/srml/staking/src/lib.rs

@@ -136,7 +136,7 @@
 //! ### Example: Rewarding a validator by id.
 //!
 //! ```
-//! use srml_support::{decl_module, dispatch::Result};
+//! use support::{decl_module, dispatch::Result};
 //! use system::ensure_signed;
 //! use srml_staking::{self as staking};
 //!
@@ -261,7 +261,7 @@ mod benches;
 
 use rstd::{prelude::*, result};
 use codec::{HasCompact, Encode, Decode};
-use srml_support::{
+use support::{
 	StorageValue, StorageMap, StorageLinkedMap, decl_module, decl_event,
 	decl_storage, ensure, traits::{
 		Currency, OnFreeBalanceZero, OnDilution, LockIdentifier, LockableCurrency,

substrate/srml/staking/src/mock.rs

@@ -23,8 +23,8 @@ use sr_primitives::testing::{Header, UintAuthorityId};
 use sr_staking_primitives::SessionIndex;
 use primitives::{H256, Blake2Hasher};
 use runtime_io;
-use srml_support::{assert_ok, impl_outer_origin, parameter_types, StorageLinkedMap};
-use srml_support::traits::{Currency, Get, FindAuthor};
+use support::{assert_ok, impl_outer_origin, parameter_types, StorageLinkedMap};
+use support::traits::{Currency, Get, FindAuthor};
 use crate::{
 	EraIndex, GenesisConfig, Module, Trait, StakerStatus, ValidatorPrefs, RewardDestination,
 	Nominators, inflation
@@ -92,7 +92,7 @@ impl_outer_origin!{
 pub struct Author11;
 impl FindAuthor<u64> for Author11 {
 	fn find_author<'a, I>(_digests: I) -> Option<u64>
-		where I: 'a + IntoIterator<Item=(srml_support::ConsensusEngineId, &'a [u8])>
+		where I: 'a + IntoIterator<Item=(support::ConsensusEngineId, &'a [u8])>
 	{
 		Some(11)
 	}

substrate/srml/staking/src/tests.rs

@@ -20,9 +20,9 @@ use super::*;
 use runtime_io::with_externalities;
 use sr_primitives::traits::OnInitialize;
 use sr_staking_primitives::offence::{OffenceDetails, OnOffenceHandler};
-use srml_support::{assert_ok, assert_noop, assert_eq_uvec, StorageLinkedMap};
+use support::{assert_ok, assert_noop, assert_eq_uvec, StorageLinkedMap};
 use mock::*;
-use srml_support::traits::{Currency, ReservableCurrency};
+use support::traits::{Currency, ReservableCurrency};
 
 #[test]
 fn basic_setup_works() {

substrate/srml/sudo/Cargo.toml

@@ -8,14 +8,12 @@ edition = "2018"
 serde = { version = "1.0", optional = true }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-sr-io = { path = "../../core/sr-io", default-features = false }
+runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
-srml-support-procedural = { path = "../support/procedural" }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
-sr-io = { path = "../../core/sr-io", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
 
 [features]
@@ -24,8 +22,8 @@ std = [
 	"serde",
 	"codec/std",
 	"rstd/std",
-	"sr-io/std",
+	"runtime-io/std",
 	"sr-primitives/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
 ]

substrate/srml/sudo/src/lib.rs

@@ -51,7 +51,7 @@
 //! This is an example of a module that exposes a privileged function:
 //!
 //! ```
-//! use srml_support::{decl_module, dispatch::Result};
+//! use support::{decl_module, dispatch::Result};
 //! use system::ensure_root;
 //!
 //! pub trait Trait: system::Trait {}
@@ -89,7 +89,7 @@
 use rstd::prelude::*;
 use sr_primitives::traits::StaticLookup;
 use sr_primitives::weights::SimpleDispatchInfo;
-use srml_support::{
+use support::{
 	StorageValue, Parameter, Dispatchable, decl_module, decl_event,
 	decl_storage, ensure
 };
@@ -126,7 +126,7 @@ decl_module! {
 			let res = match proposal.dispatch(system::RawOrigin::Root.into()) {
 				Ok(_) => true,
 				Err(e) => {
-					sr_io::print(e);
+					runtime_io::print(e);
 					false
 				}
 			};

substrate/srml/support/Cargo.toml

@@ -9,11 +9,11 @@ serde = { version = "1.0", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = ["derive"] }
 srml-metadata = { path = "../metadata", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
-srml-support-procedural = { path = "./procedural" }
+srml-support-procedural = { package = "srml-support-procedural", path = "./procedural" }
 paste = "0.1"
 once_cell = { version = "0.1.6", default-features = false, optional = true }
 bitmask = { version = "0.5", default-features = false }
@@ -28,7 +28,7 @@ std = [
 	"once_cell",
 	"bitmask/std",
 	"serde",
-	"runtime_io/std",
+	"runtime-io/std",
 	"codec/std",
 	"rstd/std",
 	"sr-primitives/std",

substrate/srml/support/procedural/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-srml-support-procedural-tools = { path = "./tools" }
+srml-support-procedural-tools = { package = "srml-support-procedural-tools", path = "./tools" }
 sr-api-macros = { path = "../../../core/sr-api-macros" }
 
 proc-macro2 = "0.4.27"

substrate/srml/support/procedural/tools/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-srml-support-procedural-tools-derive = { path = "./derive" }
+srml-support-procedural-tools-derive = { package = "srml-support-procedural-tools-derive", path = "./derive" }
 proc-macro2 = "0.4.27"
 quote = { version = "0.6.12" }
 syn = { version = "0.15.30", features = ["full"] }

substrate/srml/support/test/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
-runtime_io = { package = "sr-io", path = "../../../core/sr-io", default-features = false }
-srml-support = { version = "2", path = "../", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../../core/sr-io", default-features = false }
+support = { package = "srml-support", version = "2", path = "../", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../../core/inherents", default-features = false }
 primitives = { package = "substrate-primitives", path = "../../../core/primitives", default-features = false }
 trybuild = "1"
@@ -19,8 +19,8 @@ default = ["std"]
 std = [
 	"serde/std",
 	"codec/std",
-	"runtime_io/std",
-	"srml-support/std",
+	"runtime-io/std",
+	"support/std",
 	"inherents/std",
 	"primitives/std",
 ]

substrate/srml/support/test/src/lib.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Test crate for srml_support. Allow to make use of `srml_support::decl_storage`.
+//! Test crate for srml_support. Allow to make use of `support::decl_storage`.
 //! See tests directory.
 
 #[test]

substrate/srml/support/test/tests/final_keys.rs

@@ -15,8 +15,8 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use runtime_io::{with_externalities, Blake2Hasher};
-use srml_support::{StorageValue, StorageMap, StorageLinkedMap, StorageDoubleMap};
-use srml_support::storage::unhashed;
+use support::{StorageValue, StorageMap, StorageLinkedMap, StorageDoubleMap};
+use support::storage::unhashed;
 use codec::{Encode, Decode};
 
 pub trait Trait {
@@ -24,11 +24,11 @@ pub trait Trait {
 	type BlockNumber: Encode + Decode + Default + Clone;
 }
 
-srml_support::decl_module! {
+support::decl_module! {
 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
 }
 
-srml_support::decl_storage!{
+support::decl_storage!{
 	trait Store for Module<T: Trait> as FinalKeys {
 		pub Value config(value): u32;
 

substrate/srml/support/test/tests/genesisconfig.rs

@@ -19,11 +19,11 @@ pub trait Trait {
 	type Origin;
 }
 
-srml_support::decl_module! {
+support::decl_module! {
 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
 }
 
-srml_support::decl_storage! {
+support::decl_storage! {
 	trait Store for Module<T: Trait> as Example {
 		pub AppendableDM config(t): double_map u32, blake2_256(T::BlockNumber) => Vec<u32>;
 	}

substrate/srml/support/test/tests/instance.rs

@@ -16,7 +16,7 @@
 #![recursion_limit="128"]
 
 use runtime_io::{with_externalities, Blake2Hasher};
-use srml_support::{
+use support::{
 	Parameter, traits::Get, parameter_types,
 	sr_primitives::{generic, BuildStorage, traits::{BlakeTwo256, Block as _, Verify}},
 	metadata::{
@@ -48,7 +48,7 @@ mod module1 {
 		type GenericType: Default + Clone + codec::Codec;
 	}
 
-	srml_support::decl_module! {
+	support::decl_module! {
 		pub struct Module<T: Trait<I>, I: InstantiableThing> for enum Call where
 			origin: <T as system::Trait>::Origin,
 			T::BlockNumber: From<u32>
@@ -64,7 +64,7 @@ mod module1 {
 		}
 	}
 
-	srml_support::decl_storage! {
+	support::decl_storage! {
 		trait Store for Module<T: Trait<I>, I: InstantiableThing> as Module1 where
 			T::BlockNumber: From<u32> + std::fmt::Display
 		{
@@ -81,7 +81,7 @@ mod module1 {
 		}
 	}
 
-	srml_support::decl_event! {
+	support::decl_event! {
 		pub enum Event<T, I> where Phantom = std::marker::PhantomData<T> {
 			_Phantom(Phantom),
 			AnotherVariant(u32),
@@ -128,7 +128,7 @@ mod module2 {
 
 	impl<T: Trait<I>, I: Instance> Currency for Module<T, I> {}
 
-	srml_support::decl_module! {
+	support::decl_module! {
 		pub struct Module<T: Trait<I>, I: Instance=DefaultInstance> for enum Call where
 			origin: <T as system::Trait>::Origin
 		{
@@ -136,7 +136,7 @@ mod module2 {
 		}
 	}
 
-	srml_support::decl_storage! {
+	support::decl_storage! {
 		trait Store for Module<T: Trait<I>, I: Instance=DefaultInstance> as Module2 {
 			pub Value config(value): T::Amount;
 			pub Map config(map): map u64 => u64;
@@ -145,7 +145,7 @@ mod module2 {
 		}
 	}
 
-	srml_support::decl_event! {
+	support::decl_event! {
 		pub enum Event<T, I=DefaultInstance> where Amount = <T as Trait<I>>::Amount {
 			Variant(Amount),
 		}
@@ -185,7 +185,7 @@ mod module3 {
 		type Currency2: Currency;
 	}
 
-	srml_support::decl_module! {
+	support::decl_module! {
 		pub struct Module<T: Trait> for enum Call where origin: <T as system::Trait>::Origin {}
 	}
 }
@@ -244,7 +244,7 @@ impl system::Trait for Runtime {
 	type Event = Event;
 }
 
-srml_support::construct_runtime!(
+support::construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
 		NodeBlock = Block,

substrate/srml/support/test/tests/issue2219.rs

@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use srml_support::sr_primitives::generic;
-use srml_support::sr_primitives::traits::{BlakeTwo256, Block as _, Verify};
-use srml_support::codec::{Encode, Decode};
+use support::sr_primitives::generic;
+use support::sr_primitives::traits::{BlakeTwo256, Block as _, Verify};
+use support::codec::{Encode, Decode};
 use primitives::{H256, sr25519};
 use serde::{Serialize, Deserialize};
 
@@ -82,7 +82,7 @@ mod module {
 
 	pub trait Trait: system::Trait {}
 
-	srml_support::decl_module! {
+	support::decl_module! {
 		pub struct Module<T: Trait> for enum Call where origin: T::Origin {}
 	}
 
@@ -99,7 +99,7 @@ mod module {
 		}
 	}
 
-	srml_support::decl_storage! {
+	support::decl_storage! {
 		trait Store for Module<T: Trait> as Actors {
 			/// requirements to enter and maintain status in roles
 			pub Parameters get(parameters) build(|config: &GenesisConfig| {
@@ -164,7 +164,7 @@ impl system::Trait for Runtime {
 
 impl module::Trait for Runtime {}
 
-srml_support::construct_runtime!(
+support::construct_runtime!(
 	pub enum Runtime where
 		Block = Block,
 		NodeBlock = Block,

substrate/srml/support/test/tests/reserved_keyword/on_initialize.rs

@@ -2,7 +2,7 @@ macro_rules! reserved {
 	($($reserved:ident)*) => {
 		$(
 			mod $reserved {
-				pub use srml_support::dispatch::Result;
+				pub use support::dispatch::Result;
 
 				pub trait Trait {
 					type Origin;
@@ -10,14 +10,14 @@ macro_rules! reserved {
 				}
 
 				pub mod system {
-					use srml_support::dispatch::Result;
+					use support::dispatch::Result;
 
 					pub fn ensure_root<R>(_: R) -> Result {
 						Ok(())
 					}
 				}
 
-				srml_support::decl_module! {
+				support::decl_module! {
 					pub struct Module<T: Trait> for enum Call where origin: T::Origin {
 						fn $reserved(_origin) -> Result { unreachable!() }
 					}

substrate/srml/support/test/tests/system.rs

@@ -1,4 +1,4 @@
-use srml_support::codec::{Encode, Decode};
+use support::codec::{Encode, Decode};
 
 pub trait Trait: 'static + Eq + Clone {
 	type Origin: Into<Result<RawOrigin<Self::AccountId>, Self::Origin>>
@@ -10,7 +10,7 @@ pub trait Trait: 'static + Eq + Clone {
 	type Event: From<Event>;
 }
 
-srml_support::decl_module! {
+support::decl_module! {
 	pub struct Module<T: Trait> for enum Call where origin: T::Origin {
 	}
 }
@@ -20,7 +20,7 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-srml_support::decl_event!(
+support::decl_event!(
 	pub enum Event {
 		ExtrinsicSuccess,
 		ExtrinsicFailed,

substrate/srml/system/Cargo.toml

@@ -10,10 +10,10 @@ safe-mix = { version = "1.0", default-features = false}
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 sr-version = { path = "../../core/sr-version", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 
 [dev-dependencies]
 criterion = "0.2"
@@ -26,8 +26,8 @@ std = [
 	"codec/std",
 	"primitives/std",
 	"rstd/std",
-	"runtime_io/std",
-	"srml-support/std",
+	"runtime-io/std",
+	"support/std",
 	"sr-primitives/std",
 	"sr-version/std",
 ]

substrate/srml/system/benches/bench.rs

@@ -16,7 +16,7 @@
 
 use criterion::{Criterion, criterion_group, criterion_main, black_box};
 use srml_system as system;
-use srml_support::{decl_module, decl_event, impl_outer_origin, impl_outer_event};
+use support::{decl_module, decl_event, impl_outer_origin, impl_outer_event};
 use runtime_io::{with_externalities, Blake2Hasher};
 use primitives::H256;
 use sr_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};
@@ -51,7 +51,7 @@ impl_outer_event! {
 	}
 }
 
-srml_support::parameter_types! {
+support::parameter_types! {
 	pub const BlockHashCount: u64 = 250;
 	pub const MaximumBlockWeight: u32 = 4 * 1024 * 1024;
 	pub const MaximumBlockLength: u32 = 4 * 1024 * 1024;

substrate/srml/system/src/lib.rs

@@ -68,7 +68,7 @@
 //! ### Example - Get random seed and extrinsic count for the current block
 //!
 //! ```
-//! use srml_support::{decl_module, dispatch::Result};
+//! use support::{decl_module, dispatch::Result};
 //! use srml_system::{self as system, ensure_signed};
 //!
 //! pub trait Trait: system::Trait {}
@@ -108,7 +108,7 @@ use sr_primitives::traits::{self, CheckEqual, SimpleArithmetic, Zero, SignedExte
 	MaybeSerializeDebugButNotDeserialize, MaybeSerializeDebug, StaticLookup, One, Bounded, Lookup,
 };
 use primitives::storage::well_known_keys;
-use srml_support::{
+use support::{
 	storage, decl_module, decl_event, decl_storage, StorageDoubleMap, StorageValue, StorageMap,
 	Parameter, for_each_tuple, traits::{Contains, Get}
 };
@@ -1144,7 +1144,7 @@ mod tests {
 	use runtime_io::with_externalities;
 	use primitives::H256;
 	use sr_primitives::{traits::{BlakeTwo256, IdentityLookup}, testing::Header};
-	use srml_support::{impl_outer_origin, parameter_types};
+	use support::{impl_outer_origin, parameter_types};
 
 	impl_outer_origin!{
 		pub enum Origin for Test where system = super {}

substrate/srml/timestamp/Cargo.toml

@@ -10,11 +10,11 @@ codec = { package = "parity-scale-codec", version = "1.0.0", default-features =
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
 inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 
 [dev-dependencies]
-runtime_io = { package = "sr-io", path = "../../core/sr-io" }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io" }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
 
 [features]
@@ -24,7 +24,7 @@ std = [
 	"codec/std",
 	"rstd/std",
 	"sr-primitives/std",
-	"srml-support/std",
+	"support/std",
 	"serde",
 	"system/std",
 ]

substrate/srml/timestamp/src/lib.rs

@@ -61,7 +61,7 @@
 //! ### Get current timestamp
 //!
 //! ```
-//! use srml_support::{decl_module, dispatch::Result};
+//! use support::{decl_module, dispatch::Result};
 //! # use srml_timestamp as timestamp;
 //! use system::ensure_signed;
 //!
@@ -96,8 +96,8 @@ use codec::Encode;
 use codec::Decode;
 #[cfg(feature = "std")]
 use inherents::ProvideInherentData;
-use srml_support::{StorageValue, Parameter, decl_storage, decl_module, for_each_tuple};
-use srml_support::traits::{Time, Get};
+use support::{StorageValue, Parameter, decl_storage, decl_module, for_each_tuple};
+use support::traits::{Time, Get};
 use sr_primitives::traits::{
 	SimpleArithmetic, Zero, SaturatedConversion, Scale
 };
@@ -338,7 +338,7 @@ impl<T: Trait> Time for Module<T> {
 mod tests {
 	use super::*;
 
-	use srml_support::{impl_outer_origin, assert_ok, parameter_types};
+	use support::{impl_outer_origin, assert_ok, parameter_types};
 	use runtime_io::{with_externalities, TestExternalities};
 	use primitives::H256;
 	use sr_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header};

substrate/srml/treasury/Cargo.toml

@@ -9,12 +9,12 @@ serde = { version = "1.0", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false, features = ["derive"] }
 rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
 sr-primitives = { path = "../../core/sr-primitives", default-features = false }
-srml-support = { path = "../support", default-features = false }
+support = { package = "srml-support", path = "../support", default-features = false }
 system = { package = "srml-system", path = "../system", default-features = false }
 balances = { package = "srml-balances", path = "../balances", default-features = false }
 
 [dev-dependencies]
-runtime_io = { package = "sr-io", path = "../../core/sr-io" }
+runtime-io ={ package = "sr-io", path = "../../core/sr-io" }
 primitives = { package = "substrate-primitives",  path = "../../core/primitives" }
 
 [features]
@@ -24,7 +24,7 @@ std = [
 	"codec/std",
 	"rstd/std",
 	"sr-primitives/std",
-	"srml-support/std",
+	"support/std",
 	"system/std",
 	"balances/std",
 ]

substrate/srml/treasury/src/lib.rs

@@ -70,8 +70,8 @@
 #[cfg(feature = "std")]
 use serde::{Serialize, Deserialize};
 use rstd::prelude::*;
-use srml_support::{StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure, print};
-use srml_support::traits::{
+use support::{StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure, print};
+use support::traits::{
 	Currency, ExistenceRequirement, Get, Imbalance, OnDilution, OnUnbalanced,
 	ReservableCurrency, WithdrawReason
 };
@@ -357,7 +357,7 @@ mod tests {
 	use super::*;
 
 	use runtime_io::with_externalities;
-	use srml_support::{assert_noop, assert_ok, impl_outer_origin, parameter_types};
+	use support::{assert_noop, assert_ok, impl_outer_origin, parameter_types};
 	use primitives::{H256, Blake2Hasher};
 	use sr_primitives::{Perbill, traits::{BlakeTwo256, OnFinalize, IdentityLookup}, testing::Header};