Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions bin/node/executor/tests/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -624,20 +624,20 @@ fn deploying_wasm_contract_should_work() {
pallet_contracts::Call::instantiate_with_code::<Runtime>(
1000 * DOLLARS + subsistence,
500_000_000,
transfer_code,
Vec::new(),
Vec::new(),
Box::new(transfer_code),
Box::new(Vec::new()),
Box::new(Vec::new()),
)
),
},
CheckedExtrinsic {
signed: Some((charlie(), signed_extra(1, 0))),
function: Call::Contracts(
pallet_contracts::Call::call::<Runtime>(
sp_runtime::MultiAddress::Id(addr.clone()),
Box::new(sp_runtime::MultiAddress::Id(addr.clone())),
10,
500_000_000,
vec![0x00, 0x01, 0x02, 0x03]
Box::new(vec![0x00, 0x01, 0x02, 0x03])
)
),
},
Expand Down
2 changes: 1 addition & 1 deletion bin/node/executor/tests/submit_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fn should_submit_unsigned_transaction() {
validators_len: 0,
};

let call = pallet_im_online::Call::heartbeat(heartbeat_data, signature);
let call = pallet_im_online::Call::heartbeat(Box::new(heartbeat_data), signature);
SubmitTransaction::<Runtime, pallet_im_online::Call<Runtime>>::submit_unsigned_transaction(call.into())
.unwrap();

Expand Down
9 changes: 9 additions & 0 deletions bin/node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1619,4 +1619,13 @@ mod tests {

is_submit_signed_transaction::<Runtime>();
}

#[test]
fn call_size() {
assert!(
core::mem::size_of::<Call>() <= 90,
"size of Call is more than 90: some calls have too big arguments, use Box to reduce the
size of Call",
);
}
}
39 changes: 31 additions & 8 deletions frame/assets/src/benchmarking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,13 @@ benchmarks_instance_pallet! {
let (caller, caller_lookup) = create_default_minted_asset::<T, I>(true, amount);
let target: T::AccountId = account("target", 0, SEED);
let target_lookup = T::Lookup::unlookup(target.clone());
}: _(SystemOrigin::Signed(caller.clone()), Default::default(), caller_lookup, target_lookup, amount)
}: _(
SystemOrigin::Signed(caller.clone()),
Default::default(),
Box::new(caller_lookup),
Box::new(target_lookup),
amount
)
verify {
assert_last_event::<T, I>(
Event::Transferred(Default::default(), caller, target, amount).into()
Expand Down Expand Up @@ -260,7 +266,13 @@ 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),
Default::default(),
Box::new(target0.clone()),
Box::new(target1.clone()),
Box::new(target2.clone())
)
verify {
assert_last_event::<T, I>(Event::TeamChanged(
Default::default(),
Expand Down Expand Up @@ -341,10 +353,10 @@ benchmarks_instance_pallet! {
let origin = T::ForceOrigin::successful_origin();
let call = Call::<T, I>::force_asset_status(
Default::default(),
caller_lookup.clone(),
caller_lookup.clone(),
caller_lookup.clone(),
caller_lookup.clone(),
Box::new(caller_lookup.clone()),
Box::new(caller_lookup.clone()),
Box::new(caller_lookup.clone()),
Box::new(caller_lookup.clone()),
100u32.into(),
true,
false,
Expand Down Expand Up @@ -381,7 +393,13 @@ benchmarks_instance_pallet! {

let dest: T::AccountId = account("dest", 0, SEED);
let dest_lookup = T::Lookup::unlookup(dest.clone());
}: _(SystemOrigin::Signed(delegate.clone()), id, owner_lookup, dest_lookup, amount)
}: _(
SystemOrigin::Signed(delegate.clone()),
id,
Box::new(owner_lookup),
Box::new(dest_lookup),
amount
)
verify {
assert!(T::Currency::reserved_balance(&owner).is_zero());
assert_event::<T, I>(Event::Transferred(id, owner, dest, amount).into());
Expand Down Expand Up @@ -412,7 +430,12 @@ benchmarks_instance_pallet! {
let amount = 100u32.into();
let origin = SystemOrigin::Signed(caller.clone()).into();
Assets::<T, I>::approve_transfer(origin, id, delegate_lookup.clone(), amount)?;
}: _(SystemOrigin::Signed(caller.clone()), id, caller_lookup, delegate_lookup)
}: _(
SystemOrigin::Signed(caller.clone()),
id,
Box::new(caller_lookup),
Box::new(delegate_lookup)
)
verify {
assert_last_event::<T, I>(Event::ApprovalCancelled(id, caller, delegate).into());
}
Expand Down
52 changes: 26 additions & 26 deletions frame/assets/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -681,13 +681,13 @@ pub mod pallet {
pub fn force_transfer(
origin: OriginFor<T>,
#[pallet::compact] id: T::AssetId,
source: <T::Lookup as StaticLookup>::Source,
dest: <T::Lookup as StaticLookup>::Source,
source: Box<<T::Lookup as StaticLookup>::Source>,
dest: Box<<T::Lookup as StaticLookup>::Source>,
#[pallet::compact] amount: T::Balance,
) -> DispatchResult {
let origin = ensure_signed(origin)?;
let source = T::Lookup::lookup(source)?;
let dest = T::Lookup::lookup(dest)?;
let source = T::Lookup::lookup(*source)?;
let dest = T::Lookup::lookup(*dest)?;

let f = TransferFlags {
keep_alive: false,
Expand Down Expand Up @@ -871,14 +871,14 @@ pub mod pallet {
pub fn set_team(
origin: OriginFor<T>,
#[pallet::compact] id: T::AssetId,
issuer: <T::Lookup as StaticLookup>::Source,
admin: <T::Lookup as StaticLookup>::Source,
freezer: <T::Lookup as StaticLookup>::Source,
issuer: Box<<T::Lookup as StaticLookup>::Source>,
admin: Box<<T::Lookup as StaticLookup>::Source>,
freezer: Box<<T::Lookup as StaticLookup>::Source>,
) -> DispatchResult {
let origin = ensure_signed(origin)?;
let issuer = T::Lookup::lookup(issuer)?;
let admin = T::Lookup::lookup(admin)?;
let freezer = T::Lookup::lookup(freezer)?;
let issuer = T::Lookup::lookup(*issuer)?;
let admin = T::Lookup::lookup(*admin)?;
let freezer = T::Lookup::lookup(*freezer)?;

Asset::<T, I>::try_mutate(id, |maybe_details| {
let details = maybe_details.as_mut().ok_or(Error::<T, I>::Unknown)?;
Expand Down Expand Up @@ -1094,10 +1094,10 @@ pub mod pallet {
pub fn force_asset_status(
origin: OriginFor<T>,
#[pallet::compact] id: T::AssetId,
owner: <T::Lookup as StaticLookup>::Source,
issuer: <T::Lookup as StaticLookup>::Source,
admin: <T::Lookup as StaticLookup>::Source,
freezer: <T::Lookup as StaticLookup>::Source,
owner: Box<<T::Lookup as StaticLookup>::Source>,
issuer: Box<<T::Lookup as StaticLookup>::Source>,
admin: Box<<T::Lookup as StaticLookup>::Source>,
freezer: Box<<T::Lookup as StaticLookup>::Source>,
#[pallet::compact] min_balance: T::Balance,
is_sufficient: bool,
is_frozen: bool,
Expand All @@ -1106,10 +1106,10 @@ pub mod pallet {

Asset::<T, I>::try_mutate(id, |maybe_asset| {
let mut asset = maybe_asset.take().ok_or(Error::<T, I>::Unknown)?;
asset.owner = T::Lookup::lookup(owner)?;
asset.issuer = T::Lookup::lookup(issuer)?;
asset.admin = T::Lookup::lookup(admin)?;
asset.freezer = T::Lookup::lookup(freezer)?;
asset.owner = T::Lookup::lookup(*owner)?;
asset.issuer = T::Lookup::lookup(*issuer)?;
asset.admin = T::Lookup::lookup(*admin)?;
asset.freezer = T::Lookup::lookup(*freezer)?;
asset.min_balance = min_balance;
asset.is_sufficient = is_sufficient;
asset.is_frozen = is_frozen;
Expand Down Expand Up @@ -1226,8 +1226,8 @@ pub mod pallet {
pub fn force_cancel_approval(
origin: OriginFor<T>,
#[pallet::compact] id: T::AssetId,
owner: <T::Lookup as StaticLookup>::Source,
delegate: <T::Lookup as StaticLookup>::Source,
owner: Box<<T::Lookup as StaticLookup>::Source>,
delegate: Box<<T::Lookup as StaticLookup>::Source>,
) -> DispatchResult {
let mut d = Asset::<T, I>::get(id).ok_or(Error::<T, I>::Unknown)?;
T::ForceOrigin::try_origin(origin)
Expand All @@ -1238,8 +1238,8 @@ pub mod pallet {
Ok(())
})?;

let owner = T::Lookup::lookup(owner)?;
let delegate = T::Lookup::lookup(delegate)?;
let owner = T::Lookup::lookup(*owner)?;
let delegate = T::Lookup::lookup(*delegate)?;

let approval = Approvals::<T, I>::take((id, &owner, &delegate)).ok_or(Error::<T, I>::Unknown)?;
T::Currency::unreserve(&owner, approval.deposit);
Expand Down Expand Up @@ -1272,13 +1272,13 @@ pub mod pallet {
pub fn transfer_approved(
origin: OriginFor<T>,
#[pallet::compact] id: T::AssetId,
owner: <T::Lookup as StaticLookup>::Source,
destination: <T::Lookup as StaticLookup>::Source,
owner: Box<<T::Lookup as StaticLookup>::Source>,
destination: Box<<T::Lookup as StaticLookup>::Source>,
#[pallet::compact] amount: T::Balance,
) -> DispatchResult {
let delegate = ensure_signed(origin)?;
let owner = T::Lookup::lookup(owner)?;
let destination = T::Lookup::lookup(destination)?;
let owner = T::Lookup::lookup(*owner)?;
let destination = T::Lookup::lookup(*destination)?;

Approvals::<T, I>::try_mutate_exists((id, &owner, delegate), |maybe_approved| -> DispatchResult {
let mut approved = maybe_approved.take().ok_or(Error::<T, I>::Unapproved)?;
Expand Down
Loading