Merge branch 'master' of github.com:paritytech/substrate into kiz-der…

…ive-impl-system

frame/examples/default-config/src/lib.rs

@@ -135,15 +135,10 @@ pub mod tests {
 	use frame_support::{derive_impl, parameter_types};
 	use pallet::{self as pallet_default_config_example, config_preludes::*};
 
-	type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 	type Block = frame_system::mocking::MockBlock<Runtime>;
 
 	frame_support::construct_runtime!(
 		pub struct Runtime
-		where
-			Block = Block,
-			NodeBlock = Block,
-			UncheckedExtrinsic = UncheckedExtrinsic,
 		{
 			System: frame_system,
 			DefaultPallet: pallet_default_config_example,
@@ -168,9 +163,6 @@ pub mod tests {
 
 		// type Index = u32;
 		// type BlockNumber = u32;
-		// type Header =
-		// sp_runtime::generic::Header<frame_system::pallet_prelude::BlockNumberFor<Self>,
-		// Self::Hashing>;
 		// type Hash = sp_core::hash::H256;
 		// type Hashing = sp_runtime::traits::BlakeTwo256;
 		// type AccountId = u64;

frame/multisig/src/tests.rs

@@ -26,7 +26,7 @@ use frame_support::{
 	assert_noop, assert_ok, derive_impl,
 	traits::{ConstU32, ConstU64, Contains},
 };
-use sp_runtime::TokenError;
+use sp_runtime::{BuildStorage, TokenError};
 
 type Block = frame_system::mocking::MockBlock<Test>;
 

frame/proxy/src/tests.rs

@@ -30,7 +30,7 @@ use frame_support::{
 	RuntimeDebug,
 };
 use sp_core::H256;
-use sp_runtime::traits::BlakeTwo256;
+use sp_runtime::{traits::BlakeTwo256, BuildStorage};
 
 type Block = frame_system::mocking::MockBlock<Test>;