stake-tracker remote externalities tests + improvements

polkadot/runtime/westend/src/lib.rs

@@ -1685,8 +1685,7 @@ pub mod migrations {
 	}
 
 	/// Unreleased migrations. Add new ones here:
-	pub type Unreleased =
-		(pallet_staking::migrations::single_block::v15::MigrateV14ToV15<Runtime>,);
+	pub type Unreleased = ();
 }
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -2682,6 +2681,64 @@ mod remote_tests {
 			.unwrap();
 		ext.execute_with(|| Runtime::on_runtime_upgrade(UpgradeCheckSelect::PreAndPost));
 	}
+
+	#[tokio::test]
+	async fn try_stake_tracker_migrate() {
+		use frame_support::migrations::SteppedMigration;
+		sp_tracing::try_init_simple();
+		let transport: Transport = var("WS")
+			.unwrap_or(
+				// "wss://kusama-rpc.polkadot.io:443"
+				"ws://127.0.0.1:9900".to_string(),
+			)
+			.into();
+
+		let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
+
+		let mut ext = Builder::<Block>::default()
+			.mode(if let Some(state_snapshot) = maybe_state_snapshot {
+				Mode::OfflineOrElseOnline(
+					OfflineConfig { state_snapshot: state_snapshot.clone() },
+					OnlineConfig {
+						transport,
+						state_snapshot: Some(state_snapshot),
+						pallets: vec!["staking".into(), "stake-tracker".into()],
+						..Default::default()
+					},
+				)
+			} else {
+				Mode::Online(OnlineConfig { transport, ..Default::default() })
+			})
+			.build()
+			.await
+			.unwrap();
+
+		ext.execute_with(|| {
+			//let mut meter = WeightMeter::with_limit(Weight::from_parts(100_779_206_000,
+			// 10477090));
+			let mut meter = WeightMeter::new();
+			let mut cursor = None;
+			loop {
+				cursor = pallet_staking::migrations::v13_stake_tracker::MigrationV13::<
+					Runtime,
+					weights::pallet_staking::WeightInfo<Runtime>,
+				>::step(cursor, &mut meter)
+				.unwrap();
+
+				if cursor.is_none() {
+					// run the try-state at the end.
+					Staking::do_try_state(frame_system::Pallet::<Runtime>::block_number())
+						.map_err(|err| {
+							log::error!(" 🕵️‍♂️ try_state failure: {:?}", err);
+							err
+						})
+						.unwrap();
+
+					break;
+				}
+			}
+		});
+	}
 }
 
 mod clean_state_migration {

polkadot/runtime/westend/src/weights/pallet_staking.rs

@@ -827,12 +827,23 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
 
-	// TODO: run CI bot benchmarks
 	fn drop_dangling_nomination() -> Weight {
-	    Weight::default()
+		// Proof Size summary in bytes:
+		//  Measured:  `1973`
+		//  Estimated: `8631`
+		// Minimum execution time: 101_638_000 picoseconds.
+		Weight::from_parts(103_488_000, 8631)
+			.saturating_add(T::DbWeight::get().reads(14_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 
 	fn v13_mmb_step() -> Weight {
-		Weight::default()
+		// Proof Size summary in bytes:
+		//  Measured:  `70141`
+		//  Estimated: `477090`
+		// Minimum execution time: 2_703_732_000 picoseconds.
+		Weight::from_parts(2_779_206_000, 477090)
+			.saturating_add(T::DbWeight::get().reads(231_u64))
+			.saturating_add(T::DbWeight::get().writes(183_u64))
 	}
 }

substrate/frame/staking/Cargo.toml

@@ -31,6 +31,7 @@ pallet-session = { path = "../session", default-features = false, features = [
 	"historical",
 ] }
 pallet-authorship = { path = "../authorship", default-features = false }
+pallet-stake-tracker = { path = "./stake-tracker", default-features = false }
 sp-application-crypto = { path = "../../primitives/application-crypto", default-features = false, features = ["serde"] }
 frame-election-provider-support = { path = "../election-provider-support", default-features = false }
 log = { workspace = true }
@@ -45,9 +46,8 @@ sp-tracing = { path = "../../primitives/tracing" }
 sp-core = { path = "../../primitives/core" }
 sp-npos-elections = { path = "../../primitives/npos-elections" }
 pallet-timestamp = { path = "../timestamp" }
-pallet-stake-tracker = { path = "./stake-tracker" }
 pallet-staking-reward-curve = { path = "reward-curve" }
-pallet-bags-list = { path = "../bags-list" }
+pallet-bags-list = { path = "../bags-list", default-features = false, features = ["try-runtime"] }
 pallet-migrations = { path = "../migrations" }
 substrate-test-utils = { path = "../../test-utils" }
 frame-benchmarking = { path = "../benchmarking" }

substrate/frame/staking/src/benchmarking.rs

@@ -1145,7 +1145,7 @@ mod benchmarks {
 
 		assert_eq!(
 			Staking::<T>::status(&voter),
-			Ok(StakerStatus::Nominator(vec![dangling_target.clone(), other_target.clone()]))
+			Ok(StakerStatus::Nominator(vec![other_target.clone(), dangling_target.clone()]))
 		);
 
 		#[extrinsic_call]
@@ -1228,7 +1228,7 @@ mod tests {
 
 	#[test]
 	fn create_validators_with_nominators_for_era_works() {
-		ExtBuilder::default().build_and_execute(|| {
+		ExtBuilder::default().try_state(false).build_and_execute(|| {
 			let v = 10;
 			let n = 100;
 
@@ -1254,7 +1254,7 @@ mod tests {
 
 	#[test]
 	fn create_validator_with_nominators_works() {
-		ExtBuilder::default().build_and_execute(|| {
+		ExtBuilder::default().try_state(false).build_and_execute(|| {
 			let n = 10;
 
 			let (validator_stash, nominators) = create_validator_with_nominators::<Test>(
@@ -1285,7 +1285,7 @@ mod tests {
 
 	#[test]
 	fn add_slashing_spans_works() {
-		ExtBuilder::default().build_and_execute(|| {
+		ExtBuilder::default().try_state(false).build_and_execute(|| {
 			let n = 10;
 
 			let (validator_stash, _nominators) = create_validator_with_nominators::<Test>(
@@ -1315,28 +1315,4 @@ mod tests {
 			}
 		});
 	}
-
-	// TODO: SelectedBenchmark not exposed by v2?
-	/*
-	#[test]
-	fn test_payout_all() {
-		ExtBuilder::default().build_and_execute(|| {
-			let v = 10;
-			let n = 100;
-
-			let selected_benchmark = SelectedBenchmark::payout_all;
-			let c = vec![
-				(frame_benchmarking::BenchmarkParameter::v, v),
-				(frame_benchmarking::BenchmarkParameter::n, n),
-			];
-
-			assert_ok!(
-				<SelectedBenchmark as frame_benchmarking::BenchmarkingSetup<Test>>::unit_test_instance(
-					&selected_benchmark,
-					&c,
-				)
-			);
-		});
-	}
-	*/
 }