Sanitize UniversalLocation witth GlobalConsensus paritytech#4238

shawntabrizi · shawntabrizi · commit 21493b57a995 · 2024-04-28T04:49:26.000-04:00
diff --git a/polkadot/xcm/xcm-simulator/example/src/parachain/xcm_config/constants.rs b/polkadot/xcm/xcm-simulator/example/src/parachain/xcm_config/constants.rs
@@ -26,5 +26,5 @@ parameter_types! {
 parameter_types! {
 	pub const KsmLocation: Location = Location::parent();
 	pub const RelayNetwork: NetworkId = NetworkId::Kusama;
-	pub UniversalLocation: InteriorLocation = Parachain(MsgQueue::parachain_id().into()).into();
+	pub UniversalLocation: InteriorLocation = [GlobalConsensus(RelayNetwork::get()), Parachain(MsgQueue::parachain_id().into())].into();
 }
diff --git a/polkadot/xcm/xcm-simulator/example/src/relay_chain/xcm_config/constants.rs b/polkadot/xcm/xcm-simulator/example/src/relay_chain/xcm_config/constants.rs
@@ -26,6 +26,6 @@ parameter_types! {
 parameter_types! {
 	pub const TokenLocation: Location = Here.into_location();
 	pub RelayNetwork: NetworkId = ByGenesis([0; 32]);
-	pub UniversalLocation: InteriorLocation = Here;
+	pub UniversalLocation: InteriorLocation = RelayNetwork::get().into();
 	pub UnitWeightCost: u64 = 1_000;
 }

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ parameter_types! {`
`26`	`26`	`parameter_types! {`
`27`	`27`	`pub const KsmLocation: Location = Location::parent();`
`28`	`28`	`pub const RelayNetwork: NetworkId = NetworkId::Kusama;`
`29`		`- pub UniversalLocation: InteriorLocation = Parachain(MsgQueue::parachain_id().into()).into();`
	`29`	`+ pub UniversalLocation: InteriorLocation = [GlobalConsensus(RelayNetwork::get()), Parachain(MsgQueue::parachain_id().into())].into();`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,6 @@ parameter_types! {`
`26`	`26`	`parameter_types! {`
`27`	`27`	`pub const TokenLocation: Location = Here.into_location();`
`28`	`28`	`pub RelayNetwork: NetworkId = ByGenesis([0; 32]);`
`29`		`- pub UniversalLocation: InteriorLocation = Here;`
	`29`	`+ pub UniversalLocation: InteriorLocation = RelayNetwork::get().into();`
`30`	`30`	`pub UnitWeightCost: u64 = 1_000;`
`31`	`31`	`}`