Merge branch 'master' into sv-governance-can-control-bridge-over-xcm

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs

@@ -21,9 +21,10 @@ use super::{
 };
 use crate::{
 	bridge_common_config::{
-		BridgeGrandpaWestendInstance, BridgeParachainWestendInstance, DeliveryRewardInBalance,
-		RequiredStakeForStakeAndSlash,
+		BridgeGrandpaRococoBulletinInstance, BridgeGrandpaWestendInstance,
+		BridgeParachainWestendInstance, DeliveryRewardInBalance, RequiredStakeForStakeAndSlash,
 	},
+	bridge_to_bulletin_config::WithRococoBulletinMessagesInstance,
 	bridge_to_westend_config::WithBridgeHubWestendMessagesInstance,
 };
 use bp_messages::LaneId;
@@ -204,6 +205,18 @@ impl Contains<RuntimeCall> for SafeCallFilter {
 				RuntimeCall::BridgeWestendMessages(pallet_bridge_messages::Call::<
 					Runtime,
 					WithBridgeHubWestendMessagesInstance,
+				>::set_operating_mode { .. }) |
+				RuntimeCall::BridgePolkadotBulletinGrandpa(pallet_bridge_grandpa::Call::<
+					Runtime,
+					BridgeGrandpaRococoBulletinInstance,
+				>::initialize { .. }) |
+				RuntimeCall::BridgePolkadotBulletinGrandpa(pallet_bridge_grandpa::Call::<
+					Runtime,
+					BridgeGrandpaRococoBulletinInstance,
+				>::set_operating_mode { .. }) |
+				RuntimeCall::BridgePolkadotBulletinMessages(pallet_bridge_messages::Call::<
+					Runtime,
+					WithRococoBulletinMessagesInstance,
 				>::set_operating_mode { .. })
 		)
 	}

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs

@@ -388,11 +388,25 @@ mod bridge_hub_bulletin_tests {
 		bridge_hub_test_utils::test_cases::initialize_bridge_by_governance_works::<
 			Runtime,
 			BridgeGrandpaRococoBulletinInstance,
-		>(
-			collator_session_keys(),
-			bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID,
-			Box::new(|call| RuntimeCall::BridgePolkadotBulletinGrandpa(call).encode()),
-		)
+		>(collator_session_keys(), bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID)
+	}
+
+	#[test]
+	fn change_bridge_grandpa_pallet_mode_by_governance_works() {
+		// for Bulletin finality
+		bridge_hub_test_utils::test_cases::change_bridge_grandpa_pallet_mode_by_governance_works::<
+			Runtime,
+			BridgeGrandpaRococoBulletinInstance,
+		>(collator_session_keys(), bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID)
+	}
+
+	#[test]
+	fn change_bridge_messages_pallet_mode_by_governance_works() {
+		// for Bulletin finality
+		bridge_hub_test_utils::test_cases::change_bridge_messages_pallet_mode_by_governance_works::<
+			Runtime,
+			WithRococoBulletinMessagesInstance,
+		>(collator_session_keys(), bp_bridge_hub_rococo::BRIDGE_HUB_ROCOCO_PARACHAIN_ID)
 	}
 
 	#[test]