f Move out of match, None is unreachable, is_rgs

Author: tnull

Cargo.toml

@@ -14,7 +14,7 @@ categories = ["cryptography::cryptocurrencies"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-crate-type = ["staticlib", "cdylib"]
+crate-type = ["lib", "staticlib", "cdylib"]
 name = "ldk_node"
 
 [[bin]]

src/gossip.rs

@@ -37,18 +37,14 @@ impl GossipSource {
 		Self::RapidGossipSync { gossip_sync, server_url, latest_sync_timestamp, logger }
 	}
 
-	pub fn is_p2p(&self) -> bool {
-		if let Self::P2PNetwork { .. } = self {
+	pub fn is_rgs(&self) -> bool {
+		if let Self::RapidGossipSync { .. } = self {
 			true
 		} else {
 			false
 		}
 	}
 
-	pub fn is_rgs(&self) -> bool {
-		!self.is_p2p()
-	}
-
 	pub fn as_gossip_sync(&self) -> GossipSync {
 		match self {
 			Self::RapidGossipSync { gossip_sync, .. } => {

src/lib.rs

@@ -548,44 +548,33 @@ impl Builder {
 			)),
 		};
 
-		let peer_manager = match gossip_source.as_gossip_sync() {
-			GossipSync::P2P(p2p_gossip_sync) => {
-				let msg_handler = MessageHandler {
-					chan_handler: Arc::clone(&channel_manager),
-					route_handler: Arc::clone(&p2p_gossip_sync)
-						as Arc<dyn RoutingMessageHandler + Sync + Send>,
-					onion_message_handler: onion_messenger,
-				};
-				Arc::new(PeerManager::new(
-					msg_handler,
-					cur_time.as_secs().try_into().expect("System time error"),
-					&ephemeral_bytes,
-					Arc::clone(&logger),
-					IgnoringMessageHandler {},
-					Arc::clone(&keys_manager),
-				))
-			}
-			GossipSync::Rapid(_) => {
-				let msg_handler = MessageHandler {
-					chan_handler: Arc::clone(&channel_manager),
-					route_handler: Arc::new(IgnoringMessageHandler {})
-						as Arc<dyn RoutingMessageHandler + Sync + Send>,
-					onion_message_handler: onion_messenger,
-				};
-				Arc::new(PeerManager::new(
-					msg_handler,
-					cur_time.as_secs().try_into().expect("System time error"),
-					&ephemeral_bytes,
-					Arc::clone(&logger),
-					IgnoringMessageHandler {},
-					Arc::clone(&keys_manager),
-				))
-			}
+		let msg_handler = match gossip_source.as_gossip_sync() {
+			GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
+				chan_handler: Arc::clone(&channel_manager),
+				route_handler: Arc::clone(&p2p_gossip_sync)
+					as Arc<dyn RoutingMessageHandler + Sync + Send>,
+				onion_message_handler: onion_messenger,
+			},
+			GossipSync::Rapid(_) => MessageHandler {
+				chan_handler: Arc::clone(&channel_manager),
+				route_handler: Arc::new(IgnoringMessageHandler {})
+					as Arc<dyn RoutingMessageHandler + Sync + Send>,
+				onion_message_handler: onion_messenger,
+			},
 			GossipSync::None => {
-				panic!();
+				unreachable!("We must always have a gossip sync!");
 			}
 		};
 
+		let peer_manager = Arc::new(PeerManager::new(
+			msg_handler,
+			cur_time.as_secs().try_into().expect("System time error"),
+			&ephemeral_bytes,
+			Arc::clone(&logger),
+			IgnoringMessageHandler {},
+			Arc::clone(&keys_manager),
+		));
+
 		// Init payment info storage
 		let payment_store = match io::utils::read_payments(Arc::clone(&kv_store)) {
 			Ok(payments) => {