Fixes fo ro/wo bridge (paritytech#1661)

serban300 · Apr 9, 2024 · d8ead38 · d8ead38
1 parent 96d4ff4
commit d8ead38
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs
@@ -69,7 +69,7 @@ impl Parachain for BridgeHubWococo {
 }
 
 /// Identifier of BridgeHubWococo in the Wococo relay chain.
-pub const BRIDGE_HUB_WOCOCO_PARACHAIN_ID: u32 = 1013;
+pub const BRIDGE_HUB_WOCOCO_PARACHAIN_ID: u32 = 1014;
 
 /// Name of the With-BridgeHubWococo messages pallet instance that is deployed at bridged chains.
 pub const WITH_BRIDGE_HUB_WOCOCO_MESSAGES_PALLET_NAME: &str = "BridgeWococoMessages";

diff --git a/bridges/relays/client-bridge-hub-rococo/src/runtime_wrapper.rs b/bridges/relays/client-bridge-hub-rococo/src/runtime_wrapper.rs
@@ -118,7 +118,7 @@ pub enum BridgeParachainCall {
 #[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
 #[allow(non_camel_case_types)]
 pub enum BridgeWococoMessagesCall {
-	#[codec(index = 5)]
+	#[codec(index = 2)]
 	receive_messages_proof(
 		relay_substrate_client::AccountIdOf<bp_bridge_hub_wococo::BridgeHubWococo>,
 		bridge_runtime_common::messages::target::FromBridgedChainMessagesProof<
@@ -128,7 +128,7 @@ pub enum BridgeWococoMessagesCall {
 		bp_messages::Weight,
 	),
 
-	#[codec(index = 6)]
+	#[codec(index = 3)]
 	receive_messages_delivery_proof(
 		bridge_runtime_common::messages::source::FromBridgedChainMessagesDeliveryProof<
 			relay_substrate_client::HashOf<bp_bridge_hub_wococo::BridgeHubWococo>,
@@ -140,7 +140,7 @@ pub enum BridgeWococoMessagesCall {
 #[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
 #[allow(non_camel_case_types)]
 pub enum BridgeRococoMessagesCall {
-	#[codec(index = 5)]
+	#[codec(index = 2)]
 	receive_messages_proof(
 		relay_substrate_client::AccountIdOf<bp_bridge_hub_rococo::BridgeHubRococo>,
 		bridge_runtime_common::messages::target::FromBridgedChainMessagesProof<
@@ -150,7 +150,7 @@ pub enum BridgeRococoMessagesCall {
 		bp_messages::Weight,
 	),
 
-	#[codec(index = 6)]
+	#[codec(index = 3)]
 	receive_messages_delivery_proof(
 		bridge_runtime_common::messages::source::FromBridgedChainMessagesDeliveryProof<
 			relay_substrate_client::HashOf<bp_bridge_hub_rococo::BridgeHubRococo>,

diff --git a/bridges/relays/client-substrate/src/error.rs b/bridges/relays/client-substrate/src/error.rs
@@ -39,9 +39,6 @@ pub enum Error {
 	/// The response from the server could not be SCALE decoded.
 	#[error("Response parse failed: {0}")]
 	ResponseParseFailed(#[from] codec::Error),
-	/// The Substrate bridge pallet has not yet been initialized.
-	#[error("The Substrate bridge pallet has not been initialized yet.")]
-	UninitializedBridgePallet,
 	/// Account does not exist on the chain.
 	#[error("Account does not exist on the chain.")]
 	AccountDoesNotExist,

diff --git a/bridges/relays/client-substrate/src/transaction_tracker.rs b/bridges/relays/client-substrate/src/transaction_tracker.rs
@@ -296,7 +296,7 @@ mod tests {
 			&self,
 			_hash: HashOf<TestChain>,
 		) -> Result<HeaderIdOf<TestChain>, Error> {
-			self.0.as_ref().map_err(|_| Error::UninitializedBridgePallet).cloned()
+			self.0.as_ref().map_err(|_| Error::BridgePalletIsNotInitialized).cloned()
 		}
 	}
 
@@ -338,7 +338,7 @@ mod tests {
 	async fn returns_lost_on_finalized_and_environment_error() {
 		assert_eq!(
 			watch_transaction_status::<_, TestChain, _>(
-				TestEnvironment(Err(Error::UninitializedBridgePallet)),
+				TestEnvironment(Err(Error::BridgePalletIsNotInitialized)),
 				Default::default(),
 				futures::stream::iter([TransactionStatus::Finalized(Default::default())])
 			)