Refactor pallet-state-trie-migration to fungible::* traits (#1801)

## Summary

This PR consolidates `pallet-state-trie-migration` as a part of
https://github.com/paritytech/polkadot-sdk/issues/226 /
https://github.com/paritytech/polkadot-sdk/issues/171:

`pallet-state-trie-migration`:
- [x] replace `Currency` with `fungible` traits
- [x] run benchmarks
- [x] refactor to `DefaultConfig`

`pallet_nicks`:
- [x]  remove

others:
- [x] remove `as Fn*` or `asFun*` stuff based on discussion
[here](https://github.com/paritytech/polkadot-sdk/issues/226#issuecomment-1822861445)

---------

Co-authored-by: Richard Melkonian <35300528+0xmovses@users.noreply.github.com>
Co-authored-by: command-bot <>
This commit is contained in:
Branislav Kontur
2024-01-24 14:18:54 +01:00
committed by GitHub
parent a989ddfab9
commit 4374b5d598
17 changed files with 312 additions and 789 deletions
+114 -93
View File
@@ -15,32 +15,29 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//! Autogenerated weights for pallet_state_trie_migration
//! Autogenerated weights for `pallet_state_trie_migration`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! DATE: 2024-01-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
//! HOSTNAME: `runner-grjcggob-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
// Executed Command:
// ./target/production/substrate
// target/production/substrate-node
// benchmark
// pallet
// --chain=dev
// --steps=50
// --repeat=20
// --pallet=pallet_state_trie_migration
// --no-storage-info
// --no-median-slopes
// --no-min-squares
// --extrinsic=*
// --execution=wasm
// --wasm-execution=compiled
// --heap-pages=4096
// --output=./frame/state-trie-migration/src/weights.rs
// --header=./HEADER-APACHE2
// --template=./.maintain/frame-weight-template.hbs
// --json-file=/builds/parity/mirrors/polkadot-sdk/.git/.artifacts/bench.json
// --pallet=pallet_state_trie_migration
// --chain=dev
// --header=./substrate/HEADER-APACHE2
// --output=./substrate/frame/state-trie-migration/src/weights.rs
// --template=./substrate/.maintain/frame-weight-template.hbs
#![cfg_attr(rustfmt, rustfmt_skip)]
#![allow(unused_parens)]
@@ -50,7 +47,7 @@
use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
use core::marker::PhantomData;
/// Weight functions needed for pallet_state_trie_migration.
/// Weight functions needed for `pallet_state_trie_migration`.
pub trait WeightInfo {
fn continue_migrate() -> Weight;
fn continue_migrate_wrong_witness() -> Weight;
@@ -61,157 +58,181 @@ pub trait WeightInfo {
fn process_top_key(v: u32, ) -> Weight;
}
/// Weights for pallet_state_trie_migration using the Substrate node and recommended hardware.
/// Weights for `pallet_state_trie_migration` using the Substrate node and recommended hardware.
pub struct SubstrateWeight<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
/// Storage: StateTrieMigration SignedMigrationMaxLimits (r:1 w:0)
/// Proof: StateTrieMigration SignedMigrationMaxLimits (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
/// Storage: StateTrieMigration MigrationProcess (r:1 w:1)
/// Proof: StateTrieMigration MigrationProcess (max_values: Some(1), max_size: Some(1042), added: 1537, mode: MaxEncodedLen)
/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Storage: `StateTrieMigration::MigrationProcess` (r:1 w:1)
/// Proof: `StateTrieMigration::MigrationProcess` (`max_values`: Some(1), `max_size`: Some(1042), added: 1537, mode: `MaxEncodedLen`)
fn continue_migrate() -> Weight {
// Proof Size summary in bytes:
// Measured: `108`
// Estimated: `2527`
// Minimum execution time: 14_297_000 picoseconds.
Weight::from_parts(14_832_000, 2527)
.saturating_add(T::DbWeight::get().reads(2_u64))
// Estimated: `3640`
// Minimum execution time: 18_520_000 picoseconds.
Weight::from_parts(19_171_000, 3640)
.saturating_add(T::DbWeight::get().reads(3_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
}
/// Storage: StateTrieMigration SignedMigrationMaxLimits (r:1 w:0)
/// Proof: StateTrieMigration SignedMigrationMaxLimits (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
fn continue_migrate_wrong_witness() -> Weight {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `1493`
// Minimum execution time: 4_237_000 picoseconds.
Weight::from_parts(4_646_000, 1493)
// Minimum execution time: 3_786_000 picoseconds.
Weight::from_parts(4_038_000, 1493)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
fn migrate_custom_top_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 8_898_000 picoseconds.
Weight::from_parts(9_237_000, 0)
// Estimated: `3640`
// Minimum execution time: 11_144_000 picoseconds.
Weight::from_parts(11_556_000, 3640)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: unknown `0x666f6f` (r:1 w:1)
/// Proof Skipped: unknown `0x666f6f` (r:1 w:1)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_top_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `113`
// Estimated: `3578`
// Minimum execution time: 29_291_000 picoseconds.
Weight::from_parts(30_424_000, 3578)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
// Estimated: `3640`
// Minimum execution time: 59_288_000 picoseconds.
Weight::from_parts(60_276_000, 3640)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
fn migrate_custom_child_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 9_094_000 picoseconds.
Weight::from_parts(9_544_000, 0)
// Estimated: `3640`
// Minimum execution time: 11_258_000 picoseconds.
Weight::from_parts(11_626_000, 3640)
.saturating_add(T::DbWeight::get().reads(1_u64))
}
/// Storage: unknown `0x666f6f` (r:1 w:1)
/// Proof Skipped: unknown `0x666f6f` (r:1 w:1)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_child_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `105`
// Estimated: `3570`
// Minimum execution time: 30_286_000 picoseconds.
Weight::from_parts(30_948_000, 3570)
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
// Measured: `106`
// Estimated: `3640`
// Minimum execution time: 61_575_000 picoseconds.
Weight::from_parts(63_454_000, 3640)
.saturating_add(T::DbWeight::get().reads(2_u64))
.saturating_add(T::DbWeight::get().writes(2_u64))
}
/// Storage: unknown `0x6b6579` (r:1 w:1)
/// Proof Skipped: unknown `0x6b6579` (r:1 w:1)
/// Storage: UNKNOWN KEY `0x6b6579` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x6b6579` (r:1 w:1)
/// The range of component `v` is `[1, 4194304]`.
fn process_top_key(v: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `197 + v * (1 ±0)`
// Estimated: `3662 + v * (1 ±0)`
// Minimum execution time: 5_420_000 picoseconds.
Weight::from_parts(5_560_000, 3662)
// Minimum execution time: 5_259_000 picoseconds.
Weight::from_parts(5_433_000, 3662)
// Standard Error: 1
.saturating_add(Weight::from_parts(1_139, 0).saturating_mul(v.into()))
.saturating_add(Weight::from_parts(1_159, 0).saturating_mul(v.into()))
.saturating_add(T::DbWeight::get().reads(1_u64))
.saturating_add(T::DbWeight::get().writes(1_u64))
.saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into()))
}
}
// For backwards compatibility and tests
// For backwards compatibility and tests.
impl WeightInfo for () {
/// Storage: StateTrieMigration SignedMigrationMaxLimits (r:1 w:0)
/// Proof: StateTrieMigration SignedMigrationMaxLimits (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
/// Storage: StateTrieMigration MigrationProcess (r:1 w:1)
/// Proof: StateTrieMigration MigrationProcess (max_values: Some(1), max_size: Some(1042), added: 1537, mode: MaxEncodedLen)
/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Storage: `StateTrieMigration::MigrationProcess` (r:1 w:1)
/// Proof: `StateTrieMigration::MigrationProcess` (`max_values`: Some(1), `max_size`: Some(1042), added: 1537, mode: `MaxEncodedLen`)
fn continue_migrate() -> Weight {
// Proof Size summary in bytes:
// Measured: `108`
// Estimated: `2527`
// Minimum execution time: 14_297_000 picoseconds.
Weight::from_parts(14_832_000, 2527)
.saturating_add(RocksDbWeight::get().reads(2_u64))
// Estimated: `3640`
// Minimum execution time: 18_520_000 picoseconds.
Weight::from_parts(19_171_000, 3640)
.saturating_add(RocksDbWeight::get().reads(3_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
}
/// Storage: StateTrieMigration SignedMigrationMaxLimits (r:1 w:0)
/// Proof: StateTrieMigration SignedMigrationMaxLimits (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
fn continue_migrate_wrong_witness() -> Weight {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `1493`
// Minimum execution time: 4_237_000 picoseconds.
Weight::from_parts(4_646_000, 1493)
// Minimum execution time: 3_786_000 picoseconds.
Weight::from_parts(4_038_000, 1493)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
fn migrate_custom_top_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 8_898_000 picoseconds.
Weight::from_parts(9_237_000, 0)
// Estimated: `3640`
// Minimum execution time: 11_144_000 picoseconds.
Weight::from_parts(11_556_000, 3640)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: unknown `0x666f6f` (r:1 w:1)
/// Proof Skipped: unknown `0x666f6f` (r:1 w:1)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_top_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `113`
// Estimated: `3578`
// Minimum execution time: 29_291_000 picoseconds.
Weight::from_parts(30_424_000, 3578)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
// Estimated: `3640`
// Minimum execution time: 59_288_000 picoseconds.
Weight::from_parts(60_276_000, 3640)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
/// Storage: `Balances::Holds` (r:1 w:0)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
fn migrate_custom_child_success() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 9_094_000 picoseconds.
Weight::from_parts(9_544_000, 0)
// Estimated: `3640`
// Minimum execution time: 11_258_000 picoseconds.
Weight::from_parts(11_626_000, 3640)
.saturating_add(RocksDbWeight::get().reads(1_u64))
}
/// Storage: unknown `0x666f6f` (r:1 w:1)
/// Proof Skipped: unknown `0x666f6f` (r:1 w:1)
/// Storage: `Balances::Holds` (r:1 w:1)
/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(175), added: 2650, mode: `MaxEncodedLen`)
/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
fn migrate_custom_child_fail() -> Weight {
// Proof Size summary in bytes:
// Measured: `105`
// Estimated: `3570`
// Minimum execution time: 30_286_000 picoseconds.
Weight::from_parts(30_948_000, 3570)
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
// Measured: `106`
// Estimated: `3640`
// Minimum execution time: 61_575_000 picoseconds.
Weight::from_parts(63_454_000, 3640)
.saturating_add(RocksDbWeight::get().reads(2_u64))
.saturating_add(RocksDbWeight::get().writes(2_u64))
}
/// Storage: unknown `0x6b6579` (r:1 w:1)
/// Proof Skipped: unknown `0x6b6579` (r:1 w:1)
/// Storage: UNKNOWN KEY `0x6b6579` (r:1 w:1)
/// Proof: UNKNOWN KEY `0x6b6579` (r:1 w:1)
/// The range of component `v` is `[1, 4194304]`.
fn process_top_key(v: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `197 + v * (1 ±0)`
// Estimated: `3662 + v * (1 ±0)`
// Minimum execution time: 5_420_000 picoseconds.
Weight::from_parts(5_560_000, 3662)
// Minimum execution time: 5_259_000 picoseconds.
Weight::from_parts(5_433_000, 3662)
// Standard Error: 1
.saturating_add(Weight::from_parts(1_139, 0).saturating_mul(v.into()))
.saturating_add(Weight::from_parts(1_159, 0).saturating_mul(v.into()))
.saturating_add(RocksDbWeight::get().reads(1_u64))
.saturating_add(RocksDbWeight::get().writes(1_u64))
.saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into()))