Skip to content

Commit d6d184b

Browse files
authored
Merge pull request #5115 from mnaamani/luxor-remove-nara-runtime-migrations
Remove nara migrations
2 parents aed16d0 + 9f77d88 commit d6d184b

File tree

2 files changed

+3
-38
lines changed

2 files changed

+3
-38
lines changed

runtime/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,6 @@ impl pallet_staking::Config for Runtime {
584584
type ElectionProvider = ElectionProviderMultiPhase;
585585
type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
586586
type VoterList = VoterList;
587-
// type VoterList = VoterList; // not renaming for now
588587
type TargetList = pallet_staking::UseValidatorsMap<Self>;
589588
type MaxUnlockingChunks = ConstU32<32>;
590589
type HistoryDepth = HistoryDepth;

runtime/src/runtime_api.rs

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
66
use sp_api::impl_runtime_apis;
77
use sp_core::crypto::KeyTypeId;
88
use sp_core::OpaqueMetadata;
9-
use sp_runtime::traits::{BlakeTwo256, Block as BlockT, Get, NumberFor};
9+
use sp_runtime::traits::{BlakeTwo256, Block as BlockT, NumberFor};
1010
use sp_runtime::{generic, ApplyExtrinsicResult};
1111

1212
use sp_std::vec::Vec;
@@ -15,7 +15,7 @@ use crate::{
1515
AccountId, AllPalletsWithSystem, AuthorityDiscovery, AuthorityDiscoveryId, Babe, Balance,
1616
BlockNumber, EpochDuration, Grandpa, GrandpaAuthorityList, GrandpaId, Historical, Index,
1717
InherentDataExt, ProposalsEngine, Runtime, RuntimeCall, RuntimeVersion, SessionKeys, Signature,
18-
Staking, System, TransactionPayment, VoterList, BABE_GENESIS_EPOCH_CONFIG, VERSION,
18+
Staking, System, TransactionPayment, BABE_GENESIS_EPOCH_CONFIG, VERSION,
1919
};
2020

2121
#[cfg(feature = "try-runtime")]
@@ -75,44 +75,10 @@ impl OnRuntimeUpgrade for CancelActiveAndPendingProposals {
7575
}
7676
}
7777

78-
pub struct MigrateStakingPalletToV8;
79-
impl OnRuntimeUpgrade for MigrateStakingPalletToV8 {
80-
fn on_runtime_upgrade() -> Weight {
81-
pallet_staking::migrations::v8::migrate::<Runtime>()
82-
}
83-
}
84-
85-
pub struct StakingMigrationV11OldPallet;
86-
impl Get<&'static str> for StakingMigrationV11OldPallet {
87-
fn get() -> &'static str {
88-
"BagsList"
89-
}
90-
}
91-
9278
/// Migrations to run on runtime upgrade.
9379
/// Migrations will run before pallet on_runtime_upgrade hooks
9480
/// Always include 'CancelActiveAndPendingProposals' as first migration
95-
pub type Migrations = (
96-
CancelActiveAndPendingProposals,
97-
// == start Staking migrations (from Release v7 to Release v13)
98-
MigrateStakingPalletToV8,
99-
// list will not produce duplicates..
100-
pallet_staking::migrations::v9::InjectValidatorsIntoVoterList<Runtime>,
101-
// slash all pending slashes correctly
102-
pallet_staking::migrations::v10::MigrateToV10<Runtime>,
103-
// Rename BagsList to VoterList
104-
pallet_staking::migrations::v11::MigrateToV11<Runtime, VoterList, StakingMigrationV11OldPallet>,
105-
// Kill HistoryDepth storage
106-
pallet_staking::migrations::v12::MigrateToV12<Runtime>,
107-
// Migrate to new storage versioning
108-
pallet_staking::migrations::v13::MigrateToV13<Runtime>,
109-
// == end Staking Migrations
110-
// unreserve balances from old stored calls in multisig pallet
111-
pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
112-
pallet_election_provider_multi_phase::migrations::v1::MigrateToV1<Runtime>,
113-
pallet_grandpa::migrations::CleanupSetIdSessionMap<Runtime>,
114-
content::migrations::nara::MigrateToV1<Runtime>,
115-
);
81+
pub type Migrations = (CancelActiveAndPendingProposals,);
11682

11783
/// Executive: handles dispatch to the various modules with Migrations.
11884
pub type Executive = frame_executive::Executive<

0 commit comments

Comments
 (0)