deal with some FIXMEs

Author: drahnr

node/network/bridge/src/incoming/mod.rs

@@ -613,8 +613,13 @@ where
 	N: Network,
 	AD: validator_discovery::AuthorityDiscovery + Clone,
 {
-	let NetworkBridgeIn { network_service, authority_discovery_service, metrics, sync_oracle, shared } =
-		bridge;
+	let NetworkBridgeIn {
+		network_service,
+		authority_discovery_service,
+		metrics,
+		sync_oracle,
+		shared,
+	} = bridge;
 
 	let (task, network_event_handler) = handle_network_messages(
 		ctx.sender().clone(),
@@ -640,8 +645,10 @@ where
 
 	futures::pin_mut!(orchestra_signal_handler);
 
-	// FIXME
-	let _either = futures::future::select(orchestra_signal_handler, network_event_handler).await;
+	futures::future::select(orchestra_signal_handler, network_event_handler)
+		.await
+		.factor_first()
+		.0?;
 	Ok(())
 }
 

node/network/bridge/src/outgoing/mod.rs

@@ -294,8 +294,13 @@ where
 	N: Network,
 	AD: validator_discovery::AuthorityDiscovery + Clone + Sync,
 {
-	let NetworkBridgeOut { network_service, authority_discovery_service, metrics, sync_oracle, shared, } =
-		bridge;
+	let NetworkBridgeOut {
+		network_service,
+		authority_discovery_service,
+		metrics,
+		sync_oracle,
+		shared,
+	} = bridge;
 
 	handle_subsystem_messages(
 		ctx,

node/overseer/src/lib.rs

@@ -579,7 +579,7 @@ pub struct Overseer<SupportsParachains> {
 
 	#[subsystem(GossipSupportMessage, sends: [
 		NetworkBridgeMessage,
-		NetworkBridgeInMessage, // FIXME move this into the GossipSupport subsystem
+		NetworkBridgeInMessage, // TODO <https://github.com/paritytech/polkadot/issues/5626>
 		RuntimeApiMessage,
 		ChainSelectionMessage,
 	])]