Remove Default from LaneId and BridgeId

paritytech · Jul 26, 2024 · 0a9a336 · 0a9a336
1 parent 41a75df
commit 0a9a336
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/bridges/primitives/messages/src/lib.rs b/bridges/primitives/messages/src/lib.rs
@@ -195,7 +195,6 @@ impl OperatingMode for MessagesOperatingMode {
 	Clone,
 	Copy,
 	Decode,
-	Default,
 	Encode,
 	Eq,
 	Ord,
@@ -281,9 +280,6 @@ impl LaneState {
 /// Message nonce. Valid messages will never have 0 nonce.
 pub type MessageNonce = u64;
 
-/// Message id as a tuple.
-pub type BridgeMessageId = (LaneId, MessageNonce);
-
 /// Opaque message payload. We only decode this payload when it is dispatched.
 pub type MessagePayload = Vec<u8>;
 

diff --git a/bridges/primitives/xcm-bridge-hub/src/lib.rs b/bridges/primitives/xcm-bridge-hub/src/lib.rs
@@ -40,7 +40,6 @@ pub type XcmAsPlainPayload = sp_std::vec::Vec<u8>;
 	Clone,
 	Copy,
 	Decode,
-	Default,
 	Encode,
 	Eq,
 	Ord,

diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/from_grandpa_chain.rs b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/from_grandpa_chain.rs
@@ -447,7 +447,7 @@ where
 				BridgedChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 				ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 			>(
-				LaneId::default(),
+				LaneId::new(1, 2),
 				vec![Instruction::<()>::ClearOrigin; 1_024].into(),
 				1,
 				[GlobalConsensus(Polkadot), Parachain(1_000)].into(),
@@ -503,7 +503,7 @@ where
 				ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 				(),
 			>(
-				LaneId::default(),
+				LaneId::new(1, 2),
 				1u32.into(),
 				AccountId32::from(Alice.public()).into(),
 				unrewarded_relayers.clone(),
@@ -551,7 +551,7 @@ where
 				BridgedChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 				ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 			>(
-				LaneId::default(),
+				LaneId::new(1, 2),
 				vec![Instruction::<()>::ClearOrigin; 1_024].into(),
 				1,
 				[GlobalConsensus(Polkadot), Parachain(1_000)].into(),
@@ -603,7 +603,7 @@ where
 				ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 				(),
 			>(
-				LaneId::default(),
+				LaneId::new(1, 2),
 				1u32.into(),
 				AccountId32::from(Alice.public()).into(),
 				unrewarded_relayers.clone(),

diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/from_parachain.rs b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/from_parachain.rs
@@ -552,7 +552,7 @@ where
 			BridgedChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 			ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 		>(
-			LaneId::default(),
+			LaneId::new(1, 2),
 			vec![Instruction::<()>::ClearOrigin; 1_024].into(),
 			1,
 			[GlobalConsensus(Polkadot), Parachain(1_000)].into(),
@@ -622,7 +622,7 @@ where
 			BridgedChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 			ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 		>(
-			LaneId::default(),
+			LaneId::new(1, 2),
 			1,
 			5,
 			1_000,
@@ -684,7 +684,7 @@ where
 			BridgedChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 			ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 		>(
-			LaneId::default(),
+			LaneId::new(1, 2),
 			vec![Instruction::<()>::ClearOrigin; 1_024].into(),
 			1,
 			[GlobalConsensus(Polkadot), Parachain(1_000)].into(),
@@ -739,7 +739,7 @@ where
 				BridgedChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 				ThisChainOf<RuntimeHelper::Runtime, RuntimeHelper::MPI>,
 			>(
-				LaneId::default(),
+				LaneId::new(1, 2),
 				1,
 				5,
 				1_000,
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,6 @@ pub type XcmAsPlainPayload = sp_std::vec::Vec<u8>; @@
     	Clone,
     	Copy,
     	Decode,
-    	Default,
     	Encode,
     	Eq,
     	Ord,
@@ Expand Down @@