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:
Doordashcon
2022-08-18 10:30:46 +01:00
committed by GitHub
parent 511e5c9651
commit d46f6f0d34
50 changed files with 465 additions and 309 deletions
+19 -9
View File
@@ -106,22 +106,25 @@ benchmarks! {
as_recovered {
let caller: T::AccountId = whitelisted_caller();
let recovered_account: T::AccountId = account("recovered_account", 0, SEED);
let recovered_account_lookup = T::Lookup::unlookup(recovered_account.clone());
let call: <T as Config>::Call = frame_system::Call::<T>::remark { remark: vec![] }.into();
Proxy::<T>::insert(&caller, &recovered_account);
}: _(
RawOrigin::Signed(caller),
recovered_account,
recovered_account_lookup,
Box::new(call)
)
set_recovered {
let lost: T::AccountId = whitelisted_caller();
let lost_lookup = T::Lookup::unlookup(lost.clone());
let rescuer: T::AccountId = whitelisted_caller();
let rescuer_lookup = T::Lookup::unlookup(rescuer.clone());
}: _(
RawOrigin::Root,
lost.clone(),
rescuer.clone()
lost_lookup,
rescuer_lookup
) verify {
assert_last_event::<T>(
Event::AccountRecovered {
@@ -153,11 +156,12 @@ benchmarks! {
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
let lost_account: T::AccountId = account("lost_account", 0, SEED);
let lost_account_lookup = T::Lookup::unlookup(lost_account.clone());
insert_recovery_account::<T>(&caller, &lost_account);
}: _(
RawOrigin::Signed(caller.clone()),
lost_account.clone()
lost_account_lookup
) verify {
assert_last_event::<T>(
Event::RecoveryInitiated {
@@ -172,7 +176,10 @@ benchmarks! {
let caller: T::AccountId = whitelisted_caller();
let lost_account: T::AccountId = account("lost_account", 0, SEED);
let lost_account_lookup = T::Lookup::unlookup(lost_account.clone());
let rescuer_account: T::AccountId = account("rescuer_account", 0, SEED);
let rescuer_account_lookup = T::Lookup::unlookup(rescuer_account.clone());
// Create friends
let friends = add_caller_and_generate_friends::<T>(caller.clone(), n);
@@ -206,8 +213,8 @@ benchmarks! {
}: _(
RawOrigin::Signed(caller.clone()),
lost_account.clone(),
rescuer_account.clone()
lost_account_lookup,
rescuer_account_lookup
) verify {
assert_last_event::<T>(
Event::RecoveryVouched {
@@ -223,6 +230,7 @@ benchmarks! {
let caller: T::AccountId = whitelisted_caller();
let lost_account: T::AccountId = account("lost_account", 0, SEED);
let lost_account_lookup = T::Lookup::unlookup(lost_account.clone());
T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
@@ -257,7 +265,7 @@ benchmarks! {
<ActiveRecoveries<T>>::insert(&lost_account, &caller, recovery_status);
}: _(
RawOrigin::Signed(caller.clone()),
lost_account.clone()
lost_account_lookup
) verify {
assert_last_event::<T>(
Event::AccountRecovered {
@@ -270,6 +278,7 @@ benchmarks! {
close_recovery {
let caller: T::AccountId = whitelisted_caller();
let rescuer_account: T::AccountId = account("rescuer_account", 0, SEED);
let rescuer_account_lookup = T::Lookup::unlookup(rescuer_account.clone());
let n in 1 .. T::MaxFriends::get();
@@ -307,7 +316,7 @@ benchmarks! {
<ActiveRecoveries<T>>::insert(&caller, &rescuer_account, recovery_status);
}: _(
RawOrigin::Signed(caller.clone()),
rescuer_account.clone()
rescuer_account_lookup
) verify {
assert_last_event::<T>(
Event::RecoveryClosed {
@@ -356,6 +365,7 @@ benchmarks! {
cancel_recovered {
let caller: T::AccountId = whitelisted_caller();
let account: T::AccountId = account("account", 0, SEED);
let account_lookup = T::Lookup::unlookup(account.clone());
frame_system::Pallet::<T>::inc_providers(&caller);
@@ -364,7 +374,7 @@ benchmarks! {
Proxy::<T>::insert(&caller, &account);
}: _(
RawOrigin::Signed(caller),
account
account_lookup
)
impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);