Rename substrate-runtime-* -> srml-*

core/srml/balances/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "substrate-runtime-balances"
+name = "srml-balances"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
@@ -14,9 +14,9 @@ parity-codec-derive = { path = "../../../codec/derive", default_features = false
 substrate-primitives = { path = "../../primitives", default_features = false }
 sr-std = { path = "../../sr-std", default_features = false }
 sr-io = { path = "../../sr-io", default_features = false }
-substrate-runtime-support = { path = "../../srml/support", default_features = false }
+srml-support = { path = "../support", default_features = false }
 sr-primitives = { path = "../../sr-primitives", default_features = false }
-substrate-runtime-system = { path = "../system", default_features = false }
+srml-system = { path = "../system", default_features = false }
 
 [features]
 default = ["std"]
@@ -30,7 +30,7 @@ std = [
 	"substrate-primitives/std",
 	"sr-std/std",
 	"sr-io/std",
-	"substrate-runtime-support/std",
+	"srml-support/std",
 	"sr-primitives/std",
-	"substrate-runtime-system/std",
+	"srml-system/std",
 ]

core/srml/balances/src/lib.rs

@@ -26,7 +26,7 @@ extern crate serde;
 extern crate serde_derive;
 
 #[macro_use]
-extern crate substrate_runtime_support as runtime_support;
+extern crate srml_support as runtime_support;
 
 #[cfg_attr(feature = "std", macro_use)]
 extern crate sr_std as rstd;
@@ -38,7 +38,7 @@ extern crate parity_codec as codec;
 extern crate substrate_primitives;
 extern crate sr_io as runtime_io;
 extern crate sr_primitives as primitives;
-extern crate substrate_runtime_system as system;
+extern crate srml_system as system;
 
 use rstd::prelude::*;
 use rstd::{cmp, result};

core/srml/consensus/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "substrate-runtime-consensus"
+name = "srml-consensus"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
@@ -12,9 +12,9 @@ parity-codec-derive = { path = "../../../codec/derive", default_features = false
 substrate-primitives = { path = "../../primitives", default_features = false }
 sr-std = { path = "../../sr-std", default_features = false }
 sr-io = { path = "../../sr-io", default_features = false }
-substrate-runtime-support = { path = "../../srml/support", default_features = false }
+srml-support = { path = "../support", default_features = false }
 sr-primitives = { path = "../../sr-primitives", default_features = false }
-substrate-runtime-system = { path = "../system", default_features = false }
+srml-system = { path = "../system", default_features = false }
 
 [features]
 default = ["std"]
@@ -26,7 +26,7 @@ std = [
 	"substrate-primitives/std",
 	"sr-std/std",
 	"sr-io/std",
-	"substrate-runtime-support/std",
+	"srml-support/std",
 	"sr-primitives/std",
-	"substrate-runtime-system/std",
+	"srml-system/std",
 ]

core/srml/consensus/src/lib.rs

@@ -23,7 +23,7 @@
 extern crate sr_std as rstd;
 
 #[macro_use]
-extern crate substrate_runtime_support as runtime_support;
+extern crate srml_support as runtime_support;
 
 #[cfg(feature = "std")]
 extern crate serde;
@@ -38,7 +38,7 @@ extern crate parity_codec_derive;
 extern crate sr_io as runtime_io;
 extern crate sr_primitives as primitives;
 extern crate parity_codec as codec;
-extern crate substrate_runtime_system as system;
+extern crate srml_system as system;
 extern crate substrate_primitives;
 
 use rstd::prelude::*;

core/srml/contract/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "substrate-runtime-contract"
+name = "srml-contract"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
@@ -12,9 +12,9 @@ sr-primitives = { path = "../../sr-primitives", default_features = false }
 sr-io = { path = "../../sr-io", default_features = false }
 sr-std = { path = "../../sr-std", default_features = false }
 sr-sandbox = { path = "../../sr-sandbox", default_features = false }
-substrate-runtime-support = { path = "../../srml/support", default_features = false }
-substrate-runtime-system = { path = "../../srml/system", default_features = false }
-substrate-runtime-balances = { path = "../balances", default_features = false }
+srml-support = { path = "../support", default_features = false }
+srml-system = { path = "../system", default_features = false }
+srml-balances = { path = "../balances", default_features = false }
 parity-wasm = { version = "0.31", default_features = false }
 pwasm-utils = { version = "0.3", default_features = false }
 
@@ -32,10 +32,10 @@ std = [
 	"sr-primitives/std",
 	"sr-io/std",
 	"sr-std/std",
-	"substrate-runtime-balances/std",
+	"srml-balances/std",
 	"sr-sandbox/std",
-	"substrate-runtime-support/std",
-	"substrate-runtime-system/std",
+	"srml-support/std",
+	"srml-system/std",
 	"parity-wasm/std",
 	"pwasm-utils/std",
 ]

core/srml/contract/src/lib.rs

@@ -69,11 +69,11 @@ extern crate sr_sandbox as sandbox;
 #[macro_use]
 extern crate sr_std as rstd;
 
-extern crate substrate_runtime_balances as balances;
-extern crate substrate_runtime_system as system;
+extern crate srml_balances as balances;
+extern crate srml_system as system;
 
 #[macro_use]
-extern crate substrate_runtime_support as runtime_support;
+extern crate srml_support as runtime_support;
 
 extern crate sr_primitives as runtime_primitives;
 extern crate substrate_primitives;

core/srml/council/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "substrate-runtime-council"
+name = "srml-council"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
@@ -15,12 +15,12 @@ parity-codec-derive = { path = "../../../codec/derive", default_features = false
 substrate-primitives = { path = "../../primitives", default_features = false }
 sr-std = { path = "../../sr-std", default_features = false }
 sr-io = { path = "../../sr-io", default_features = false }
-substrate-runtime-support = { path = "../../srml/support", default_features = false }
+srml-support = { path = "../support", default_features = false }
 sr-primitives = { path = "../../sr-primitives", default_features = false }
-substrate-runtime-consensus = { path = "../consensus", default_features = false }
-substrate-runtime-balances = { path = "../balances", default_features = false }
-substrate-runtime-democracy = { path = "../democracy", default_features = false }
-substrate-runtime-system = { path = "../system", default_features = false }
+srml-consensus = { path = "../consensus", default_features = false }
+srml-balances = { path = "../balances", default_features = false }
+srml-democracy = { path = "../democracy", default_features = false }
+srml-system = { path = "../system", default_features = false }
 
 [features]
 default = ["std"]
@@ -34,10 +34,10 @@ std = [
 	"substrate-primitives/std",
 	"sr-std/std",
 	"sr-io/std",
-	"substrate-runtime-support/std",
+	"srml-support/std",
 	"sr-primitives/std",
-	"substrate-runtime-consensus/std",
-	"substrate-runtime-balances/std",
-	"substrate-runtime-democracy/std",
-	"substrate-runtime-system/std",
+	"srml-consensus/std",
+	"srml-balances/std",
+	"srml-democracy/std",
+	"srml-system/std",
 ]

core/srml/council/src/lib.rs

@@ -36,11 +36,11 @@ extern crate substrate_primitives;
 #[cfg(feature = "std")] extern crate substrate_keyring as keyring;
 #[macro_use] extern crate sr_std as rstd;
 extern crate sr_io as runtime_io;
-#[macro_use] extern crate substrate_runtime_support;
+#[macro_use] extern crate srml_support;
 extern crate sr_primitives as primitives;
-extern crate substrate_runtime_balances as balances;
-extern crate substrate_runtime_democracy as democracy;
-extern crate substrate_runtime_system as system;
+extern crate srml_balances as balances;
+extern crate srml_democracy as democracy;
+extern crate srml_system as system;
 
 #[cfg(feature = "std")]
 use rstd::prelude::*;
@@ -49,7 +49,7 @@ use std::collections::HashMap;
 #[cfg(feature = "std")]
 use primitives::traits::As;
 #[cfg(feature = "std")]
-use substrate_runtime_support::StorageValue;
+use srml_support::StorageValue;
 
 pub mod voting;
 pub mod motions;

core/srml/council/src/motions.rs

@@ -20,8 +20,8 @@ use rstd::prelude::*;
 use rstd::result;
 use substrate_primitives::u32_trait::Value as U32;
 use primitives::traits::{Hash, EnsureOrigin, MaybeSerializeDebug, OnFinalise};
-use substrate_runtime_support::dispatch::{Result, Dispatchable, Parameter};
-use substrate_runtime_support::{StorageValue, StorageMap};
+use srml_support::dispatch::{Result, Dispatchable, Parameter};
+use srml_support::{StorageValue, StorageMap};
 use super::{Trait as CouncilTrait, Module as Council};
 use system::{self, ensure_signed};
 
@@ -221,7 +221,7 @@ mod tests {
 	use super::RawEvent;
 	use ::tests::*;
 	use ::tests::{Call, Origin, Event as OuterEvent};
-	use substrate_runtime_support::Hashable;
+	use srml_support::Hashable;
 	use system::{EventRecord, Phase};
 
 	#[test]

core/srml/council/src/seats.rs

@@ -19,7 +19,7 @@
 use rstd::prelude::*;
 use primitives::traits::{Zero, One, As, Lookup, OnFinalise};
 use runtime_io::print;
-use substrate_runtime_support::{StorageValue, StorageMap, dispatch::Result};
+use srml_support::{StorageValue, StorageMap, dispatch::Result};
 use democracy;
 use balances::{self, address::Address};
 use system::{self, ensure_signed, ensure_root};

core/srml/council/src/voting.rs

@@ -20,8 +20,8 @@ use rstd::prelude::*;
 use rstd::borrow::Borrow;
 use primitives::traits::{OnFinalise, Hash};
 use runtime_io::print;
-use substrate_runtime_support::dispatch::Result;
-use substrate_runtime_support::{StorageValue, StorageMap, IsSubType};
+use srml_support::dispatch::Result;
+use srml_support::{StorageValue, StorageMap, IsSubType};
 use {system, democracy};
 use super::{Trait as CouncilTrait, Module as Council};
 use system::{ensure_signed, ensure_root};
@@ -244,7 +244,7 @@ mod tests {
 	use super::*;
 	use ::tests::*;
 	use ::tests::{Call, Origin};
-	use substrate_runtime_support::Hashable;
+	use srml_support::Hashable;
 	use democracy::VoteThreshold;
 
 	#[test]

core/srml/democracy/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "substrate-runtime-democracy"
+name = "srml-democracy"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
@@ -13,11 +13,11 @@ parity-codec-derive = { path = "../../../codec/derive", default_features = false
 substrate-primitives = { path = "../../primitives", default_features = false }
 sr-std = { path = "../../sr-std", default_features = false }
 sr-io = { path = "../../sr-io", default_features = false }
-substrate-runtime-support = { path = "../../srml/support", default_features = false }
+srml-support = { path = "../support", default_features = false }
 sr-primitives = { path = "../../sr-primitives", default_features = false }
-substrate-runtime-balances = { path = "../balances", default_features = false }
-substrate-runtime-consensus = { path = "../consensus", default_features = false }
-substrate-runtime-system = { path = "../system", default_features = false }
+srml-balances = { path = "../balances", default_features = false }
+srml-consensus = { path = "../consensus", default_features = false }
+srml-system = { path = "../system", default_features = false }
 
 [features]
 default = ["std"]
@@ -29,9 +29,9 @@ std = [
 	"substrate-primitives/std",
 	"sr-std/std",
 	"sr-io/std",
-	"substrate-runtime-support/std",
+	"srml-support/std",
 	"sr-primitives/std",
-	"substrate-runtime-consensus/std",
-	"substrate-runtime-balances/std",
-	"substrate-runtime-system/std",
+	"srml-consensus/std",
+	"srml-balances/std",
+	"srml-system/std",
 ]

core/srml/democracy/src/lib.rs

@@ -33,19 +33,19 @@ extern crate parity_codec_derive;
 #[macro_use]
 extern crate sr_std as rstd;
 #[macro_use]
-extern crate substrate_runtime_support;
+extern crate srml_support;
 
 extern crate parity_codec as codec;
 extern crate sr_io as runtime_io;
 extern crate sr_primitives as primitives;
-extern crate substrate_runtime_balances as balances;
-extern crate substrate_runtime_system as system;
+extern crate srml_balances as balances;
+extern crate srml_system as system;
 
 use rstd::prelude::*;
 use rstd::result;
 use primitives::traits::{Zero, OnFinalise, As, MaybeSerializeDebug};
-use substrate_runtime_support::{StorageValue, StorageMap, Parameter, Dispatchable, IsSubType};
-use substrate_runtime_support::dispatch::Result;
+use srml_support::{StorageValue, StorageMap, Parameter, Dispatchable, IsSubType};
+use srml_support::dispatch::Result;
 use system::{ensure_signed, ensure_root};
 
 #[cfg(any(feature = "std", test))]

core/srml/example/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "substrate-runtime-example"
+name = "srml-example"
 version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
@@ -9,26 +9,26 @@ serde = { version = "1.0", default_features = false }
 serde_derive = { version = "1.0", optional = true }
 sr-std = { path = "../../sr-std", default_features = false }
 sr-io = { path = "../../sr-io", default_features = false }
-substrate-runtime-support = { path = "../../srml/support", default_features = false }
+srml-support = { path = "../support", default_features = false }
 sr-primitives = { path = "../../sr-primitives", default_features = false }
 parity-codec = { path = "../../../codec", default_features = false }
 parity-codec-derive = { path = "../../../codec/derive", default_features = false }
 substrate-primitives = { path = "../../primitives", default_features = false }
-substrate-runtime-system = { path = "../system", default_features = false }
-substrate-runtime-balances = { path = "../balances", default_features = false }
+srml-system = { path = "../system", default_features = false }
+srml-balances = { path = "../balances", default_features = false }
 
 [features]
 default = ["std"]
 std = [
 	"sr-std/std",
 	"sr-io/std",
-	"substrate-runtime-support/std",
+	"srml-support/std",
 	"sr-primitives/std",
-	"substrate-runtime-balances/std",
+	"srml-balances/std",
 	"serde/std",
 	"serde_derive",
 	"parity-codec/std",
 	"parity-codec-derive/std",
 	"substrate-primitives/std",
-	"substrate-runtime-system/std",
+	"srml-system/std",
 ]

core/srml/example/src/lib.rs

@@ -46,17 +46,17 @@ extern crate parity_codec as codec;
 
 // Needed for type-safe access to storage DB.
 #[macro_use]
-extern crate substrate_runtime_support as runtime_support;
+extern crate srml_support as runtime_support;
 
 // Needed for various traits. In our case, `OnFinalise`.
 extern crate sr_primitives as runtime_primitives;
 // `system` module provides us with all sorts of useful stuff and macros
 // depend on it being around.
-extern crate substrate_runtime_system as system;
+extern crate srml_system as system;
 // `balances` module is needed for our little example. It's not required in
 // general (though if you want your module to be able to work with tokens, then you
 // might find it useful).
-extern crate substrate_runtime_balances as balances;
+extern crate srml_balances as balances;
 
 use runtime_primitives::traits::OnFinalise;
 use runtime_support::{StorageValue, dispatch::Result};