Skip to content

Commit

Permalink
Refactor pallet-state-trie-migration to fungible::* traits (parit…
Browse files Browse the repository at this point in the history
…ytech#1801)

## Summary

This PR consolidates `pallet-state-trie-migration` as a part of
paritytech#226 /
paritytech#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](paritytech#226 (comment))

---------

Co-authored-by: Richard Melkonian <[email protected]>
Co-authored-by: command-bot <>
  • Loading branch information
bkontur and 0xmovses authored Jan 24, 2024
1 parent 2007ee1 commit 6f59167
Show file tree
Hide file tree
Showing 13 changed files with 306 additions and 770 deletions.
3 changes: 2 additions & 1 deletion substrate/bin/node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ impl pallet_balances::Config for Runtime {
type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
type FreezeIdentifier = RuntimeFreezeReason;
type MaxFreezes = ConstU32<1>;
type MaxHolds = ConstU32<6>;
type MaxHolds = ConstU32<7>;
}

parameter_types! {
Expand Down Expand Up @@ -1901,6 +1901,7 @@ impl pallet_state_trie_migration::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type ControlOrigin = EnsureRoot<AccountId>;
type Currency = Balances;
type RuntimeHoldReason = RuntimeHoldReason;
type MaxKeyLen = MigrationMaxKeyLen;
type SignedDepositPerItem = MigrationSignedDepositPerItem;
type SignedDepositBase = MigrationSignedDepositBase;
Expand Down
2 changes: 1 addition & 1 deletion substrate/frame/alliance/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ parameter_types! {
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
impl frame_system::Config for Test {
type Block = Block;
type AccountData = pallet_balances::AccountData<AccountId>;
type AccountData = pallet_balances::AccountData<u64>;
}

parameter_types! {
Expand Down
49 changes: 0 additions & 49 deletions substrate/frame/nicks/Cargo.toml

This file was deleted.

25 changes: 0 additions & 25 deletions substrate/frame/nicks/README.md

This file was deleted.

Loading

0 comments on commit 6f59167

Please sign in to comment.