Merge branch 'master' into staking

test-node/Cargo.toml

@@ -13,7 +13,7 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-futures = { version = "0.3.5", package = "futures" }
+futures = "0.3.5"
 log = "0.4.8"
 structopt = "0.3.15"
 parking_lot = "0.11.0"

test-node/runtime/src/lib.rs

@@ -235,8 +235,6 @@ impl system::Trait for Runtime {
     type OnKilledAccount = ();
     /// The data to be stored in an account.
     type AccountData = balances::AccountData<Balance>;
-    /// The base call filter.
-    type BaseCallFilter = ();
 }
 
 impl aura::Trait for Runtime {