Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed"

This reverts commit 6017dad.

frame/bounties/src/tests.rs

@@ -194,12 +194,13 @@ type TreasuryError = pallet_treasury::Error<Test>;
 type TreasuryError1 = pallet_treasury::Error<Test, Instance1>;
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut ext: sp_io::TestExternalities = BuildStorage::build_storage(&RuntimeGenesisConfig {
+	let mut ext: sp_io::TestExternalities = RuntimeGenesisConfig {
 		system: frame_system::GenesisConfig::default(),
 		balances: pallet_balances::GenesisConfig { balances: vec![(0, 100), (1, 98), (2, 1)] },
 		treasury: Default::default(),
 		treasury_1: Default::default(),
-	})
+	}
+	.build_storage()
 	.unwrap()
 	.into();
 	ext.execute_with(|| System::set_block_number(1));

frame/collective/src/tests.rs

@@ -177,20 +177,20 @@ impl ExtBuilder {
 	}
 
 	pub fn build(self) -> sp_io::TestExternalities {
-		let mut ext: sp_io::TestExternalities =
-			BuildStorage::build_storage(&RuntimeGenesisConfig {
-				collective: pallet_collective::GenesisConfig {
-					members: self.collective_members,
-					phantom: Default::default(),
-				},
-				collective_majority: pallet_collective::GenesisConfig {
-					members: vec![1, 2, 3, 4, 5],
-					phantom: Default::default(),
-				},
-				default_collective: Default::default(),
-			})
-			.unwrap()
-			.into();
+		let mut ext: sp_io::TestExternalities = RuntimeGenesisConfig {
+			collective: pallet_collective::GenesisConfig {
+				members: self.collective_members,
+				phantom: Default::default(),
+			},
+			collective_majority: pallet_collective::GenesisConfig {
+				members: vec![1, 2, 3, 4, 5],
+				phantom: Default::default(),
+			},
+			default_collective: Default::default(),
+		}
+		.build_storage()
+		.unwrap()
+		.into();
 		ext.execute_with(|| System::set_block_number(1));
 		ext
 	}

frame/system/src/mock.rs

@@ -126,7 +126,7 @@ pub const CALL: &<Test as Config>::RuntimeCall =
 /// Create new externalities for `System` module tests.
 pub fn new_test_ext() -> sp_io::TestExternalities {
 	let mut ext: sp_io::TestExternalities =
-		BuildStorage::build_storage(&RuntimeGenesisConfig::default()).unwrap().into();
+		RuntimeGenesisConfig::default().build_storage().unwrap().into();
 	// Add to each test the initial weight of a block
 	ext.execute_with(|| {
 		System::register_extra_weight_unchecked(

frame/tips/src/tests.rs

@@ -196,12 +196,13 @@ impl Config<Instance1> for Test {
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	let mut ext: sp_io::TestExternalities = BuildStorage::build_storage(&RuntimeGenesisConfig {
+	let mut ext: sp_io::TestExternalities = RuntimeGenesisConfig {
 		system: frame_system::GenesisConfig::default(),
 		balances: pallet_balances::GenesisConfig { balances: vec![(0, 100), (1, 98), (2, 1)] },
 		treasury: Default::default(),
 		treasury_1: Default::default(),
-	})
+	}
+	.build_storage()
 	.unwrap()
 	.into();
 	ext.execute_with(|| System::set_block_number(1));