From a663bc269419bc7fa73450c7134039b9fce5af52 Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Sat, 26 Oct 2024 22:24:14 +0200
Subject: [PATCH] Fix testnet runtimes

---
 .../bridge-hubs/bridge-hub-rococo/src/lib.rs       |  4 ++++
 .../bridge-hubs/bridge-hub-westend/src/lib.rs      |  4 ++++
 .../bridge-hubs/test-utils/src/test_cases/mod.rs   | 14 ++++++++------
 prdoc/pr_6231.prdoc                                |  4 ++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
index f63e1f8fcf65b..f7f662d75de1d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -178,6 +178,10 @@ pub type Migrations = (
 		RocksDbWeight,
 	>,
 	pallet_bridge_relayers::migration::v1::MigrationToV1<Runtime, ()>,
+	pallet_xcm_bridge_hub::migration::v1::MigrationToV1<
+		Runtime,
+		bridge_to_westend_config::XcmOverBridgeHubWestendInstance,
+	>,
 	// permanent
 	pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 );
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
index 1d7cd5de40eb4..1e9061835fbbb 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
@@ -159,6 +159,10 @@ pub type Migrations = (
 		RocksDbWeight,
 	>,
 	pallet_bridge_relayers::migration::v1::MigrationToV1<Runtime, ()>,
+	pallet_xcm_bridge_hub::migration::v1::MigrationToV1<
+		Runtime,
+		bridge_to_rococo_config::XcmOverBridgeHubRococoInstance,
+	>,
 	// permanent
 	pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 	snowbridge_pallet_system::migration::v0::InitializeOnUpgrade<
diff --git a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs
index 24372f57ae7d8..322c5cc7e590c 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs
@@ -687,11 +687,16 @@ pub fn open_and_close_bridge_works<Runtime, XcmOverBridgePalletInstance, Locatio
 		>>::AllowWithoutBridgeDeposit::contains(
 			locations.bridge_origin_relative_location()
 		) {
-			Zero::zero()
+			None
 		} else {
-			<Runtime as pallet_xcm_bridge_hub::Config<
+			let bridge_owner_account = LocationToAccountId::convert_location(&source)
+				.expect("valid location")
+				.into();
+			let deposit = <Runtime as pallet_xcm_bridge_hub::Config<
 				XcmOverBridgePalletInstance,
-			>>::BridgeDeposit::get()
+			>>::BridgeDeposit::get();
+
+			Some(bp_xcm_bridge_hub::Deposit::new(bridge_owner_account, deposit))
 		};
 
 		// check bridge/lane DOES not exist
@@ -741,9 +746,6 @@ pub fn open_and_close_bridge_works<Runtime, XcmOverBridgePalletInstance, Locatio
 					locations.bridge_destination_universal_location().clone().into()
 				),
 				state: BridgeState::Opened,
-				bridge_owner_account: LocationToAccountId::convert_location(&source)
-					.expect("valid location")
-					.into(),
 				deposit: expected_deposit,
 				lane_id: expected_lane_id
 			})
diff --git a/prdoc/pr_6231.prdoc b/prdoc/pr_6231.prdoc
index 7a5cb6fc48c84..3638cc7999410 100644
--- a/prdoc/pr_6231.prdoc
+++ b/prdoc/pr_6231.prdoc
@@ -21,4 +21,8 @@ crates:
 - name: asset-hub-westend-runtime
   bump: patch
 - name: bp-xcm-bridge-hub
+  bump: major
+- name: bridge-hub-rococo-runtime
   bump: patch
+- name: bridge-hub-westend-runtime
+  bump: patch
\ No newline at end of file