Simplification: Merge bridge_owner_account / deposit to optional …

…`Deposit` struct (we will need because we don't want/have `Location::Here` converter)

bridges/modules/xcm-bridge-hub/src/dispatcher.rs

@@ -127,7 +127,6 @@ mod tests {
 	use bp_xcm_bridge_hub::{Bridge, BridgeLocations, BridgeState};
 	use frame_support::assert_ok;
 	use pallet_bridge_messages::InboundLaneStorage;
-	use xcm_executor::traits::ConvertLocation;
 
 	fn bridge() -> (Box<BridgeLocations>, TestLaneIdType) {
 		let origin = OpenBridgeOrigin::sibling_parachain_origin();
@@ -157,11 +156,7 @@ mod tests {
 							bridge.bridge_destination_universal_location().clone().into(),
 						),
 						state: BridgeState::Opened,
-						bridge_owner_account: LocationToAccountId::convert_location(
-							bridge.bridge_origin_relative_location(),
-						)
-						.expect("valid accountId"),
-						deposit: 0,
+						deposit: None,
 						lane_id,
 					},
 				);

bridges/modules/xcm-bridge-hub/src/exporter.rs

@@ -367,7 +367,7 @@ mod tests {
 	use frame_support::assert_ok;
 	use pallet_bridge_messages::InboundLaneStorage;
 	use xcm_builder::{NetworkExportTable, UnpaidRemoteExporter};
-	use xcm_executor::traits::{export_xcm, ConvertLocation};
+	use xcm_executor::traits::export_xcm;
 
 	fn universal_source() -> InteriorLocation {
 		SiblingUniversalLocation::get()
@@ -402,11 +402,7 @@ mod tests {
 						locations.bridge_destination_universal_location().clone().into(),
 					),
 					state: BridgeState::Opened,
-					bridge_owner_account: LocationToAccountId::convert_location(
-						locations.bridge_origin_relative_location(),
-					)
-					.expect("valid accountId"),
-					deposit: 0,
+					deposit: None,
 					lane_id,
 				},
 			);
@@ -618,8 +614,7 @@ mod tests {
 							locations.bridge_destination_universal_location().clone().into(),
 						),
 						state: BridgeState::Opened,
-						bridge_owner_account: [0u8; 32].into(),
-						deposit: 0,
+						deposit: None,
 						lane_id: expected_lane_id,
 					},
 				);