Skip to content
GitLab
Unverified Commit 1cab7d3a authored by Shawn Tabrizi's avatar Shawn Tabrizi Committed by GitHub
Browse files

fix polkadot (#3598)

parent 292ba8a7
Pipeline #151826 passed with stages
in 44 minutes and 43 seconds
Hide whitespace changes
Inline Side-by-side
runtime/test-runtime/src/lib.rs
View file @ 1cab7d3a
...@@ -35,7 +35,10 @@ use polkadot_runtime_parachains::{ ...@@ -35,7 +35,10 @@ use polkadot_runtime_parachains::{
use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
use beefy_primitives::crypto::AuthorityId as BeefyId; use beefy_primitives::crypto::AuthorityId as BeefyId;
use frame_support::{construct_runtime, parameter_types, traits::KeyOwnerProofSystem}; use frame_support::{
construct_runtime, parameter_types,
traits::{Everything, KeyOwnerProofSystem},
};
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId}; use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
use pallet_mmr_primitives as mmr; use pallet_mmr_primitives as mmr;
use pallet_session::historical as session_historical; use pallet_session::historical as session_historical;
...@@ -505,13 +508,10 @@ impl pallet_xcm::Config for Runtime { ...@@ -505,13 +508,10 @@ impl pallet_xcm::Config for Runtime {
type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<Origin, LocalOriginToLocation>; type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<Origin, LocalOriginToLocation>;
type Weigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, Call>; type Weigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, Call>;
type XcmRouter = xcm_config::DoNothingRouter; type XcmRouter = xcm_config::DoNothingRouter;
type XcmExecuteFilter = type XcmExecuteFilter = Everything;
frame_support::traits::All<(xcm::latest::MultiLocation, xcm::latest::Xcm<Call>)>;
type XcmExecutor = xcm_executor::XcmExecutor<xcm_config::XcmConfig>; type XcmExecutor = xcm_executor::XcmExecutor<xcm_config::XcmConfig>;
type XcmTeleportFilter = type XcmTeleportFilter = Everything;
frame_support::traits::All<(xcm::latest::MultiLocation, Vec<xcm::latest::MultiAsset>)>; type XcmReserveTransferFilter = Everything;
type XcmReserveTransferFilter =
frame_support::traits::All<(xcm::latest::MultiLocation, Vec<xcm::latest::MultiAsset>)>;
} }
impl parachains_hrmp::Config for Runtime { impl parachains_hrmp::Config for Runtime {
......
runtime/test-runtime/src/xcm_config.rs
View file @ 1cab7d3a
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>. // along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use frame_support::{parameter_types, traits::All, weights::Weight}; use frame_support::{parameter_types, traits::Everything, weights::Weight};
use xcm::latest::{ use xcm::latest::{
Error as XcmError, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId, Error as XcmError, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId,
Result as XcmResult, SendXcm, Xcm, Result as XcmResult, SendXcm, Xcm,
...@@ -43,7 +43,7 @@ impl SendXcm for DoNothingRouter { ...@@ -43,7 +43,7 @@ impl SendXcm for DoNothingRouter {
} }
} }
pub type Barrier = AllowUnpaidExecutionFrom<All<MultiLocation>>; pub type Barrier = AllowUnpaidExecutionFrom<Everything>;
pub struct DummyAssetTransactor; pub struct DummyAssetTransactor;
impl TransactAsset for DummyAssetTransactor { impl TransactAsset for DummyAssetTransactor {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment