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

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 runtime_support::traits::{UpdateBalanceOutcome, Currency, EnsureAccountLiquid, OnFreeBalanceZero};
-use runtime_support::dispatch::Result;
+use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage};
+use srml_support::traits::{UpdateBalanceOutcome, Currency, EnsureAccountLiquid, OnFreeBalanceZero};
+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() {