From 61ebd381b587b85a6ffedca52adc49ac85dca33e Mon Sep 17 00:00:00 2001
From: "damian.lu" <wsteth@outlook.com>
Date: Wed, 22 Jan 2025 19:31:26 +0800
Subject: [PATCH] Revert "add WithUniqueTopic wrapper to xcm router (#1602)"

This reverts commit c42bc739a19048d2180537edc184094a60b270ff.
---
 runtime/bifrost-kusama/src/xcm_config.rs   | 8 +++-----
 runtime/bifrost-polkadot/src/xcm_config.rs | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/runtime/bifrost-kusama/src/xcm_config.rs b/runtime/bifrost-kusama/src/xcm_config.rs
index ea178b2d89..20dceca6eb 100644
--- a/runtime/bifrost-kusama/src/xcm_config.rs
+++ b/runtime/bifrost-kusama/src/xcm_config.rs
@@ -51,9 +51,7 @@ use pallet_xcm::XcmPassthrough;
 use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
 use xcm::v4::{prelude::*, Location};
-use xcm_builder::{
-	FrameTransactionalProcessor, TrailingSetTopicAsId, WithComputedOrigin, WithUniqueTopic,
-};
+use xcm_builder::{FrameTransactionalProcessor, TrailingSetTopicAsId, WithComputedOrigin};
 
 parameter_types! {
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
@@ -292,12 +290,12 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, K
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
-pub type XcmRouter = WithUniqueTopic<(
+pub type XcmRouter = (
 	// Two routers - use UMP to communicate with the relay chain:
 	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
 	// ..and XCMP to communicate with the sibling chains.
 	XcmpQueue,
-)>;
+);
 
 #[cfg(feature = "runtime-benchmarks")]
 parameter_types! {
diff --git a/runtime/bifrost-polkadot/src/xcm_config.rs b/runtime/bifrost-polkadot/src/xcm_config.rs
index 853885d280..a21cd93cd1 100644
--- a/runtime/bifrost-polkadot/src/xcm_config.rs
+++ b/runtime/bifrost-polkadot/src/xcm_config.rs
@@ -50,7 +50,7 @@ pub use xcm_builder::{
 };
 use xcm_builder::{
 	DescribeAllTerminal, DescribeFamily, FrameTransactionalProcessor, HashedDescription,
-	TrailingSetTopicAsId, WithComputedOrigin, WithUniqueTopic,
+	TrailingSetTopicAsId, WithComputedOrigin,
 };
 
 parameter_types! {
@@ -289,12 +289,12 @@ pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, P
 
 /// The means for routing XCM messages which are not for local execution into the right message
 /// queues.
-pub type XcmRouter = WithUniqueTopic<(
+pub type XcmRouter = (
 	// Two routers - use UMP to communicate with the relay chain:
 	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
 	// ..and XCMP to communicate with the sibling chains.
 	XcmpQueue,
-)>;
+);
 
 #[cfg(feature = "runtime-benchmarks")]
 parameter_types! {