Migrate smrl-treasury and srml-upgrade-key to the 2018 edition (#1725)

substrate/Cargo.lock

@@ -3085,6 +3085,7 @@ dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 0.1.0",
  "sr-primitives 0.1.0",
  "sr-std 0.1.0",
@@ -3105,6 +3106,7 @@ dependencies = [
  "parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "pwasm-utils 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 0.1.0",
  "sr-primitives 0.1.0",
  "sr-sandbox 0.1.0",
@@ -3390,6 +3392,7 @@ dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 0.1.0",
  "sr-primitives 0.1.0",
  "sr-std 0.1.0",
@@ -3403,18 +3406,13 @@ dependencies = [
 name = "srml-upgrade-key"
 version = "0.1.0"
 dependencies = [
- "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
  "sr-primitives 0.1.0",
  "sr-std 0.1.0",
  "srml-consensus 0.1.0",
  "srml-support 0.1.0",
- "srml-support-procedural 0.1.0",
  "srml-system 0.1.0",
- "substrate-primitives 0.1.0",
 ]
 
 [[package]]

substrate/node-template/runtime/wasm/Cargo.lock

@@ -1163,6 +1163,7 @@ dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 0.1.0",
  "sr-std 0.1.0",
  "srml-support 0.1.0",

substrate/node/runtime/wasm/Cargo.lock

@@ -1177,6 +1177,7 @@ dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 0.1.0",
  "sr-std 0.1.0",
  "srml-support 0.1.0",
@@ -1194,6 +1195,7 @@ dependencies = [
  "parity-wasm 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "pwasm-utils 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-io 0.1.0",
  "sr-primitives 0.1.0",
  "sr-sandbox 0.1.0",
@@ -1455,31 +1457,25 @@ dependencies = [
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
+ "serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
  "sr-primitives 0.1.0",
  "sr-std 0.1.0",
  "srml-balances 0.1.0",
  "srml-support 0.1.0",
  "srml-system 0.1.0",
- "substrate-primitives 0.1.0",
 ]
 
 [[package]]
 name = "srml-upgrade-key"
 version = "0.1.0"
 dependencies = [
- "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-codec 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-codec-derive 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
- "sr-io 0.1.0",
  "sr-primitives 0.1.0",
  "sr-std 0.1.0",
  "srml-consensus 0.1.0",
  "srml-support 0.1.0",
- "srml-support-procedural 0.1.0",
  "srml-system 0.1.0",
- "substrate-primitives 0.1.0",
 ]
 
 [[package]]

substrate/srml/assets/src/lib.rs

@@ -19,11 +19,7 @@
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-// Needed for type-safe access to storage DB.
+use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage, ensure};
-#[macro_use]
-extern crate srml_support as runtime_support;
-
-use runtime_support::{StorageValue, StorageMap, Parameter};
 use primitives::traits::{Member, SimpleArithmetic, Zero, StaticLookup};
 use system::ensure_signed;
 
@@ -131,6 +127,7 @@ mod tests {
 	use super::*;
 
 	use runtime_io::with_externalities;
+	use srml_support::{impl_outer_origin, assert_ok, assert_noop};
 	use substrate_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/src/lib.rs

@@ -18,13 +18,11 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
-extern crate srml_support as runtime_support;
-
 pub use timestamp;
 
 use rstd::{result, prelude::*};
-use runtime_support::storage::StorageValue;
+use srml_support::storage::StorageValue;
+use srml_support::{decl_storage, decl_module};
 use primitives::traits::{As, Zero};
 use timestamp::OnTimestampSet;
 #[cfg(feature = "std")]

substrate/srml/aura/src/mock.rs

@@ -19,6 +19,7 @@
 #![cfg(test)]
 
 use primitives::{BuildStorage, traits::IdentityLookup, testing::{Digest, DigestItem, Header, UintAuthorityId}};
+use srml_support::impl_outer_origin;
 use runtime_io;
 use substrate_primitives::{H256, Blake2Hasher};
 use crate::{Trait, Module};

substrate/srml/balances/src/lib.rs

@@ -24,15 +24,12 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
-extern crate srml_support as runtime_support;
-
 use rstd::prelude::*;
 use rstd::{cmp, result};
 use parity_codec::Codec;
-use runtime_support::{StorageValue, StorageMap, Parameter};
+use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage};
-use runtime_support::traits::{UpdateBalanceOutcome, Currency, EnsureAccountLiquid, OnFreeBalanceZero};
+use srml_support::traits::{UpdateBalanceOutcome, Currency, EnsureAccountLiquid, OnFreeBalanceZero};
-use runtime_support::dispatch::Result;
+use srml_support::dispatch::Result;
 use primitives::traits::{Zero, SimpleArithmetic, MakePayment,
 	As, StaticLookup, Member, CheckedAdd, CheckedSub, MaybeSerializeDebug};
 use system::{IsDeadAccount, OnNewAccount, ensure_signed};

substrate/srml/balances/src/mock.rs

@@ -22,6 +22,7 @@ use primitives::BuildStorage;
 use primitives::{traits::{IdentityLookup}, testing::{Digest, DigestItem, Header}};
 use substrate_primitives::{H256, Blake2Hasher};
 use runtime_io;
+use srml_support::impl_outer_origin;
 use crate::{GenesisConfig, Module, Trait};
 
 impl_outer_origin!{

substrate/srml/balances/src/tests.rs

@@ -21,6 +21,7 @@
 use super::*;
 use mock::{Balances, ExtBuilder, Runtime, System};
 use runtime_io::with_externalities;
+use srml_support::{assert_noop, assert_ok, assert_err};
 
 #[test]
 fn default_indexing_on_new_accounts_should_not_work2() {

substrate/srml/consensus/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2018"
 [dependencies]
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
+serde_derive = { version = "1.0", optional = true }
 parity-codec = { version = "3.0", default-features = false }
 parity-codec-derive = { version = "3.0", default-features = false }
 substrate-primitives = { path = "../../core/primitives", default-features = false }
@@ -23,6 +24,7 @@ runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features =
 default = ["std"]
 std = [
 	"serde/std",
+	"serde_derive",
 	"parity-codec/std",
 	"substrate-primitives/std",
 	"rstd/std",

substrate/srml/consensus/src/lib.rs

@@ -18,16 +18,15 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[macro_use]
+#[cfg(feature = "std")]
-extern crate srml_support as runtime_support;
+use serde_derive::Serialize;
-
 use rstd::prelude::*;
 use parity_codec as codec;
 use codec::Encode;
 use parity_codec_derive::{Encode, Decode};
-use runtime_support::{storage, Parameter};
+use srml_support::{storage, Parameter, decl_storage, decl_module};
-use runtime_support::storage::StorageValue;
+use srml_support::storage::StorageValue;
-use runtime_support::storage::unhashed::StorageVec;
+use srml_support::storage::unhashed::StorageVec;
 use primitives::traits::{MaybeSerializeDebug, Member};
 use substrate_primitives::storage::well_known_keys;
 use system::{ensure_signed, ensure_inherent};

substrate/srml/consensus/src/mock.rs

@@ -19,6 +19,7 @@
 #![cfg(test)]
 
 use primitives::{BuildStorage, traits::IdentityLookup, testing::{Digest, DigestItem, Header, UintAuthorityId}};
+use srml_support::impl_outer_origin;
 use runtime_io;
 use substrate_primitives::{H256, Blake2Hasher};
 use crate::{GenesisConfig, Trait, Module};

substrate/srml/contract/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0", default-features = false }
+serde_derive = { version = "1.0", optional = true }
 pwasm-utils = { version = "0.6.1", default-features = false }
 parity-codec = { version = "3.0", default-features = false }
 parity-codec-derive = { version = "3.0", default-features = false }
@@ -30,6 +31,7 @@ consensus = { package = "srml-consensus", path = "../consensus", default-feature
 default = ["std"]
 std = [
 	"serde/std",
+	"serde_derive",
 	"parity-codec/std",
 	"parity-codec-derive/std",
 	"substrate-primitives/std",

substrate/srml/contract/src/account_db.rs

@@ -21,7 +21,7 @@ use {balances, system};
 use rstd::cell::RefCell;
 use rstd::collections::btree_map::{BTreeMap, Entry};
 use rstd::prelude::*;
-use runtime_support::{StorageMap, StorageDoubleMap, traits::UpdateBalanceOutcome};
+use srml_support::{StorageMap, StorageDoubleMap, traits::UpdateBalanceOutcome};
 
 pub struct ChangeEntry<T: Trait> {
 	balance: Option<T::Balance>,

substrate/srml/contract/src/exec.rs

@@ -21,7 +21,7 @@ use crate::gas::{GasMeter, Token, approx_gas_for_balance};
 use rstd::prelude::*;
 use runtime_primitives::traits::{CheckedAdd, CheckedSub, Zero};
 use timestamp;
-use runtime_support::traits::EnsureAccountLiquid;
+use srml_support::traits::EnsureAccountLiquid;
 
 pub type BalanceOf<T> = <T as balances::Trait>::Balance;
 pub type AccountIdOf<T> = <T as system::Trait>::AccountId;

substrate/srml/contract/src/gas.rs

@@ -18,7 +18,7 @@ use crate::{GasSpent, Module, Trait};
 use balances;
 use runtime_primitives::BLOCK_FULL;
 use runtime_primitives::traits::{As, CheckedMul, CheckedSub, Zero};
-use runtime_support::StorageValue;
+use srml_support::StorageValue;
 
 #[cfg(test)]
 use std::{any::Any, fmt::Debug};

substrate/srml/contract/src/lib.rs

@@ -52,14 +52,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-// We need these `extern crate` to be placed here otherwise there will be errors.
-// TODO: https://github.com/paritytech/substrate/issues/1509
-#[macro_use]
-extern crate parity_codec_derive;
-extern crate parity_codec as codec;
-#[macro_use]
-extern crate srml_support as runtime_support;
-
 #[macro_use]
 mod gas;
 
@@ -73,13 +65,16 @@ mod tests;
 use crate::exec::ExecutionContext;
 use crate::account_db::AccountDb;
 
+#[cfg(feature = "std")]
+use serde_derive::{Serialize, Deserialize};
 use rstd::prelude::*;
 use rstd::marker::PhantomData;
-use codec::Codec;
+use parity_codec::Codec;
+use parity_codec_derive::{Encode, Decode};
 use runtime_primitives::traits::{Hash, As, SimpleArithmetic,Bounded, StaticLookup};
-use runtime_support::dispatch::{Result, Dispatchable};
+use srml_support::dispatch::{Result, Dispatchable};
-use runtime_support::{Parameter, StorageMap, StorageValue, StorageDoubleMap};
+use srml_support::{Parameter, StorageMap, StorageValue, StorageDoubleMap, decl_module, decl_event, decl_storage};
-use runtime_support::traits::OnFreeBalanceZero;
+use srml_support::traits::OnFreeBalanceZero;
 use system::{ensure_signed, RawOrigin};
 use runtime_io::{blake2_256, twox_128};
 use timestamp;
@@ -144,7 +139,7 @@ where
 pub struct DefaultDispatchFeeComputor<T: Trait>(PhantomData<T>);
 impl<T: Trait> ComputeDispatchFee<T::Call, T::Balance> for DefaultDispatchFeeComputor<T> {
 	fn compute_dispatch_fee(call: &T::Call) -> T::Balance {
-		let encoded_len = codec::Encode::encode(&call).len();
+		let encoded_len = parity_codec::Encode::encode(&call).len();
 		let base_fee = <balances::Module<T>>::transaction_base_fee();
 		let byte_fee = <balances::Module<T>>::transaction_byte_fee();
 		base_fee + byte_fee * <T::Balance as As<u64>>::sa(encoded_len as u64)

substrate/srml/contract/src/tests.rs

@@ -24,7 +24,7 @@ use runtime_primitives::testing::{Digest, DigestItem, H256, Header, UintAuthorit
 use runtime_primitives::traits::{BlakeTwo256, IdentityLookup};
 use runtime_primitives::BuildStorage;
 use runtime_io;
-use runtime_support::{StorageMap, StorageDoubleMap};
+use srml_support::{StorageMap, StorageDoubleMap, assert_ok, impl_outer_event, impl_outer_dispatch, impl_outer_origin};
 use substrate_primitives::{Blake2Hasher};
 use system::{self, Phase, EventRecord};
 use {wabt, balances, consensus};
@@ -40,6 +40,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;
 }
 impl_outer_event! {
 	pub enum MetaEvent for Test {
@@ -347,7 +348,7 @@ const HASH_DISPATCH_CALL: [u8; 32] = hex!("49dfdcaf9c1553be10634467e95b8e71a3bc1
 fn dispatch_call() {
 	// This test can fail due to the encoding changes. In case it becomes too annoying
 	// let's rewrite so as we use this module controlled call or we serialize it in runtime.
-	let encoded = codec::Encode::encode(&Call::Balances(balances::Call::transfer(CHARLIE, 50)));
+	let encoded = parity_codec::Encode::encode(&Call::Balances(balances::Call::transfer(CHARLIE, 50)));
 	assert_eq!(&encoded[..], &hex!("00000300000000000000C8")[..]);
 
 	let wasm = wabt::wat2wasm(CODE_DISPATCH_CALL).unwrap();

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

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

substrate/srml/contract/src/wasm/mod.rs

@@ -23,6 +23,7 @@ use crate::exec::{Ext, EmptyOutputBuf, VmExecResult};
 use crate::gas::GasMeter;
 
 use rstd::prelude::*;
+use parity_codec_derive::{Encode, Decode};
 use sandbox;
 
 #[macro_use]

substrate/srml/contract/src/wasm/runtime.rs

@@ -23,7 +23,7 @@ use sandbox;
 use system;
 use rstd::prelude::*;
 use rstd::mem;
-use codec::{Decode, Encode};
+use parity_codec::{Decode, Encode};
 use runtime_primitives::traits::{As, CheckedMul, Bounded};
 
 /// Enumerates all possible *special* trap conditions.

substrate/srml/support/procedural/Cargo.toml

@@ -2,6 +2,7 @@
 name = "srml-support-procedural"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [lib]
 proc-macro = true

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

@@ -21,16 +21,6 @@
 #![recursion_limit="256"]
 
 extern crate proc_macro;
-extern crate proc_macro2;
-
-#[macro_use]
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
-
-#[macro_use]
-extern crate srml_support_procedural_tools;
 
 mod storage;
 

substrate/srml/support/procedural/src/storage/mod.rs

@@ -19,8 +19,9 @@
 // end::description[]
 
 use srml_support_procedural_tools::syn_ext as ext;
+use srml_support_procedural_tools::{ToTokens, Parse, custom_keyword, custom_keyword_impl};
 
-use syn::Ident;
+use syn::{Ident, Token};
 use syn::token::CustomKeyword;
 
 pub mod transformation;

substrate/srml/support/procedural/src/storage/transformation.rs

@@ -31,8 +31,10 @@ use syn::{
 	parse::{
 		Error,
 		Result,
-	}
+	},
+	parse_macro_input,
 };
+use quote::quote;
 
 use super::*;
 

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

@@ -2,6 +2,7 @@
 name = "srml-support-procedural-tools"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [dependencies]
 srml-support-procedural-tools-derive = { path = "./derive" }

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

@@ -2,6 +2,7 @@
 name = "srml-support-procedural-tools-derive"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [lib]
 proc-macro = true

substrate/srml/support/procedural/tools/derive/src/lib.rs

@@ -18,21 +18,14 @@
 //! Use to derive parsing for parsing struct.
 // end::description[]
 
-
 #![recursion_limit = "128"]
 
-#[macro_use]
-extern crate syn;
-
-#[macro_use]
-extern crate quote;
-
 extern crate proc_macro;
-extern crate proc_macro2;
 
 use proc_macro::TokenStream;
 use proc_macro2::Span;
-
+use syn::parse_macro_input;
+use quote::quote;
 
 pub(crate) fn fields_idents(
 	fields: impl Iterator<Item = syn::Field>,

substrate/srml/support/procedural/tools/src/lib.rs

@@ -18,17 +18,11 @@
 //! Proc macro helpers for procedural macros
 // end::description[]
 
-extern crate syn;
-#[macro_use]
-extern crate quote;
-extern crate proc_macro2;
-
 extern crate proc_macro;
 
-#[macro_use] extern crate srml_support_procedural_tools_derive;
-
 // reexport proc macros
 pub use srml_support_procedural_tools_derive::*;
+pub use quote;
 
 pub mod syn_ext;
 
@@ -68,10 +62,10 @@ fn generate_hidden_includes_mod_name(unique_id: &str) -> Ident {
 /// Generates the access to the `subtrate_client` crate.
 pub fn generate_crate_access(unique_id: &str, def_crate: &str) -> TokenStream {
 	if ::std::env::var("CARGO_PKG_NAME").unwrap() == def_crate {
-		quote!( crate )
+		quote::quote!( crate )
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
-		quote!( self::#mod_name::hidden_include )
+		quote::quote!( self::#mod_name::hidden_include )
 	}.into()
 }
 
@@ -82,7 +76,7 @@ pub fn generate_hidden_includes(unique_id: &str, def_crate: &str, crate_id: &str
 		TokenStream::new()
 	} else {
 		let mod_name = generate_hidden_includes_mod_name(unique_id);
-		quote!(
+		quote::quote!(
 			#[doc(hidden)]
 			mod #mod_name {
 				pub extern crate #crate_id as hidden_include;

substrate/srml/support/procedural/tools/src/syn_ext.rs

@@ -25,9 +25,10 @@ use syn::parse::{
 };
 use syn::token::CustomKeyword;
 use proc_macro2::TokenStream as T2;
-use quote::ToTokens;
+use quote::{ToTokens, quote};
 use std::iter::once;
 use syn::Ident;
+use srml_support_procedural_tools_derive::{ToTokens, Parse};
 
 /// stop parsing here getting remaining token as content
 /// Warn duplicate stream (part of)

substrate/srml/support/src/lib.rs

@@ -74,7 +74,7 @@ macro_rules! fail {
 macro_rules! ensure {
 	( $x:expr, $y:expr ) => {{
 		if !$x {
-			fail!($y);
+			$crate::fail!($y);
 		}
 	}}
 }
@@ -84,7 +84,7 @@ macro_rules! ensure {
 macro_rules! assert_noop {
 	( $x:expr , $y:expr ) => {
 		let h = runtime_io::storage_root();
-		assert_err!($x, $y);
+		$crate::assert_err!($x, $y);
 		assert_eq!(h, runtime_io::storage_root());
 	}
 }

substrate/srml/treasury/Cargo.toml

@@ -2,31 +2,34 @@
 name = "srml-treasury"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [dependencies]
 hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
+serde_derive = { version = "1.0", optional = true }
 parity-codec = { version = "3.0", default-features = false }
 parity-codec-derive = { version = "3.0", default-features = false }
-substrate-primitives = { path = "../../core/primitives", default-features = false }
+rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false }
-sr-std = { path = "../../core/sr-std", default-features = false }
+runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false }
-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-system = { path = "../system", default-features = false }
+system = { package = "srml-system", path = "../system", default-features = false }
-srml-balances = { path = "../balances", default-features = false }
+balances = { package = "srml-balances", path = "../balances", default-features = false }
+
+[dev-dependencies]
+runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false }
+substrate-primitives = { path = "../../core/primitives", default-features = false }
 
 [features]
 default = ["std"]
 std = [
 	"serde/std",
+	"serde_derive",
 	"parity-codec/std",
 	"parity-codec-derive/std",
-	"substrate-primitives/std",
+	"rstd/std",
-	"sr-std/std",
+	"runtime_primitives/std",
-	"sr-io/std",
-	"sr-primitives/std",
 	"srml-support/std",
-	"srml-system/std",
+	"system/std",
-	"srml-balances/std",
+	"balances/std",
 ]

substrate/srml/treasury/src/lib.rs

@@ -18,32 +18,13 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-extern crate sr_std as rstd;
-
-#[macro_use]
-extern crate srml_support as runtime_support;
-
-#[cfg(test)]
-extern crate sr_io as runtime_io;
-#[cfg(test)]
-extern crate substrate_primitives;
-#[cfg(test)]
-extern crate srml_balances as balances;
-
 #[cfg(feature = "std")]
-extern crate serde;
+use serde_derive::{Serialize, Deserialize};
-
-#[macro_use]
-extern crate parity_codec_derive;
-
-extern crate parity_codec as codec;
-extern crate sr_primitives as runtime_primitives;
-extern crate srml_system as system;
-
 use rstd::prelude::*;
-use runtime_support::{StorageValue, StorageMap};
+use srml_support::{StorageValue, StorageMap, decl_module, decl_storage, decl_event, ensure};
-use runtime_support::traits::{Currency, OnDilution};
+use srml_support::traits::{Currency, OnDilution};
 use runtime_primitives::{Permill, traits::{Zero, EnsureOrigin, StaticLookup}};
+use parity_codec_derive::{Encode, Decode};
 use system::ensure_signed;
 
 type BalanceOf<T> = <<T as Trait>::Currency as Currency<<T as system::Trait>::AccountId>>::Balance;
@@ -277,6 +258,7 @@ mod tests {
 	use super::*;
 
 	use runtime_io::with_externalities;
+	use srml_support::{impl_outer_origin, assert_ok, assert_noop};
 	use substrate_primitives::{H256, Blake2Hasher};
 	use runtime_primitives::BuildStorage;
 	use runtime_primitives::traits::{BlakeTwo256, OnFinalise, IdentityLookup};

substrate/srml/upgrade-key/Cargo.toml

@@ -2,32 +2,25 @@
 name = "srml-upgrade-key"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
 
 [dependencies]
-hex-literal = "0.1.0"
 serde = { version = "1.0", default-features = false }
 parity-codec = { version = "3.0", default-features = false }
-parity-codec-derive = { version = "3.0", default-features = false }
-substrate-primitives = { path = "../../core/primitives", default-features = false }
 sr-std = { path = "../../core/sr-std", default-features = false }
-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" }
+system = { package = "srml-system", path = "../system", default-features = false }
-srml-system = { path = "../system", default-features = false }
+consensus = { package = "srml-consensus", path = "../consensus", default-features = false }
-srml-consensus = { path = "../consensus", default-features = false }
 
 [features]
 default = ["std"]
 std = [
 	"serde/std",
 	"parity-codec/std",
-	"parity-codec-derive/std",
 	"sr-std/std",
-	"sr-io/std",
 	"sr-primitives/std",
-	"substrate-primitives/std",
 	"srml-support/std",
-	"srml-system/std",
+	"system/std",
-	"srml-consensus/std",
+	"consensus/std",
 ]

substrate/srml/upgrade-key/src/lib.rs

@@ -19,23 +19,9 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-extern crate sr_std;
-#[cfg(test)]
-extern crate sr_io;
-#[cfg(test)]
-extern crate substrate_primitives;
-extern crate sr_primitives;
-extern crate parity_codec_derive;
-extern crate parity_codec as codec;
-#[macro_use]
-extern crate srml_support as support;
-
-extern crate srml_system as system;
-extern crate srml_consensus as consensus;
-
 use sr_std::prelude::*;
 use sr_primitives::traits::StaticLookup;
-use support::StorageValue;
+use srml_support::{StorageValue, decl_module, decl_event, decl_storage, ensure};
 use system::ensure_signed;
 
 pub trait Trait: consensus::Trait + system::Trait {