f rustfmt

Author: TheBlueMatt

lightning/src/routing/gossip.rs

@@ -2561,25 +2561,27 @@ where
 						// that the provided point is on the curve. Thus, if we don't have a
 						// signature to verify, we want to skip the parsing step entirely.
 						// This represents a substantial speedup in applying RGS snapshots.
-						node_pubkey = Some(PublicKey::from_slice(node_id).map_err(|_| LightningError {
-							err: "Couldn't parse source node pubkey".to_owned(),
-							action: ErrorAction::IgnoreAndLog(Level::Debug),
-						})?);
+						node_pubkey =
+							Some(PublicKey::from_slice(node_id).map_err(|_| LightningError {
+								err: "Couldn't parse source node pubkey".to_owned(),
+								action: ErrorAction::IgnoreAndLog(Level::Debug),
+							})?);
 					}
 				},
 			}
 		}
 
 		if let Some(sig) = sig {
 			let msg_hash = hash_to_message!(&message_sha256d_hash(&msg)[..]);
-			if node_pubkey.is_none() {
+			let node_pubkey = if let Some(pubkey) = node_pubkey {
+				pubkey
+			} else {
 				debug_assert!(false, "node_pubkey should have been decoded above");
 				let err = "node_pubkey wasn't decoded but we need it to check a sig".to_owned();
-				return Err(LightningError {
-					err, action: ErrorAction::IgnoreAndLog(Level::Error),
-				});
-			}
-			secp_verify_sig!(self.secp_ctx, &msg_hash, &sig, &node_pubkey.unwrap(), "channel_update");
+				let action = ErrorAction::IgnoreAndLog(Level::Error);
+				return Err(LightningError { err, action });
+			};
+			secp_verify_sig!(self.secp_ctx, &msg_hash, &sig, &node_pubkey, "channel_update");
 		}
 
 		if only_verify {