Skip to content

Commit

Permalink
fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
claravanstaden authored and claravanstaden committed Oct 27, 2023
1 parent 5e480dd commit 4f5d693
Show file tree
Hide file tree
Showing 6 changed files with 288 additions and 288 deletions.
21 changes: 10 additions & 11 deletions cumulus/pallets/dmp-queue/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ impl Default for ConfigData {
Self {
// For beacon checkpoint to work require a bigger default
max_individual: Weight::from_parts(
20u64 * 10u64 * WEIGHT_REF_TIME_PER_MILLIS, // 200 ms of execution time maximum by default
10u64 * DEFAULT_POV_SIZE, // 640 KB of proof size by default
20u64 * 10u64 * WEIGHT_REF_TIME_PER_MILLIS, /* 200 ms of execution time maximum
* by default */
10u64 * DEFAULT_POV_SIZE, // 640 KB of proof size by default
),
}
}
Expand Down Expand Up @@ -231,7 +232,7 @@ pub mod pallet {
if *messages_processed >= MAX_MESSAGES_PER_BLOCK {
// Exceeded block message limit - put the remaining messages back and bail
Pages::<T>::insert(page_index.begin_used, &page[i..]);
return used;
return used
}
*messages_processed += 1;
match Self::try_service_message(limit.saturating_sub(used), sent_at, &data[..])
Expand All @@ -240,7 +241,7 @@ pub mod pallet {
Err(..) => {
// Too much weight needed - put the remaining messages back and bail
Pages::<T>::insert(page_index.begin_used, &page[i..]);
return used;
return used
},
}
}
Expand Down Expand Up @@ -289,9 +290,8 @@ pub mod pallet {
Weight::zero(),
);
match outcome {
Outcome::Error(XcmError::WeightLimitReached(required_weight)) => {
Err(ServiceMessageError { message_hash, message_id, required_weight })
},
Outcome::Error(XcmError::WeightLimitReached(required_weight)) =>
Err(ServiceMessageError { message_hash, message_id, required_weight }),
outcome => {
let weight_used = outcome.weight_used();
Self::deposit_event(Event::ExecutedDownward {
Expand Down Expand Up @@ -372,7 +372,7 @@ pub mod pallet {
// Not needed for control flow, but only to ensure that the
// compiler understands that we won't attempt to re-use `data`
// later.
continue;
continue
} else {
// not overweight. stop executing inline and enqueue normally
// from here on.
Expand Down Expand Up @@ -519,9 +519,8 @@ mod tests {
) -> Outcome {
let message = prepared.0;
let o = match (message.0.len(), &message.0.first()) {
(1, Some(Transact { require_weight_at_most, .. })) => {
Outcome::Complete(*require_weight_at_most)
},
(1, Some(Transact { require_weight_at_most, .. })) =>
Outcome::Complete(*require_weight_at_most),
// use 1000 to decide that it's not supported.
_ => Outcome::Incomplete(Weight::from_parts(1, 1), XcmError::Unimplemented),
};
Expand Down
149 changes: 74 additions & 75 deletions cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,98 +491,97 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
ProxyType::Any => true,
ProxyType::NonTransfer => !matches!(
c,
RuntimeCall::Balances { .. }
| RuntimeCall::Assets { .. }
| RuntimeCall::NftFractionalization { .. }
| RuntimeCall::Nfts { .. }
| RuntimeCall::Uniques { .. }
RuntimeCall::Balances { .. } |
RuntimeCall::Assets { .. } |
RuntimeCall::NftFractionalization { .. } |
RuntimeCall::Nfts { .. } |
RuntimeCall::Uniques { .. }
),
ProxyType::CancelProxy => matches!(
c,
RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. })
| RuntimeCall::Utility { .. }
| RuntimeCall::Multisig { .. }
RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }) |
RuntimeCall::Utility { .. } |
RuntimeCall::Multisig { .. }
),
ProxyType::Assets => {
matches!(
c,
RuntimeCall::Assets { .. }
| RuntimeCall::Utility { .. }
| RuntimeCall::Multisig { .. }
| RuntimeCall::NftFractionalization { .. }
| RuntimeCall::Nfts { .. }
| RuntimeCall::Uniques { .. }
RuntimeCall::Assets { .. } |
RuntimeCall::Utility { .. } |
RuntimeCall::Multisig { .. } |
RuntimeCall::NftFractionalization { .. } |
RuntimeCall::Nfts { .. } | RuntimeCall::Uniques { .. }
)
},
ProxyType::AssetOwner => matches!(
c,
RuntimeCall::Assets(TrustBackedAssetsCall::create { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::start_destroy { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::destroy_accounts { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::destroy_approvals { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::finish_destroy { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::transfer_ownership { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::set_team { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::set_metadata { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::clear_metadata { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::set_min_balance { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::create { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::destroy { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::redeposit { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::transfer_ownership { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::set_team { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::set_collection_max_supply { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::lock_collection { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::create { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::destroy { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::transfer_ownership { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::set_team { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::set_metadata { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::set_attribute { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::set_collection_metadata { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::clear_metadata { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::clear_attribute { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::clear_collection_metadata { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::set_collection_max_supply { .. })
| RuntimeCall::Utility { .. }
| RuntimeCall::Multisig { .. }
RuntimeCall::Assets(TrustBackedAssetsCall::create { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::start_destroy { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::destroy_accounts { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::destroy_approvals { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::finish_destroy { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::transfer_ownership { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::set_team { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::set_metadata { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::clear_metadata { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::set_min_balance { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::create { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::destroy { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::redeposit { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::transfer_ownership { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::set_team { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::set_collection_max_supply { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::lock_collection { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::create { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::destroy { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::transfer_ownership { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::set_team { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::set_metadata { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::set_attribute { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::set_collection_metadata { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::clear_metadata { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::clear_attribute { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::clear_collection_metadata { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::set_collection_max_supply { .. }) |
RuntimeCall::Utility { .. } |
RuntimeCall::Multisig { .. }
),
ProxyType::AssetManager => matches!(
c,
RuntimeCall::Assets(TrustBackedAssetsCall::mint { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::burn { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::freeze { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::block { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::thaw { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::freeze_asset { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::thaw_asset { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::touch_other { .. })
| RuntimeCall::Assets(TrustBackedAssetsCall::refund_other { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::force_mint { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::update_mint_settings { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::mint_pre_signed { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::set_attributes_pre_signed { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::lock_item_transfer { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::unlock_item_transfer { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::lock_item_properties { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::set_metadata { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::clear_metadata { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::set_collection_metadata { .. })
| RuntimeCall::Nfts(pallet_nfts::Call::clear_collection_metadata { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::mint { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::burn { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::freeze { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::thaw { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::freeze_collection { .. })
| RuntimeCall::Uniques(pallet_uniques::Call::thaw_collection { .. })
| RuntimeCall::Utility { .. }
| RuntimeCall::Multisig { .. }
RuntimeCall::Assets(TrustBackedAssetsCall::mint { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::burn { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::freeze { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::block { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::thaw { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::freeze_asset { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::thaw_asset { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::touch_other { .. }) |
RuntimeCall::Assets(TrustBackedAssetsCall::refund_other { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::force_mint { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::update_mint_settings { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::mint_pre_signed { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::set_attributes_pre_signed { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::lock_item_transfer { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::unlock_item_transfer { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::lock_item_properties { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::set_metadata { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::clear_metadata { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::set_collection_metadata { .. }) |
RuntimeCall::Nfts(pallet_nfts::Call::clear_collection_metadata { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::mint { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::burn { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::freeze { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::thaw { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::freeze_collection { .. }) |
RuntimeCall::Uniques(pallet_uniques::Call::thaw_collection { .. }) |
RuntimeCall::Utility { .. } |
RuntimeCall::Multisig { .. }
),
ProxyType::Collator => matches!(
c,
RuntimeCall::CollatorSelection { .. }
| RuntimeCall::Utility { .. }
| RuntimeCall::Multisig { .. }
RuntimeCall::CollatorSelection { .. } |
RuntimeCall::Utility { .. } |
RuntimeCall::Multisig { .. }
),
}
}
Expand Down
Loading

0 comments on commit 4f5d693

Please sign in to comment.