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

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.