mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 14:41:11 +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:
@@ -46,7 +46,7 @@ benchmarks_instance_pallet! {
|
||||
// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account,
|
||||
// and reap this user.
|
||||
let recipient: T::AccountId = account("recipient", 0, SEED);
|
||||
let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
|
||||
let recipient_lookup = T::Lookup::unlookup(recipient.clone());
|
||||
let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
|
||||
}: transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount)
|
||||
verify {
|
||||
@@ -60,7 +60,7 @@ benchmarks_instance_pallet! {
|
||||
transfer_best_case {
|
||||
let caller = whitelisted_caller();
|
||||
let recipient: T::AccountId = account("recipient", 0, SEED);
|
||||
let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
|
||||
let recipient_lookup = T::Lookup::unlookup(recipient.clone());
|
||||
|
||||
// Give the sender account max funds for transfer (their account will never reasonably be killed).
|
||||
let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, T::Balance::max_value());
|
||||
@@ -80,7 +80,7 @@ benchmarks_instance_pallet! {
|
||||
transfer_keep_alive {
|
||||
let caller = whitelisted_caller();
|
||||
let recipient: T::AccountId = account("recipient", 0, SEED);
|
||||
let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
|
||||
let recipient_lookup = T::Lookup::unlookup(recipient.clone());
|
||||
|
||||
// Give the sender account max funds, thus a transfer will not kill account.
|
||||
let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&caller, T::Balance::max_value());
|
||||
@@ -95,7 +95,7 @@ benchmarks_instance_pallet! {
|
||||
// Benchmark `set_balance` coming from ROOT account. This always creates an account.
|
||||
set_balance_creating {
|
||||
let user: T::AccountId = account("user", 0, SEED);
|
||||
let user_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(user.clone());
|
||||
let user_lookup = T::Lookup::unlookup(user.clone());
|
||||
|
||||
// Give the user some initial balance.
|
||||
let existential_deposit = T::ExistentialDeposit::get();
|
||||
@@ -110,7 +110,7 @@ benchmarks_instance_pallet! {
|
||||
// Benchmark `set_balance` coming from ROOT account. This always kills an account.
|
||||
set_balance_killing {
|
||||
let user: T::AccountId = account("user", 0, SEED);
|
||||
let user_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(user.clone());
|
||||
let user_lookup = T::Lookup::unlookup(user.clone());
|
||||
|
||||
// Give the user some initial balance.
|
||||
let existential_deposit = T::ExistentialDeposit::get();
|
||||
@@ -127,7 +127,7 @@ benchmarks_instance_pallet! {
|
||||
force_transfer {
|
||||
let existential_deposit = T::ExistentialDeposit::get();
|
||||
let source: T::AccountId = account("source", 0, SEED);
|
||||
let source_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(source.clone());
|
||||
let source_lookup = T::Lookup::unlookup(source.clone());
|
||||
|
||||
// Give some multiple of the existential deposit
|
||||
let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
|
||||
@@ -135,7 +135,7 @@ benchmarks_instance_pallet! {
|
||||
|
||||
// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account, and reap this user.
|
||||
let recipient: T::AccountId = account("recipient", 0, SEED);
|
||||
let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
|
||||
let recipient_lookup = T::Lookup::unlookup(recipient.clone());
|
||||
let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
|
||||
}: force_transfer(RawOrigin::Root, source_lookup, recipient_lookup, transfer_amount)
|
||||
verify {
|
||||
@@ -160,7 +160,7 @@ benchmarks_instance_pallet! {
|
||||
// Transfer `e - 1` existential deposits + 1 unit, which guarantees to create one account,
|
||||
// and reap this user.
|
||||
let recipient: T::AccountId = account("recipient", 0, SEED);
|
||||
let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
|
||||
let recipient_lookup = T::Lookup::unlookup(recipient.clone());
|
||||
let transfer_amount = existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
|
||||
|
||||
// Create a bunch of users in storage.
|
||||
@@ -182,7 +182,7 @@ benchmarks_instance_pallet! {
|
||||
transfer_all {
|
||||
let caller = whitelisted_caller();
|
||||
let recipient: T::AccountId = account("recipient", 0, SEED);
|
||||
let recipient_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(recipient.clone());
|
||||
let recipient_lookup = T::Lookup::unlookup(recipient.clone());
|
||||
|
||||
// Give some multiple of the existential deposit
|
||||
let existential_deposit = T::ExistentialDeposit::get();
|
||||
@@ -196,7 +196,7 @@ benchmarks_instance_pallet! {
|
||||
|
||||
force_unreserve {
|
||||
let user: T::AccountId = account("user", 0, SEED);
|
||||
let user_lookup: <T::Lookup as StaticLookup>::Source = T::Lookup::unlookup(user.clone());
|
||||
let user_lookup = T::Lookup::unlookup(user.clone());
|
||||
|
||||
// Give some multiple of the existential deposit
|
||||
let existential_deposit = T::ExistentialDeposit::get();
|
||||
|
||||
@@ -192,6 +192,8 @@ pub use weights::WeightInfo;
|
||||
|
||||
pub use pallet::*;
|
||||
|
||||
type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
|
||||
|
||||
#[frame_support::pallet]
|
||||
pub mod pallet {
|
||||
use super::*;
|
||||
@@ -275,7 +277,7 @@ pub mod pallet {
|
||||
#[pallet::weight(T::WeightInfo::transfer())]
|
||||
pub fn transfer(
|
||||
origin: OriginFor<T>,
|
||||
dest: <T::Lookup as StaticLookup>::Source,
|
||||
dest: AccountIdLookupOf<T>,
|
||||
#[pallet::compact] value: T::Balance,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
let transactor = ensure_signed(origin)?;
|
||||
@@ -303,7 +305,7 @@ pub mod pallet {
|
||||
)]
|
||||
pub fn set_balance(
|
||||
origin: OriginFor<T>,
|
||||
who: <T::Lookup as StaticLookup>::Source,
|
||||
who: AccountIdLookupOf<T>,
|
||||
#[pallet::compact] new_free: T::Balance,
|
||||
#[pallet::compact] new_reserved: T::Balance,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
@@ -353,8 +355,8 @@ pub mod pallet {
|
||||
#[pallet::weight(T::WeightInfo::force_transfer())]
|
||||
pub fn force_transfer(
|
||||
origin: OriginFor<T>,
|
||||
source: <T::Lookup as StaticLookup>::Source,
|
||||
dest: <T::Lookup as StaticLookup>::Source,
|
||||
source: AccountIdLookupOf<T>,
|
||||
dest: AccountIdLookupOf<T>,
|
||||
#[pallet::compact] value: T::Balance,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
ensure_root(origin)?;
|
||||
@@ -378,7 +380,7 @@ pub mod pallet {
|
||||
#[pallet::weight(T::WeightInfo::transfer_keep_alive())]
|
||||
pub fn transfer_keep_alive(
|
||||
origin: OriginFor<T>,
|
||||
dest: <T::Lookup as StaticLookup>::Source,
|
||||
dest: AccountIdLookupOf<T>,
|
||||
#[pallet::compact] value: T::Balance,
|
||||
) -> DispatchResultWithPostInfo {
|
||||
let transactor = ensure_signed(origin)?;
|
||||
@@ -407,7 +409,7 @@ pub mod pallet {
|
||||
#[pallet::weight(T::WeightInfo::transfer_all())]
|
||||
pub fn transfer_all(
|
||||
origin: OriginFor<T>,
|
||||
dest: <T::Lookup as StaticLookup>::Source,
|
||||
dest: AccountIdLookupOf<T>,
|
||||
keep_alive: bool,
|
||||
) -> DispatchResult {
|
||||
use fungible::Inspect;
|
||||
@@ -425,7 +427,7 @@ pub mod pallet {
|
||||
#[pallet::weight(T::WeightInfo::force_unreserve())]
|
||||
pub fn force_unreserve(
|
||||
origin: OriginFor<T>,
|
||||
who: <T::Lookup as StaticLookup>::Source,
|
||||
who: AccountIdLookupOf<T>,
|
||||
amount: T::Balance,
|
||||
) -> DispatchResult {
|
||||
ensure_root(origin)?;
|
||||
|
||||
Reference in New Issue
Block a user