Skip to content
Snippets Groups Projects
Commit c980c390 authored by Shawn Tabrizi's avatar Shawn Tabrizi Committed by GitHub
Browse files

Fix State Trie Migration Benchmarks (#11502)


* enable signed migrations in benchmarks

* T instead of Test

Signed-off-by: default avatarOliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Remove 'mut'

Signed-off-by: default avatarOliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

Co-authored-by: default avatarOliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
parent 7ff7457f
No related merge requests found
...@@ -848,6 +848,8 @@ mod benchmarks { ...@@ -848,6 +848,8 @@ mod benchmarks {
// function. // function.
let null = MigrationLimits::default(); let null = MigrationLimits::default();
let caller = frame_benchmarking::whitelisted_caller(); let caller = frame_benchmarking::whitelisted_caller();
// Allow signed migrations.
SignedMigrationMaxLimits::<T>::put(MigrationLimits { size: 1024, item: 5 });
}: _(frame_system::RawOrigin::Signed(caller), null, 0, StateTrieMigration::<T>::migration_process()) }: _(frame_system::RawOrigin::Signed(caller), null, 0, StateTrieMigration::<T>::migration_process())
verify { verify {
assert_eq!(StateTrieMigration::<T>::migration_process(), Default::default()) assert_eq!(StateTrieMigration::<T>::migration_process(), Default::default())
...@@ -1146,14 +1148,7 @@ mod mock { ...@@ -1146,14 +1148,7 @@ mod mock {
} }
sp_tracing::try_init_simple(); sp_tracing::try_init_simple();
let mut ext: sp_io::TestExternalities = (custom_storage, version).into(); (custom_storage, version).into()
// set some genesis values for this pallet as well.
ext.execute_with(|| {
SignedMigrationMaxLimits::<Test>::put(MigrationLimits { size: 1024, item: 5 });
});
ext
} }
pub(crate) fn run_to_block(n: u32) -> (H256, u64) { pub(crate) fn run_to_block(n: u32) -> (H256, u64) {
...@@ -1292,6 +1287,9 @@ mod test { ...@@ -1292,6 +1287,9 @@ mod test {
new_test_ext(StateVersion::V0, true, None, None).execute_with(|| { new_test_ext(StateVersion::V0, true, None, None).execute_with(|| {
assert_eq!(MigrationProcess::<Test>::get(), Default::default()); assert_eq!(MigrationProcess::<Test>::get(), Default::default());
// Allow signed migrations.
SignedMigrationMaxLimits::<Test>::put(MigrationLimits { size: 1024, item: 5 });
// can't submit if limit is too high. // can't submit if limit is too high.
frame_support::assert_err!( frame_support::assert_err!(
StateTrieMigration::continue_migrate( StateTrieMigration::continue_migrate(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment