Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Minor Uniques pallet improvements and XCM v3 preparations #10896

Merged
merged 14 commits into from
Mar 7, 2022
Merged

Minor Uniques pallet improvements and XCM v3 preparations #10896

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d6f3d7d
Introduce Helper to Uniques for benchmark stuff
gavofyork Feb 21, 2022
9314cb2
Fixes
gavofyork Feb 21, 2022
245c9fe
Formatting
gavofyork Feb 21, 2022
0e9f4cd
Featuregate the Helper, include ContainsPair
gavofyork Feb 21, 2022
78422c3
Introduce & use EnsureOriginWithArg
gavofyork Feb 21, 2022
cc6a176
Benchmarking
gavofyork Feb 21, 2022
f80c1d1
Docs
gavofyork Feb 21, 2022
47aad09
More ContainsBoth helpers
gavofyork Feb 23, 2022
f00447b
Merge remote-tracking branch 'origin/master' into gav-uniques-helper
gavofyork Feb 25, 2022
cbb00d7
Formatting
gavofyork Feb 25, 2022
331d349
Formatting
gavofyork Feb 25, 2022
acc641e
Fixes
gavofyork Feb 25, 2022
77a9de8
Merge branch 'master' into gav-uniques-helper
shawntabrizi Mar 4, 2022
a97ee90
Merge remote-tracking branch 'origin/master' into gav-uniques-helper
gavofyork Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/node/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,7 @@ impl pallet_uniques::Config for Runtime {
type KeyLimit = KeyLimit;
type ValueLimit = ValueLimit;
type WeightInfo = pallet_uniques::weights::SubstrateWeight<Runtime>;
type Helper = ();
}

impl pallet_transaction_storage::Config for Runtime {
Expand Down
46 changes: 23 additions & 23 deletions frame/uniques/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fn create_class<T: Config<I>, I: 'static>(
) -> (T::ClassId, T::AccountId, <T::Lookup as StaticLookup>::Source) {
let caller: T::AccountId = whitelisted_caller();
let caller_lookup = T::Lookup::unlookup(caller.clone());
let class = Default::default();
let class = T::Helper::class(0);
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
assert!(Uniques::<T, I>::create(
SystemOrigin::Signed(caller.clone()).into(),
Expand All @@ -53,14 +53,14 @@ fn create_class<T: Config<I>, I: 'static>(

fn add_class_metadata<T: Config<I>, I: 'static>(
) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().owner;
if caller != whitelisted_caller() {
whitelist_account!(caller);
}
let caller_lookup = T::Lookup::unlookup(caller.clone());
assert!(Uniques::<T, I>::set_class_metadata(
SystemOrigin::Signed(caller.clone()).into(),
Default::default(),
T::Helper::class(0),
vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
false,
)
Expand All @@ -71,15 +71,15 @@ fn add_class_metadata<T: Config<I>, I: 'static>(
fn mint_instance<T: Config<I>, I: 'static>(
index: u16,
) -> (T::InstanceId, T::AccountId, <T::Lookup as StaticLookup>::Source) {
let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().admin;
let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().admin;
if caller != whitelisted_caller() {
whitelist_account!(caller);
}
let caller_lookup = T::Lookup::unlookup(caller.clone());
let instance = index.into();
let instance = T::Helper::instance(index);
assert!(Uniques::<T, I>::mint(
SystemOrigin::Signed(caller.clone()).into(),
Default::default(),
T::Helper::class(0),
instance,
caller_lookup.clone(),
)
Expand All @@ -90,14 +90,14 @@ fn mint_instance<T: Config<I>, I: 'static>(
fn add_instance_metadata<T: Config<I>, I: 'static>(
instance: T::InstanceId,
) -> (T::AccountId, <T::Lookup as StaticLookup>::Source) {
let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().owner;
if caller != whitelisted_caller() {
whitelist_account!(caller);
}
let caller_lookup = T::Lookup::unlookup(caller.clone());
assert!(Uniques::<T, I>::set_metadata(
SystemOrigin::Signed(caller.clone()).into(),
Default::default(),
T::Helper::class(0),
instance,
vec![0; T::StringLimit::get() as usize].try_into().unwrap(),
false,
Expand All @@ -109,15 +109,15 @@ fn add_instance_metadata<T: Config<I>, I: 'static>(
fn add_instance_attribute<T: Config<I>, I: 'static>(
instance: T::InstanceId,
) -> (BoundedVec<u8, T::KeyLimit>, T::AccountId, <T::Lookup as StaticLookup>::Source) {
let caller = Class::<T, I>::get(T::ClassId::default()).unwrap().owner;
let caller = Class::<T, I>::get(T::Helper::class(0)).unwrap().owner;
if caller != whitelisted_caller() {
whitelist_account!(caller);
}
let caller_lookup = T::Lookup::unlookup(caller.clone());
let key: BoundedVec<_, _> = vec![0; T::KeyLimit::get() as usize].try_into().unwrap();
assert!(Uniques::<T, I>::set_attribute(
SystemOrigin::Signed(caller.clone()).into(),
Default::default(),
T::Helper::class(0),
Some(instance),
key.clone(),
vec![0; T::ValueLimit::get() as usize].try_into().unwrap(),
Expand All @@ -139,17 +139,17 @@ benchmarks_instance_pallet! {
let caller: T::AccountId = whitelisted_caller();
let caller_lookup = T::Lookup::unlookup(caller.clone());
T::Currency::make_free_balance_be(&caller, DepositBalanceOf::<T, I>::max_value());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup)
}: _(SystemOrigin::Signed(caller.clone()), T::Helper::class(0), caller_lookup)
verify {
assert_last_event::<T, I>(Event::Created { class: Default::default(), creator: caller.clone(), owner: caller }.into());
assert_last_event::<T, I>(Event::Created { class: T::Helper::class(0), creator: caller.clone(), owner: caller }.into());
}

force_create {
let caller: T::AccountId = whitelisted_caller();
let caller_lookup = T::Lookup::unlookup(caller.clone());
}: _(SystemOrigin::Root, Default::default(), caller_lookup, true)
}: _(SystemOrigin::Root, T::Helper::class(0), caller_lookup, true)
verify {
assert_last_event::<T, I>(Event::ForceCreated { class: Default::default(), owner: caller }.into());
assert_last_event::<T, I>(Event::ForceCreated { class: T::Helper::class(0), owner: caller }.into());
}

destroy {
Expand All @@ -163,10 +163,10 @@ benchmarks_instance_pallet! {
mint_instance::<T, I>(i as u16);
}
for i in 0..m {
add_instance_metadata::<T, I>((i as u16).into());
add_instance_metadata::<T, I>(T::Helper::instance(i as u16));
}
for i in 0..a {
add_instance_attribute::<T, I>((i as u16).into());
add_instance_attribute::<T, I>(T::Helper::instance(i as u16));
}
let witness = Class::<T, I>::get(class).unwrap().destroy_witness();
}: _(SystemOrigin::Signed(caller), class, witness)
Expand All @@ -176,7 +176,7 @@ benchmarks_instance_pallet! {

mint {
let (class, caller, caller_lookup) = create_class::<T, I>();
let instance = Default::default();
let instance = T::Helper::instance(0);
}: _(SystemOrigin::Signed(caller.clone()), class, instance, caller_lookup)
verify {
assert_last_event::<T, I>(Event::Issued { class, instance, owner: caller }.into());
Expand All @@ -192,7 +192,7 @@ benchmarks_instance_pallet! {

transfer {
let (class, caller, caller_lookup) = create_class::<T, I>();
let (instance, ..) = mint_instance::<T, I>(Default::default());
let (instance, ..) = mint_instance::<T, I>(0);

let target: T::AccountId = account("target", 0, SEED);
let target_lookup = T::Lookup::unlookup(target.clone());
Expand Down Expand Up @@ -222,15 +222,15 @@ benchmarks_instance_pallet! {

freeze {
let (class, caller, caller_lookup) = create_class::<T, I>();
let (instance, ..) = mint_instance::<T, I>(Default::default());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), Default::default())
let (instance, ..) = mint_instance::<T, I>(0);
}: _(SystemOrigin::Signed(caller.clone()), T::Helper::class(0), T::Helper::instance(0))
verify {
assert_last_event::<T, I>(Event::Frozen { class: Default::default(), instance: Default::default() }.into());
assert_last_event::<T, I>(Event::Frozen { class: T::Helper::class(0), instance: T::Helper::instance(0) }.into());
}

thaw {
let (class, caller, caller_lookup) = create_class::<T, I>();
let (instance, ..) = mint_instance::<T, I>(Default::default());
let (instance, ..) = mint_instance::<T, I>(0);
Uniques::<T, I>::freeze(
SystemOrigin::Signed(caller.clone()).into(),
class,
Expand Down Expand Up @@ -272,7 +272,7 @@ benchmarks_instance_pallet! {
let target0 = T::Lookup::unlookup(account("target", 0, SEED));
let target1 = T::Lookup::unlookup(account("target", 1, SEED));
let target2 = T::Lookup::unlookup(account("target", 2, SEED));
}: _(SystemOrigin::Signed(caller), Default::default(), target0.clone(), target1.clone(), target2.clone())
}: _(SystemOrigin::Signed(caller), class, target0.clone(), target1.clone(), target2.clone())
verify {
assert_last_event::<T, I>(Event::TeamChanged{
class,
Expand Down
Loading