Skip to content
Prev Previous commit
Next Next commit
Fix StateTrieMigration references in AH migration code
  • Loading branch information
nkpar committed Dec 18, 2025
commit cd502efa7abc8856522dcc2f722e182387ce7e06
3 changes: 0 additions & 3 deletions relay/polkadot/src/ah_migration/phase1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ pub fn call_allowed_status(call: &<Runtime as frame_system::Config>::RuntimeCall
Crowdloan(..) => (OFF, OFF),
Coretime(coretime::Call::<Runtime>::request_revenue_at { .. }) => (OFF, ON),
Coretime(..) => (ON, ON), // Only permissioned calls.
StateTrieMigration(..) => (OFF, OFF), // Deprecated
XcmPallet(..) => (ON, ON), // during migration can only send XCMs to other
MessageQueue(..) => (ON, ON), // contains non-permissioned service calls
AssetRate(..) => (OFF, OFF),
Expand All @@ -153,8 +152,6 @@ impl pallet_rc_migrator::types::IntoPortable for RuntimeHoldReason {

match self {
RuntimeHoldReason::Preimage(inner) => PortableHoldReason::Preimage(inner),
RuntimeHoldReason::StateTrieMigration(inner) =>
PortableHoldReason::StateTrieMigration(inner),
RuntimeHoldReason::DelegatedStaking(inner) =>
PortableHoldReason::DelegatedStaking(inner),
RuntimeHoldReason::Staking(inner) => PortableHoldReason::Staking(inner),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ pub fn call_allowed_status(
Session(..) => OFF,
Staking(..) => OFF,
StakingRcClient(..) => ON, // Keep on for incoming RC calls over XCM
StateTrieMigration(..) => OFF, // Deprecated
System(..) => ON, // remark plus root calls
Timestamp(..) => ON, // only `set` inherit
ToPolkadotXcmRouter(..) => ON, // Allow to report bridge congestion
Expand Down Expand Up @@ -202,7 +201,6 @@ pub fn call_allowed_before_migration(
Scheduler(..) |
Session(..) |
StakingRcClient(..) |
StateTrieMigration(..) |
System(..) |
Timestamp(..) |
ToPolkadotXcmRouter(..) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ impl From<pallet_rc_migrator::types::PortableHoldReason> for RuntimeHoldReason {
pallet_staking::HoldReason::Staking =>
Staking(pallet_staking_async::HoldReason::Staking),
},
PortableHoldReason::StateTrieMigration(state_trie_migration) =>
StateTrieMigration(state_trie_migration),
PortableHoldReason::StateTrieMigration(_) =>
unreachable!("StateTrieMigration pallet removed - no holds should exist"),
PortableHoldReason::DelegatedStaking(delegated_staking) =>
DelegatedStaking(delegated_staking),
PortableHoldReason::Session(session) => Session(session),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ pub fn call_allowed_status(
SnowbridgeSystemFrontend(..) => OFF,
Staking(..) => OFF,
StakingRcClient(..) => ON, // Keep on for incoming RC calls over XCM
StateTrieMigration(..) => OFF, // Deprecated
System(..) => ON, // remark plus root calls
Timestamp(..) => ON, // only `set` inherit
ToKusamaXcmRouter(..) => ON, // Allow to report bridge congestion
Expand Down Expand Up @@ -198,7 +197,6 @@ pub fn call_allowed_before_migration(
Session(..) |
SnowbridgeSystemFrontend(..) |
StakingRcClient(..) |
StateTrieMigration(..) |
System(..) |
Timestamp(..) |
ToKusamaXcmRouter(..) |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ impl From<pallet_rc_migrator::types::PortableHoldReason> for RuntimeHoldReason {
pallet_staking::HoldReason::Staking =>
Staking(pallet_staking_async::HoldReason::Staking),
},
PortableHoldReason::StateTrieMigration(state_trie_migration) =>
StateTrieMigration(state_trie_migration),
PortableHoldReason::StateTrieMigration(_) =>
unreachable!("StateTrieMigration pallet removed - no holds should exist"),
PortableHoldReason::DelegatedStaking(delegated_staking) =>
DelegatedStaking(delegated_staking),
PortableHoldReason::Session(session) => Session(session),
Expand Down
Loading