difftreelog
fix(build) use default-members instead of exclude
in: master
2 files changed
Cargo.tomldiffbeforeafterboth6 'client/*',6 'client/*',7 'primitives/*',7 'primitives/*',8 'crates/*',8 'crates/*',9 'runtime/opal',10 'runtime/quartz',11 'runtime/unique',9 'runtime/tests',12 'runtime/tests',10]13]11exclude = ["runtime/unique", "runtime/quartz"]14default-members = ['node/*', 'runtime/opal']12[profile.release]15[profile.release]13panic = 'unwind'16panic = 'unwind'1417runtime/common/config/xcm.rsdiffbeforeafterboth--- a/runtime/common/config/xcm.rs
+++ b/runtime/common/config/xcm.rs
@@ -33,8 +33,7 @@
use xcm::latest::{
AssetId::{Concrete},
Fungibility::Fungible as XcmFungible,
- MultiAsset, Error as XcmError,
- Instruction, Xcm,
+ MultiAsset, Error as XcmError, Instruction, Xcm,
};
use xcm_builder::{
AccountId32Aliases, AllowTopLevelPaidExecutionFrom, CurrencyAdapter, EnsureXcmOrigin,
@@ -181,7 +180,9 @@
_max_weight: Weight,
_weight_credit: &mut Weight,
) -> Result<(), ()> {
- let transact_inst = message.0.iter()
+ let transact_inst = message
+ .0
+ .iter()
.find(|inst| matches![inst, Instruction::Transact { .. }]);
match transact_inst {
@@ -192,8 +193,8 @@
);
Err(())
- },
- None => Ok(())
+ }
+ None => Ok(()),
}
}
}
@@ -201,24 +202,24 @@
/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.
/// If it passes the Deny, and matches one of the Allow cases then it is let through.
pub struct DenyThenTry<Deny, Allow>(PhantomData<Deny>, PhantomData<Allow>)
- where
- Deny: ShouldExecute,
- Allow: ShouldExecute;
+where
+ Deny: ShouldExecute,
+ Allow: ShouldExecute;
impl<Deny, Allow> ShouldExecute for DenyThenTry<Deny, Allow>
- where
- Deny: ShouldExecute,
- Allow: ShouldExecute,
+where
+ Deny: ShouldExecute,
+ Allow: ShouldExecute,
{
- fn should_execute<Call>(
- origin: &MultiLocation,
- message: &mut Xcm<Call>,
- max_weight: Weight,
- weight_credit: &mut Weight,
- ) -> Result<(), ()> {
- Deny::should_execute(origin, message, max_weight, weight_credit)?;
- Allow::should_execute(origin, message, max_weight, weight_credit)
- }
+ fn should_execute<Call>(
+ origin: &MultiLocation,
+ message: &mut Xcm<Call>,
+ max_weight: Weight,
+ weight_credit: &mut Weight,
+ ) -> Result<(), ()> {
+ Deny::should_execute(origin, message, max_weight, weight_credit)?;
+ Allow::should_execute(origin, message, max_weight, weight_credit)
+ }
}
pub struct UsingOnlySelfCurrencyComponents<