mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-16 16:41:10 +00:00
Replace T::AccountId with <T::Lookup as StaticLookup>::Source (#11670)
* initial * update * update * update * cargo fmt * update * update benchmarks * AccountIdLookupOf<T> * cargo fmt * fix conflits * cargo fmt * update Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
@@ -33,11 +33,15 @@ fn assert_last_event<T: Config<I>, I: 'static>(generic_event: <T as Config<I>>::
|
||||
|
||||
fn make_member<T: Config<I>, I: 'static>(rank: Rank) -> T::AccountId {
|
||||
let who = account::<T::AccountId>("member", MemberCount::<T, I>::get(0), SEED);
|
||||
assert_ok!(Pallet::<T, I>::add_member(T::PromoteOrigin::successful_origin(), who.clone()));
|
||||
let who_lookup = T::Lookup::unlookup(who.clone());
|
||||
assert_ok!(Pallet::<T, I>::add_member(
|
||||
T::PromoteOrigin::successful_origin(),
|
||||
who_lookup.clone()
|
||||
));
|
||||
for _ in 0..rank {
|
||||
assert_ok!(Pallet::<T, I>::promote_member(
|
||||
T::PromoteOrigin::successful_origin(),
|
||||
who.clone()
|
||||
who_lookup.clone()
|
||||
));
|
||||
}
|
||||
who
|
||||
@@ -46,8 +50,9 @@ fn make_member<T: Config<I>, I: 'static>(rank: Rank) -> T::AccountId {
|
||||
benchmarks_instance_pallet! {
|
||||
add_member {
|
||||
let who = account::<T::AccountId>("member", 0, SEED);
|
||||
let who_lookup = T::Lookup::unlookup(who.clone());
|
||||
let origin = T::PromoteOrigin::successful_origin();
|
||||
let call = Call::<T, I>::add_member { who: who.clone() };
|
||||
let call = Call::<T, I>::add_member { who: who_lookup };
|
||||
}: { call.dispatch_bypass_filter(origin)? }
|
||||
verify {
|
||||
assert_eq!(MemberCount::<T, I>::get(0), 1);
|
||||
@@ -59,10 +64,11 @@ benchmarks_instance_pallet! {
|
||||
let rank = r as u16;
|
||||
let first = make_member::<T, I>(rank);
|
||||
let who = make_member::<T, I>(rank);
|
||||
let who_lookup = T::Lookup::unlookup(who.clone());
|
||||
let last = make_member::<T, I>(rank);
|
||||
let last_index = (0..=rank).map(|r| IdToIndex::<T, I>::get(r, &last).unwrap()).collect::<Vec<_>>();
|
||||
let origin = T::DemoteOrigin::successful_origin();
|
||||
let call = Call::<T, I>::remove_member { who: who.clone(), min_rank: rank };
|
||||
let call = Call::<T, I>::remove_member { who: who_lookup, min_rank: rank };
|
||||
}: { call.dispatch_bypass_filter(origin)? }
|
||||
verify {
|
||||
for r in 0..=rank {
|
||||
@@ -76,8 +82,9 @@ benchmarks_instance_pallet! {
|
||||
let r in 0 .. 10;
|
||||
let rank = r as u16;
|
||||
let who = make_member::<T, I>(rank);
|
||||
let who_lookup = T::Lookup::unlookup(who.clone());
|
||||
let origin = T::PromoteOrigin::successful_origin();
|
||||
let call = Call::<T, I>::promote_member { who: who.clone() };
|
||||
let call = Call::<T, I>::promote_member { who: who_lookup };
|
||||
}: { call.dispatch_bypass_filter(origin)? }
|
||||
verify {
|
||||
assert_eq!(Members::<T, I>::get(&who).unwrap().rank, rank + 1);
|
||||
@@ -89,10 +96,11 @@ benchmarks_instance_pallet! {
|
||||
let rank = r as u16;
|
||||
let first = make_member::<T, I>(rank);
|
||||
let who = make_member::<T, I>(rank);
|
||||
let who_lookup = T::Lookup::unlookup(who.clone());
|
||||
let last = make_member::<T, I>(rank);
|
||||
let last_index = IdToIndex::<T, I>::get(rank, &last).unwrap();
|
||||
let origin = T::DemoteOrigin::successful_origin();
|
||||
let call = Call::<T, I>::demote_member { who: who.clone() };
|
||||
let call = Call::<T, I>::demote_member { who: who_lookup };
|
||||
}: { call.dispatch_bypass_filter(origin)? }
|
||||
verify {
|
||||
assert_eq!(Members::<T, I>::get(&who).map(|x| x.rank), rank.checked_sub(1));
|
||||
@@ -106,14 +114,15 @@ benchmarks_instance_pallet! {
|
||||
|
||||
vote {
|
||||
let caller: T::AccountId = whitelisted_caller();
|
||||
assert_ok!(Pallet::<T, I>::add_member(T::PromoteOrigin::successful_origin(), caller.clone()));
|
||||
let caller_lookup = T::Lookup::unlookup(caller.clone());
|
||||
assert_ok!(Pallet::<T, I>::add_member(T::PromoteOrigin::successful_origin(), caller_lookup.clone()));
|
||||
// Create a poll
|
||||
let class = T::Polls::classes().into_iter().next().unwrap();
|
||||
let rank = T::MinRankOfClass::convert(class.clone());
|
||||
for _ in 0..rank {
|
||||
assert_ok!(Pallet::<T, I>::promote_member(
|
||||
T::PromoteOrigin::successful_origin(),
|
||||
caller.clone()
|
||||
caller_lookup.clone()
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user