Merge branch 'master' into fix_flaming_fir_light_sync

core/primitives/src/crypto.rs

@@ -18,9 +18,9 @@
 //! Cryptographic utilities.
 // end::description[]
 
-use rstd::convert::TryFrom;
 #[cfg(feature = "std")]
 use rstd::convert::TryInto;
+use rstd::convert::TryFrom;
 #[cfg(feature = "std")]
 use parking_lot::Mutex;
 #[cfg(feature = "std")]

core/service/src/chain_spec.rs

@@ -81,10 +81,10 @@ impl<'a, G: RuntimeGenesis> BuildStorage for &'a ChainSpec<G> {
 			)),
 		}
 	}
+
 	fn assimilate_storage(
 		self,
-		_: &mut StorageOverlay,
-		_: &mut ChildrenStorageOverlay,
+		_: &mut (StorageOverlay, ChildrenStorageOverlay),
 		_: &mut StorageOverlay,
 	) -> Result<(), String> {
 		Err("`assimilate_storage` not implemented for `ChainSpec`.".into())

core/sr-primitives/src/lib.rs

@@ -113,17 +113,15 @@ pub use serde::{Serialize, Deserialize, de::DeserializeOwned};
 pub trait BuildStorage: Sized {
 	/// Build the storage out of this builder.
 	fn build_storage(self) -> Result<(StorageOverlay, ChildrenStorageOverlay), String> {
-		let mut storage = Default::default();
-		let mut child_storage = Default::default();
+		let mut storage = (Default::default(), Default::default());
 		let mut temp_storage = Default::default();
-		self.assimilate_storage(&mut storage, &mut child_storage, &mut temp_storage)?;
-		Ok((storage, child_storage))
+		self.assimilate_storage(&mut storage, &mut temp_storage)?;
+		Ok(storage)
 	}
 	/// Assimilate the storage for this module into pre-existing overlays.
 	fn assimilate_storage(
 		self,
-		storage: &mut StorageOverlay,
-		child_storage: &mut ChildrenStorageOverlay,
+		storage: &mut (StorageOverlay, ChildrenStorageOverlay),
 		temp_storage: &mut StorageOverlay,
 	) -> Result<(), String>;
 }
@@ -134,37 +132,19 @@ pub trait BuildModuleGenesisStorage<T, I>: Sized {
 	/// Create the module genesis storage into the given `storage` and `child_storage`.
 	fn build_module_genesis_storage(
 		self,
-		storage: &mut StorageOverlay,
-		child_storage: &mut ChildrenStorageOverlay,
+		storage: &mut (StorageOverlay, ChildrenStorageOverlay),
 		temp_storage: &mut StorageOverlay,
 	) -> Result<(), String>;
 }
 
-#[cfg(feature = "std")]
-impl BuildStorage for StorageOverlay {
-	fn build_storage(self) -> Result<(StorageOverlay, ChildrenStorageOverlay), String> {
-		Ok((self, Default::default()))
-	}
-	fn assimilate_storage(
-		self,
-		storage: &mut StorageOverlay,
-		_child_storage: &mut ChildrenStorageOverlay,
-		_temp_storage: &mut StorageOverlay,
-	) -> Result<(), String> {
-		storage.extend(self);
-		Ok(())
-	}
-}
-
 #[cfg(feature = "std")]
 impl BuildStorage for (StorageOverlay, ChildrenStorageOverlay) {
 	fn build_storage(self) -> Result<(StorageOverlay, ChildrenStorageOverlay), String> {
 		Ok(self)
 	}
 	fn assimilate_storage(
 		self,
-		storage: &mut StorageOverlay,
-		child_storage: &mut ChildrenStorageOverlay,
+		storage: &mut (StorageOverlay, ChildrenStorageOverlay),
 		_temp_storage: &mut StorageOverlay,
 	)-> Result<(), String> {
 		storage.0.extend(self.0);
@@ -784,8 +764,7 @@ macro_rules! impl_outer_config {
 			impl $crate::BuildStorage for $main {
 				fn assimilate_storage(
 					self,
-					top: &mut $crate::StorageOverlay,
-					children: &mut $crate::ChildrenStorageOverlay,
+					storage: &mut ($crate::StorageOverlay, $crate::ChildrenStorageOverlay),
 					temp_storage: &mut $crate::StorageOverlay,
 				) -> std::result::Result<(), String> {
 					$(
@@ -796,8 +775,7 @@ macro_rules! impl_outer_config {
 								$snake;
 								$( $instance )?;
 								extra;
-								top;
-								children;
+								storage;
 								temp_storage;
 							}
 						}
@@ -812,14 +790,12 @@ macro_rules! impl_outer_config {
 		$module:ident;
 		$instance:ident;
 		$extra:ident;
-		$top:ident;
-		$children:ident;
+		$storage:ident;
 		$temp:ident;
 	) => {
 		$crate::BuildModuleGenesisStorage::<$runtime, $module::$instance>::build_module_genesis_storage(
 			$extra,
-			$top,
-			$children,
+			$storage,
 			$temp,
 		)?;
 	};
@@ -828,14 +804,12 @@ macro_rules! impl_outer_config {
 		$module:ident;
 		;
 		$extra:ident;
-		$top:ident;
-		$children:ident;
+		$storage:ident;
 		$temp:ident;
 	) => {
 		$crate::BuildModuleGenesisStorage::<$runtime, $module::__InherentHiddenInstance>::build_module_genesis_storage(
 			$extra,
-			$top,
-			$children,
+			$storage,
 			$temp,
 		)?;
 	}

node/executor/src/lib.rs

@@ -328,14 +328,7 @@ mod tests {
 	}
 
 	fn new_test_ext(code: &[u8], support_changes_trie: bool) -> TestExternalities<Blake2Hasher> {
-		let mut ext = TestExternalities::new_with_code_with_children(code, GenesisConfig {
-			babe: Some(BabeConfig {
-				authorities: vec![
-					(Sr25519Keyring::Dave.public().into(), 0),
-					(Sr25519Keyring::Eve.public().into(), 0),
-					(Sr25519Keyring::Ferdie.public().into(), 0),
-				]
-			}),
+		let mut ext = TestExternalities::new_with_code(code, GenesisConfig {
 			system: Some(SystemConfig {
 				changes_trie_config: if support_changes_trie { Some(ChangesTrieConfiguration {
 					digest_interval: 2,
@@ -346,6 +339,13 @@ mod tests {
 			indices: Some(IndicesConfig {
 				ids: vec![alice(), bob(), charlie(), dave(), eve(), ferdie()],
 			}),
+			babe: Some(BabeConfig {
+				authorities: vec![
+					(Sr25519Keyring::Dave.public().into(), 0),
+					(Sr25519Keyring::Eve.public().into(), 0),
+					(Sr25519Keyring::Ferdie.public().into(), 0),
+				]
+			}),
 			balances: Some(BalancesConfig {
 				balances: vec![
 					(alice(), 111 * DOLLARS),

node/runtime/src/lib.rs

@@ -80,8 +80,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to equal spec_version. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 136,
-	impl_version: 136,
+	spec_version: 139,
+	impl_version: 138,
 	apis: RUNTIME_API_VERSIONS,
 };
 

srml/aura/src/mock.rs

@@ -77,7 +77,7 @@ pub fn new_test_ext(authorities: Vec<u64>) -> runtime_io::TestExternalities<Blak
 	let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	GenesisConfig::<Test>{
 		authorities: authorities.into_iter().map(|a| UintAuthorityId(a).to_public_key()).collect(),
-	}.assimilate_storage(&mut t).unwrap();
+	}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 	t.into()
 }
 

srml/babe/src/lib.rs

@@ -177,8 +177,7 @@ decl_storage! {
 	add_extra_genesis {
 		config(authorities): Vec<(AuthorityId, BabeWeight)>;
 		build(|
-			storage: &mut sr_primitives::StorageOverlay,
-			_: &mut sr_primitives::ChildrenStorageOverlay,
+			storage: &mut (sr_primitives::StorageOverlay, sr_primitives::ChildrenStorageOverlay),
 			temp_storage: &mut sr_primitives::StorageOverlay,
 			config: &GenesisConfig,
 		| {

srml/balances/src/mock.rs

@@ -202,7 +202,7 @@ impl ExtBuilder {
 			} else {
 				vec![]
 			},
-		}.assimilate_storage(&mut t).unwrap();
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		t.into()
 	}
 }

srml/contracts/src/tests.rs

@@ -277,12 +277,12 @@ impl ExtBuilder {
 		balances::GenesisConfig::<Test> {
 			balances: vec![],
 			vesting: vec![],
-		}.assimilate_storage(&mut t.0, &mut t.1, &mut Default::default()).unwrap();
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		GenesisConfig::<Test> {
 			current_schedule: Default::default(),
 			gas_price: self.gas_price,
-		}.assimilate_storage(&mut t.0, &mut t.1, &mut Default::default()).unwrap();
-		runtime_io::TestExternalities::new_with_children(t)
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
+		runtime_io::TestExternalities::new(t)
 	}
 }
 

srml/council/src/lib.rs

@@ -259,7 +259,7 @@ mod tests {
 					(6, 60 * self.balance_factor)
 				],
 				vesting: vec![],
-			}.assimilate_storage(&mut t.0, &mut t.1, &mut Default::default()).unwrap();
+			}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 			seats::GenesisConfig::<Test> {
 				active_council: if self.with_council { vec![
 					(1, 10),
@@ -269,8 +269,8 @@ mod tests {
 				desired_seats: 2,
 				presentation_duration: 2,
 				term_duration: 5,
-			}.assimilate_storage(&mut t.0, &mut t.1, &mut Default::default()).unwrap();
-			runtime_io::TestExternalities::new_with_children(t)
+			}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
+			runtime_io::TestExternalities::new(t)
 		}
 	}
 

srml/democracy/src/lib.rs

@@ -1094,13 +1094,9 @@ mod tests {
 		balances::GenesisConfig::<Test>{
 			balances: vec![(1, 10), (2, 20), (3, 30), (4, 40), (5, 50), (6, 60)],
 			vesting: vec![],
-		}.assimilate_storage(&mut t.0, &mut t.1, &mut Default::default()).unwrap();
-		GenesisConfig::default().assimilate_storage(
-			&mut t.0,
-			&mut t.1,
-			&mut Default::default(),
-		).unwrap();
-		runtime_io::TestExternalities::new_with_children(t)
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
+		GenesisConfig::default().assimilate_storage(&mut t, &mut Default::default()).unwrap();
+		runtime_io::TestExternalities::new(t)
 	}
 
 	type System = system::Module<Test>;

srml/example/src/lib.rs

@@ -577,13 +577,13 @@ mod tests {
 	fn new_test_ext() -> sr_io::TestExternalities<Blake2Hasher> {
 		let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 		// We use default for brevity, but you can configure as desired if needed.
-		balances::GenesisConfig::<Test>::default().assimilate_storage(&mut t).unwrap();
+		balances::GenesisConfig::<Test>::default().assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		GenesisConfig::<Test>{
 			dummy: 42,
 			// we configure the map with (key, value) pairs.
 			bar: vec![(1, 2), (2, 3)],
 			foo: 24,
-		}.assimilate_storage(&mut t).unwrap();
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		t.into()
 	}
 

srml/executive/src/lib.rs

@@ -465,7 +465,7 @@ mod tests {
 		balances::GenesisConfig::<Runtime> {
 			balances: vec![(1, 211)],
 			vesting: vec![],
-		}.assimilate_storage(&mut t.0, &mut t.1, &mut Default::default()).unwrap();
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		let xt = sr_primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer(2, 69));
 		let weight = xt.get_dispatch_info().weight as u64;
 		let mut t = runtime_io::TestExternalities::<Blake2Hasher>::new(t);
@@ -489,7 +489,7 @@ mod tests {
 		balances::GenesisConfig::<Runtime> {
 			balances: vec![(1, 111 * balance_factor)],
 			vesting: vec![],
-		}.assimilate_storage(&mut t).unwrap();
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		t.into()
 	}
 

srml/generic-asset/src/lib.rs

@@ -479,8 +479,7 @@ decl_storage! {
 		config(endowed_accounts): Vec<T::AccountId>;
 
 		build(|
-			storage: &mut sr_primitives::StorageOverlay,
-			_: &mut sr_primitives::ChildrenStorageOverlay,
+			storage: &mut (sr_primitives::StorageOverlay, sr_primitives::ChildrenStorageOverlay),
 			_: &mut sr_primitives::StorageOverlay,
 			config: &GenesisConfig<T>| {
 			config.assets.iter().for_each(|asset_id| {

srml/generic-asset/src/mock.rs

@@ -128,7 +128,7 @@ impl ExtBuilder {
 				staking_asset_id: 16000,
 				spending_asset_id: 16001,
 			}
-			.assimilate_storage(&mut t).unwrap();
+			.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 
 		t.into()
 	}

srml/grandpa/src/mock.rs

@@ -85,7 +85,7 @@ pub fn new_test_ext(authorities: Vec<(u64, u64)>) -> runtime_io::TestExternaliti
 	let mut t = system::GenesisConfig::default().build_storage::<Test>().unwrap();
 	GenesisConfig {
 		authorities: to_authorities(authorities),
-	}.assimilate_storage(&mut t).unwrap();
+	}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 	t.into()
 }
 

srml/indices/src/mock.rs

@@ -105,7 +105,7 @@ pub fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
 	let mut t = system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
 	GenesisConfig::<Runtime> {
 		ids: vec![1, 2, 3, 4]
-	}.assimilate_storage(&mut t).unwrap();
+	}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 	t.into()
 }
 

srml/membership/src/lib.rs

@@ -64,8 +64,7 @@ decl_storage! {
 		config(members): Vec<T::AccountId>;
 		config(phantom): sr_std::marker::PhantomData<I>;
 		build(|
-			storage: &mut sr_primitives::StorageOverlay,
-			_: &mut sr_primitives::ChildrenStorageOverlay,
+			storage: &mut (sr_primitives::StorageOverlay, sr_primitives::ChildrenStorageOverlay),
 			_: &mut sr_primitives::StorageOverlay,
 			config: &GenesisConfig<T, I>
 		| {
@@ -289,7 +288,7 @@ mod tests {
 		GenesisConfig::<Test>{
 			members: vec![10, 20, 30],
 			.. Default::default()
-		}.assimilate_storage(&mut t).unwrap();
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		t.into()
 	}
 

srml/session/src/historical.rs

@@ -328,7 +328,7 @@ mod tests {
 			keys: NEXT_VALIDATORS.with(|l|
 				l.borrow().iter().cloned().map(|i| (i, UintAuthorityId(i).into())).collect()
 			),
-		}.assimilate_storage(&mut t).unwrap();
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
 		runtime_io::TestExternalities::new(t)
 	}
 

srml/session/src/lib.rs

@@ -320,8 +320,7 @@ decl_storage! {
 	add_extra_genesis {
 		config(keys): Vec<(T::ValidatorId, T::Keys)>;
 		build(|
-			storage: &mut sr_primitives::StorageOverlay,
-			_: &mut sr_primitives::ChildrenStorageOverlay,
+			storage: &mut (sr_primitives::StorageOverlay, sr_primitives::ChildrenStorageOverlay),
 			temp_storage: &mut sr_primitives::StorageOverlay,
 			config: &GenesisConfig<T>
 		| {
@@ -601,8 +600,8 @@ mod tests {
 			keys: NEXT_VALIDATORS.with(|l|
 				l.borrow().iter().cloned().map(|i| (i, UintAuthorityId(i).into())).collect()
 			),
-		}.assimilate_storage(&mut t.0, &mut t.1, &mut Default::default()).unwrap();
-		runtime_io::TestExternalities::new_with_children(t)
+		}.assimilate_storage(&mut t, &mut Default::default()).unwrap();
+		runtime_io::TestExternalities::new(t)
 	}
 
 	fn initialize_block(block: u64) {

srml/staking/src/lib.rs

@@ -634,8 +634,7 @@ decl_storage! {
 		config(stakers):
 			Vec<(T::AccountId, T::AccountId, BalanceOf<T>, StakerStatus<T::AccountId>)>;
 		build(|
-			storage: &mut sr_primitives::StorageOverlay,
-			_: &mut sr_primitives::ChildrenStorageOverlay,
+			storage: &mut (sr_primitives::StorageOverlay, sr_primitives::ChildrenStorageOverlay),
 			_: &mut sr_primitives::StorageOverlay,
 			config: &GenesisConfig<T>
 		| {