pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 01:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate assets pallet to new macros (#7984)

Browse Source 
* Prep: move things around to suggested order

* Compiles, tests pass

* cleanup

* cleanup 2

* Fix dead doc-links

* Add back documentation for storage items

* Switch benchmarks to use `Event` rather than `RawEvent`.

* Update frame/assets/src/lib.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* reviwe feedback

* Obey line length checks

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
This commit is contained in:
David
2021-02-04 11:23:20 +00:00
committed by GitHub
parent 8e49a8a6a6
commit a32f2b9271
3 changed files with 916 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/assets/src/benchmarking.rs
+19 -16
View File
@@ -21,6 +21,7 @@ use super::*;
use sp_runtime::traits::Bounded;
use frame_system::RawOrigin as SystemOrigin;
use frame_benchmarking::{benchmarks, account, whitelisted_caller};
use frame_support::traits::Get;
use crate::Module as Assets;
@@ -79,7 +80,7 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, 1, 1u32.into())
verify {
assert_last_event::<T>(RawEvent::Created(Default::default(), caller.clone(), caller).into());
assert_last_event::<T>(Event::Created(Default::default(), caller.clone(), caller).into());
}
force_create {
@@ -87,7 +88,7 @@ benchmarks! {
let caller_lookup = T::Lookup::unlookup(caller.clone());
}: _(SystemOrigin::Root, Default::default(), caller_lookup, 1, 1u32.into())
verify {
assert_last_event::<T>(RawEvent::ForceCreated(Default::default(), caller).into());
assert_last_event::<T>(Event::ForceCreated(Default::default(), caller).into());
}
destroy {
@@ -96,7 +97,7 @@ benchmarks! {
add_zombies::<T>(caller.clone(), z);
}: _(SystemOrigin::Signed(caller), Default::default(), 10_000)
verify {
assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
assert_last_event::<T>(Event::Destroyed(Default::default()).into());
}
force_destroy {
@@ -105,7 +106,7 @@ benchmarks! {
add_zombies::<T>(caller.clone(), z);
}: _(SystemOrigin::Root, Default::default(), 10_000)
verify {
assert_last_event::<T>(RawEvent::Destroyed(Default::default()).into());
assert_last_event::<T>(Event::Destroyed(Default::default()).into());
}
mint {
@@ -113,7 +114,7 @@ benchmarks! {
let amount = T::Balance::from(100u32);
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::Issued(Default::default(), caller, amount).into());
assert_last_event::<T>(Event::Issued(Default::default(), caller, amount).into());
}
burn {
@@ -121,7 +122,7 @@ benchmarks! {
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, amount);
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::Burned(Default::default(), caller, amount).into());
assert_last_event::<T>(Event::Burned(Default::default(), caller, amount).into());
}
transfer {
@@ -131,7 +132,7 @@ benchmarks! {
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), target_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::Transferred(Default::default(), caller, target, amount).into());
assert_last_event::<T>(Event::Transferred(Default::default(), caller, target, amount).into());
}
force_transfer {
@@ -141,14 +142,16 @@ benchmarks! {
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
verify {
assert_last_event::<T>(RawEvent::ForceTransferred(Default::default(), caller, target, amount).into());
assert_last_event::<T>(
Event::ForceTransferred(Default::default(), caller, target, amount).into()
);
}
freeze {
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
verify {
assert_last_event::<T>(RawEvent::Frozen(Default::default(), caller).into());
assert_last_event::<T>(Event::Frozen(Default::default(), caller).into());
}
thaw {
@@ -160,14 +163,14 @@ benchmarks! {
)?;
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
verify {
assert_last_event::<T>(RawEvent::Thawed(Default::default(), caller).into());
assert_last_event::<T>(Event::Thawed(Default::default(), caller).into());
}
freeze_asset {
let (caller, caller_lookup) = create_default_minted_asset::<T>(10, 100u32.into());
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
verify {
assert_last_event::<T>(RawEvent::AssetFrozen(Default::default()).into());
assert_last_event::<T>(Event::AssetFrozen(Default::default()).into());
}
thaw_asset {
@@ -178,7 +181,7 @@ benchmarks! {
)?;
}: _(SystemOrigin::Signed(caller.clone()), Default::default())
verify {
assert_last_event::<T>(RawEvent::AssetThawed(Default::default()).into());
assert_last_event::<T>(Event::AssetThawed(Default::default()).into());
}
transfer_ownership {
@@ -187,7 +190,7 @@ benchmarks! {
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller), Default::default(), target_lookup)
verify {
assert_last_event::<T>(RawEvent::OwnerChanged(Default::default(), target).into());
assert_last_event::<T>(Event::OwnerChanged(Default::default(), target).into());
}
set_team {
@@ -197,7 +200,7 @@ benchmarks! {
let target2 = T::Lookup::unlookup(account("target", 2, SEED));
}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
verify {
assert_last_event::<T>(RawEvent::TeamChanged(
assert_last_event::<T>(Event::TeamChanged(
Default::default(),
account("target", 0, SEED),
account("target", 1, SEED),
@@ -211,7 +214,7 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
}: _(SystemOrigin::Signed(caller), Default::default(), max_zombies)
verify {
assert_last_event::<T>(RawEvent::MaxZombiesChanged(Default::default(), max_zombies).into());
assert_last_event::<T>(Event::MaxZombiesChanged(Default::default(), max_zombies).into());
}
set_metadata {
@@ -226,7 +229,7 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
}: _(SystemOrigin::Signed(caller), Default::default(), name.clone(), symbol.clone(), decimals)
verify {
assert_last_event::<T>(RawEvent::MetadataSet(Default::default(), name, symbol, decimals).into());
assert_last_event::<T>(Event::MetadataSet(Default::default(), name, symbol, decimals).into());
}
}
substrate/frame/assets/src/lib.rs
+887 -829
View File
File diff suppressed because it is too large Load Diff
substrate/frame/support/src/lib.rs
+10 -6
View File
@@ -1874,11 +1874,15 @@ pub mod pallet_prelude {
///
/// ## Upgrade guidelines:
///
/// 1. export metadata of the pallet for later checks
/// 2. generate the template upgrade for the pallet provided by decl_storage with environment
/// variable `PRINT_PALLET_UPGRADE`: `PRINT_PALLET_UPGRADE=1 cargo check -p my_pallet`
/// This template can be used as information it contains all information for storages, genesis
/// config and genesis build.
/// 1. Export the metadata of the pallet for later checks
/// - run your node with the pallet active
/// - query the metadata using the `state_getMetadata` RPC and curl, or use
/// `subsee -p <PALLET_NAME> > meta.json`
/// 2. generate the template upgrade for the pallet provided by decl_storage
/// with environment variable `PRINT_PALLET_UPGRADE`:
/// `PRINT_PALLET_UPGRADE=1 cargo check -p my_pallet` This template can be
/// used as information it contains all information for storages, genesis
/// config and genesis build.
/// 3. reorganize pallet to have trait `Config`, `decl_*` macros, `ValidateUnsigned`,
/// `ProvideInherent`, `Origin` all together in one file. Suggested order:
/// * Config,
@@ -1925,7 +1929,7 @@ pub mod pallet_prelude {
/// impl<T: Config> Pallet<T> {
/// }
/// ```
/// and write inside all the call in decl_module with a few changes in the signature:
/// and write inside all the calls in decl_module with a few changes in the signature:
/// - origin must now be written completely, e.g. `origin: OriginFor<T>`
/// - result type must be `DispatchResultWithPostInfo`, you need to write it and also you might
/// need to put `Ok(().into())` at the end or the function.