Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Rename Statemint where appropriate #4087

Merged
merged 2 commits into from
Oct 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions runtime/kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1328,9 +1328,9 @@ pub type XcmRouter = (

parameter_types! {
pub const Kusama: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete(KsmLocation::get()) });
pub const KusamaForStatemint: (MultiAssetFilter, MultiLocation) = (Kusama::get(), Parachain(1000).into());
pub const KusamaForStatemine: (MultiAssetFilter, MultiLocation) = (Kusama::get(), Parachain(1000).into());
}
pub type TrustedTeleporters = (xcm_builder::Case<KusamaForStatemint>,);
pub type TrustedTeleporters = (xcm_builder::Case<KusamaForStatemine>,);

/// The barriers one of which must be passed for an XCM message to be executed.
pub type Barrier = (
Expand Down
4 changes: 2 additions & 2 deletions runtime/rococo/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -644,15 +644,15 @@ parameter_types! {
pub const RococoForTick: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(100).into());
pub const RococoForTrick: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(110).into());
pub const RococoForTrack: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(120).into());
pub const RococoForStatemint: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(1001).into());
pub const RococoForRockmint: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(1001).into());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pub const RococoForRockmint: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(1001).into());
pub const RococoForRockmine: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(1001).into());

Your petition to name it Rockmine was heard :-D
Also: shouldn't it be Parachain 1000? @shawntabrizi do you remember why it was set to 1001 here?

pub const RococoForCanvas: (MultiAssetFilter, MultiLocation) = (Rococo::get(), Parachain(1002).into());
pub const MaxInstructions: u32 = 100;
}
pub type TrustedTeleporters = (
xcm_builder::Case<RococoForTick>,
xcm_builder::Case<RococoForTrick>,
xcm_builder::Case<RococoForTrack>,
xcm_builder::Case<RococoForStatemint>,
xcm_builder::Case<RococoForRockmint>,
KiChjang marked this conversation as resolved.
Show resolved Hide resolved
xcm_builder::Case<RococoForCanvas>,
);

Expand Down
4 changes: 2 additions & 2 deletions xcm/xcm-builder/tests/mock/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@ pub type Barrier = (
);

parameter_types! {
pub const KusamaForStatemint: (MultiAssetFilter, MultiLocation) =
pub const KusamaForStatemine: (MultiAssetFilter, MultiLocation) =
(MultiAssetFilter::Wild(WildMultiAsset::AllOf { id: Concrete(MultiLocation::here()), fun: WildFungible }), X1(Parachain(1000)).into());
pub const MaxInstructions: u32 = 100;
}
pub type TrustedTeleporters = (xcm_builder::Case<KusamaForStatemint>,);
pub type TrustedTeleporters = (xcm_builder::Case<KusamaForStatemine>,);

pub struct XcmConfig;
impl xcm_executor::Config for XcmConfig {
Expand Down