fixes after substrate update

src/lib.rs

@@ -5,11 +5,9 @@
 use rstd::prelude::*;
 
 use codec::{Codec, Decode, Encode};
-use runtime_primitives::traits::{MaybeSerializeDebug, Member, One, SimpleArithmetic, Zero};
+use runtime_primitives::traits::{MaybeSerialize, Member, One, SimpleArithmetic, Zero};
 use srml_support::traits::Currency;
-use srml_support::{
-    decl_module, decl_storage, ensure, EnumerableStorageMap, Parameter, StorageMap, StorageValue,
-};
+use srml_support::{decl_module, decl_storage, ensure, Parameter};
 
 mod mint;
 mod mock;
@@ -30,7 +28,7 @@ pub trait Trait: system::Trait {
         + Codec
         + Default
         + Copy
-        + MaybeSerializeDebug
+        + MaybeSerialize
         + PartialEq;
 }
 

src/mock.rs

@@ -2,7 +2,7 @@
 
 use crate::*;
 
-use primitives::{Blake2Hasher, H256};
+use primitives::H256;
 
 use crate::{Module, Trait};
 use balances;
@@ -38,7 +38,6 @@ impl system::Trait for Test {
     type AccountId = u64;
     type Lookup = IdentityLookup<Self::AccountId>;
     type Header = Header;
-    type WeightMultiplierUpdate = ();
     type Event = ();
     type BlockHashCount = BlockHashCount;
     type MaximumBlockWeight = MaximumBlockWeight;
@@ -66,15 +65,11 @@ impl balances::Trait for Test {
     /// The ubiquitous event type.
     type Event = ();
 
-    type TransactionPayment = ();
     type DustRemoval = ();
     type TransferPayment = ();
     type ExistentialDeposit = ExistentialDeposit;
     type TransferFee = TransferFee;
     type CreationFee = CreationFee;
-    type TransactionBaseFee = TransactionBaseFee;
-    type TransactionByteFee = TransactionByteFee;
-    type WeightToFee = ();
 }
 
 impl Trait for Test {
@@ -82,7 +77,7 @@ impl Trait for Test {
     type MintId = u64;
 }
 
-pub fn build_test_externalities() -> runtime_io::TestExternalities<Blake2Hasher> {
+pub fn build_test_externalities() -> runtime_io::TestExternalities {
     let t = system::GenesisConfig::default()
         .build_storage::<Test>()
         .unwrap();

src/tests.rs

@@ -3,11 +3,9 @@
 use super::*;
 use crate::mock::*;
 
-use runtime_io::with_externalities;
-
 #[test]
 fn adding_and_removing_mints() {
-    with_externalities(&mut build_test_externalities(), || {
+    build_test_externalities().execute_with(|| {
         System::set_block_number(1);
         let capacity: u64 = 5000;
         let adjustment_amount: u64 = 500;
@@ -39,7 +37,7 @@ fn adding_and_removing_mints() {
 
 #[test]
 fn minting() {
-    with_externalities(&mut build_test_externalities(), || {
+    build_test_externalities().execute_with(|| {
         let capacity: u64 = 5000;
 
         let mint_id = Minting::add_mint(capacity, None).ok().unwrap();
@@ -54,7 +52,7 @@ fn minting() {
 
 #[test]
 fn minting_exact() {
-    with_externalities(&mut build_test_externalities(), || {
+    build_test_externalities().execute_with(|| {
         let capacity: u64 = 1000;
 
         let mint_id = Minting::add_mint(capacity, None).ok().unwrap();
@@ -68,7 +66,7 @@ fn minting_exact() {
 
 #[test]
 fn adjustment_adding() {
-    with_externalities(&mut build_test_externalities(), || {
+    build_test_externalities().execute_with(|| {
         System::set_block_number(0);
         let capacity: u64 = 5000;
         let adjustment_amount: u64 = 500;
@@ -103,7 +101,7 @@ fn adjustment_adding() {
 
 #[test]
 fn adjustment_reducing() {
-    with_externalities(&mut build_test_externalities(), || {
+    build_test_externalities().execute_with(|| {
         System::set_block_number(0);
         let capacity: u64 = 5000;
         let adjustment_amount: u64 = 500;
@@ -143,7 +141,7 @@ fn adjustment_reducing() {
 
 #[test]
 fn adjustment_setting() {
-    with_externalities(&mut build_test_externalities(), || {
+    build_test_externalities().execute_with(|| {
         System::set_block_number(0);
         let capacity: u64 = 2000;
         let setting_amount: u64 = 5000;
@@ -167,7 +165,7 @@ fn adjustment_setting() {
 
 #[test]
 fn adjustment_first_interval() {
-    with_externalities(&mut build_test_externalities(), || {
+    build_test_externalities().execute_with(|| {
         System::set_block_number(0);
         let capacity: u64 = 2000;
         let amount: u64 = 500;