Cleanup Elastic Scaling Checks for FeatureIndex::ElasticScalingMVP

polkadot/node/core/backing/Cargo.toml

@@ -33,7 +33,6 @@ futures = { features = ["thread-pool"], workspace = true }
 polkadot-node-subsystem-test-helpers = { workspace = true }
 polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
-rstest = { workspace = true }
 sc-keystore = { workspace = true, default-features = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }

polkadot/node/core/backing/src/lib.rs

@@ -107,7 +107,6 @@ use polkadot_node_subsystem_util::{
 };
 use polkadot_parachain_primitives::primitives::IsSystem;
 use polkadot_primitives::{
-	node_features::FeatureIndex,
 	vstaging::{
 		BackedCandidate, CandidateReceiptV2 as CandidateReceipt,
 		CommittedCandidateReceiptV2 as CommittedCandidateReceipt,
@@ -234,9 +233,6 @@ struct PerRelayParentState {
 	fallbacks: HashMap<CandidateHash, AttestingData>,
 	/// The minimum backing votes threshold.
 	minimum_backing_votes: u32,
-	/// If true, we're appending extra bits in the BackedCandidate validator indices bitfield,
-	/// which represent the assigned core index. True if ElasticScalingMVP is enabled.
-	inject_core_index: bool,
 	/// The number of cores.
 	n_cores: u32,
 	/// Claim queue state. If the runtime API is not available, it'll be populated with info from
@@ -616,7 +612,6 @@ fn table_attested_to_backed(
 		ValidatorSignature,
 	>,
 	table_context: &TableContext,
-	inject_core_index: bool,
 ) -> Option<BackedCandidate> {
 	let TableAttestedCandidate { candidate, validity_votes, group_id: core_index } = attested;
 
@@ -655,7 +650,7 @@ fn table_attested_to_backed(
 			.map(|(pos_in_votes, _pos_in_group)| validity_votes[pos_in_votes].clone())
 			.collect(),
 		validator_indices,
-		inject_core_index.then_some(core_index),
+		Some(core_index),
 	))
 }
 
@@ -1161,16 +1156,11 @@ async fn construct_per_relay_parent_state<Context>(
 	let node_features = per_session_cache.node_features(session_index, parent, ctx.sender()).await;
 	let node_features = try_runtime_api!(node_features);
 
-	let inject_core_index = node_features
-		.get(FeatureIndex::ElasticScalingMVP as usize)
-		.map(|b| *b)
-		.unwrap_or(false);
-
 	let executor_params =
 		per_session_cache.executor_params(session_index, parent, ctx.sender()).await;
 	let executor_params = try_runtime_api!(executor_params);
 
-	gum::debug!(target: LOG_TARGET, inject_core_index, ?parent, "New state");
+	gum::debug!(target: LOG_TARGET, ?parent, "New state");
 
 	let (validator_groups, group_rotation_info) = try_runtime_api!(groups);
 
@@ -1241,7 +1231,6 @@ async fn construct_per_relay_parent_state<Context>(
 		awaiting_validation: HashSet::new(),
 		fallbacks: HashMap::new(),
 		minimum_backing_votes,
-		inject_core_index,
 		n_cores: validator_groups.len() as u32,
 		claim_queue: ClaimQueueSnapshot::from(claim_queue),
 		validator_to_group,
@@ -1676,11 +1665,7 @@ async fn post_import_statement_actions<Context>(
 
 		// `HashSet::insert` returns true if the thing wasn't in there already.
 		if rp_state.backed.insert(candidate_hash) {
-			if let Some(backed) = table_attested_to_backed(
-				attested,
-				&rp_state.table_context,
-				rp_state.inject_core_index,
-			) {
+			if let Some(backed) = table_attested_to_backed(attested, &rp_state.table_context) {
 				let para_id = backed.candidate().descriptor.para_id();
 				gum::debug!(
 					target: LOG_TARGET,
@@ -2157,13 +2142,7 @@ fn handle_get_backable_candidates_message(
 					&rp_state.table_context,
 					rp_state.minimum_backing_votes,
 				)
-				.and_then(|attested| {
-					table_attested_to_backed(
-						attested,
-						&rp_state.table_context,
-						rp_state.inject_core_index,
-					)
-				});
+				.and_then(|attested| table_attested_to_backed(attested, &rp_state.table_context));
 
 			if let Some(backed_candidate) = maybe_backed_candidate {
 				backed

polkadot/node/core/backing/src/tests/mod.rs

@@ -27,7 +27,6 @@ use polkadot_node_subsystem::{
 };
 use polkadot_node_subsystem_test_helpers::mock::new_leaf;
 use polkadot_primitives::{
-	node_features,
 	vstaging::{CoreState, MutateDescriptorV2, OccupiedCore},
 	BlockNumber, CandidateDescriptor, GroupRotationInfo, HeadData, Header, PersistedValidationData,
 	ScheduledCore, SessionIndex, LEGACY_MIN_BACKING_VOTES,
@@ -37,7 +36,6 @@ use polkadot_primitives_test_helpers::{
 	dummy_committed_candidate_receipt_v2, dummy_hash, validator_pubkeys,
 };
 use polkadot_statement_table::v2::Misbehavior;
-use rstest::rstest;
 use sp_application_crypto::AppCrypto;
 use sp_keyring::Sr25519Keyring;
 use sp_keystore::Keystore;
@@ -780,19 +778,9 @@ fn backing_second_works() {
 }
 
 // Test that the candidate reaches quorum successfully.
-#[rstest]
-#[case(true)]
-#[case(false)]
-fn backing_works(#[case] elastic_scaling_mvp: bool) {
+#[test]
+fn backing_works() {
 	let mut test_state = TestState::default();
-	if elastic_scaling_mvp {
-		test_state
-			.node_features
-			.resize((node_features::FeatureIndex::ElasticScalingMVP as u8 + 1) as usize, false);
-		test_state
-			.node_features
-			.set(node_features::FeatureIndex::ElasticScalingMVP as u8 as usize, true);
-	}
 
 	test_harness(test_state.keystore.clone(), |mut virtual_overseer| async move {
 		let para_id = activate_initial_leaf(&mut virtual_overseer, &mut test_state).await;
@@ -917,12 +905,9 @@ fn backing_works(#[case] elastic_scaling_mvp: bool) {
 		assert_eq!(candidates[0].validity_votes().len(), 3);
 
 		let (validator_indices, maybe_core_index) =
-			candidates[0].validator_indices_and_core_index(elastic_scaling_mvp);
-		if elastic_scaling_mvp {
-			assert_eq!(maybe_core_index.unwrap(), CoreIndex(0));
-		} else {
-			assert!(maybe_core_index.is_none());
-		}
+			candidates[0].validator_indices_and_core_index(true);
+
+		assert_eq!(maybe_core_index.unwrap(), CoreIndex(0));
 
 		assert_eq!(
 			validator_indices,
@@ -941,13 +926,6 @@ fn backing_works(#[case] elastic_scaling_mvp: bool) {
 #[test]
 fn get_backed_candidate_preserves_order() {
 	let mut test_state = TestState::default();
-	test_state
-		.node_features
-		.resize((node_features::FeatureIndex::ElasticScalingMVP as u8 + 1) as usize, false);
-	test_state
-		.node_features
-		.set(node_features::FeatureIndex::ElasticScalingMVP as u8 as usize, true);
-
 	// Set a single validator as the first validator group. It simplifies the test.
 	test_state.validator_groups.0[0] = vec![ValidatorIndex(2)];
 	// Add another validator group for the third core.
@@ -1575,8 +1553,11 @@ fn backing_works_while_validation_ongoing() {
 			.validity_votes()
 			.contains(&ValidityAttestation::Explicit(signed_c.signature().clone())));
 		assert_eq!(
-			candidates[0].validator_indices_and_core_index(false),
-			(bitvec::bitvec![u8, bitvec::order::Lsb0; 1, 0, 1, 1].as_bitslice(), None)
+			candidates[0].validator_indices_and_core_index(true),
+			(
+				bitvec::bitvec![u8, bitvec::order::Lsb0; 1, 0, 1, 1].as_bitslice(),
+				Some(CoreIndex(0))
+			)
 		);
 
 		virtual_overseer
@@ -2225,7 +2206,7 @@ fn candidate_backing_reorders_votes() {
 		group_id: core_idx,
 	};
 
-	let backed = table_attested_to_backed(attested, &table_context, false).unwrap();
+	let backed = table_attested_to_backed(attested, &table_context).unwrap();
 
 	let expected_bitvec = {
 		let mut validator_indices = BitVec::<u8, bitvec::order::Lsb0>::with_capacity(6);
@@ -2243,8 +2224,8 @@ fn candidate_backing_reorders_votes() {
 		vec![fake_attestation(1).into(), fake_attestation(3).into(), fake_attestation(5).into()];
 
 	assert_eq!(
-		backed.validator_indices_and_core_index(false),
-		(expected_bitvec.as_bitslice(), None)
+		backed.validator_indices_and_core_index(true),
+		(expected_bitvec.as_bitslice(), Some(CoreIndex(10)))
 	);
 	assert_eq!(backed.validity_votes(), expected_attestations);
 }

polkadot/node/core/provisioner/Cargo.toml

@@ -21,7 +21,6 @@ polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
-schnellru = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
@@ -30,5 +29,3 @@ polkadot-primitives = { workspace = true, features = ["test"] }
 polkadot-primitives-test-helpers = { workspace = true }
 sp-application-crypto = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
-
-rstest = { workspace = true }