Dedupe some code and companion for #8589 (#2873)

* Dedupe some code and companion for #8589

* Bump Substrate
This commit is contained in:
Gavin Wood
2021-04-11 14:22:45 +02:00
committed by GitHub
parent 025200fb25
commit 359ade2b89
3 changed files with 151 additions and 166 deletions
+1 -6
View File
@@ -26,7 +26,7 @@ pub use frame_support::{
dispatch::{Dispatchable, Parameter, Weight, DispatchError, DispatchResultWithPostInfo, DispatchInfo},
weights::{PostDispatchInfo, GetDispatchInfo},
sp_runtime::DispatchErrorWithPostInfo,
traits::{Get, Contains},
traits::{Get, Contains, IsInVec},
};
pub use xcm_executor::{
Assets, Config, traits::{TransactAsset, ConvertOrigin, FilterAssetLocation, InvertLocation, OnResponse}
@@ -254,11 +254,6 @@ parameter_types! {
pub static WeightPrice: (MultiLocation, u128) = (Null, 1_000_000_000_000);
}
pub struct IsInVec<T>(PhantomData<T>);
impl<X: Ord + PartialOrd, T: Get<Vec<X>>> Contains<X> for IsInVec<T> {
fn sorted_members() -> Vec<X> { let mut r = T::get(); r.sort(); r }
}
pub type TestBarrier = (
TakeWeightCredit,
AllowKnownQueryResponses<TestResponseHandler>,