f swap control flow and fix test comment sp

Author: TheBlueMatt

lightning-invoice/src/utils.rs

@@ -572,24 +572,24 @@ fn filter_channels<L: Deref>(
 				let new_now_public = channel.is_public && !entry.get().is_public;
 				let new_higher_capacity = channel.is_public == entry.get().is_public &&
 					channel.inbound_capacity_msat > current_max_capacity;
-				if !new_now_public && !new_higher_capacity {
+				if new_now_public || new_higher_capacity {
+					log_trace!(logger,
+						"Preferring counterparty {} channel {} (SCID {:?}, {} msats) over {} (SCID {:?}, {} msats) for invoice route hints",
+						log_pubkey!(channel.counterparty.node_id),
+						log_bytes!(channel.channel_id), channel.short_channel_id,
+						channel.inbound_capacity_msat,
+						log_bytes!(entry.get().channel_id), entry.get().short_channel_id,
+						current_max_capacity);
+					entry.insert(channel);
+				} else {
 					log_trace!(logger,
 						"Preferring counterparty {} channel {} (SCID {:?}, {} msats) over {} (SCID {:?}, {} msats) for invoice route hints",
 						log_pubkey!(channel.counterparty.node_id),
 						log_bytes!(entry.get().channel_id), entry.get().short_channel_id,
 						current_max_capacity,
 						log_bytes!(channel.channel_id), channel.short_channel_id,
 						channel.inbound_capacity_msat);
-					continue;
 				}
-				log_trace!(logger,
-					"Preferring counterparty {} channel {} (SCID {:?}, {} msats) over {} (SCID {:?}, {} msats) for invoice route hints",
-					log_pubkey!(channel.counterparty.node_id),
-					log_bytes!(channel.channel_id), channel.short_channel_id,
-					channel.inbound_capacity_msat,
-					log_bytes!(entry.get().channel_id), entry.get().short_channel_id,
-					current_max_capacity);
-				entry.insert(channel);
 			}
 			hash_map::Entry::Vacant(entry) => {
 				entry.insert(channel);
@@ -834,8 +834,8 @@ mod test {
 		match_invoice_routes(Some(5000), &nodes[1], scid_aliases.clone());
 
 		// However after we mine the funding tx and exchange channel_ready messages for the public
-		// channel we'll immediately switch to including it as a route hint, even though isn't yet
-		// announced.
+		// channel we'll immediately switch to including it as a route hint, even though it isn't
+		// yet announced.
 		let pub_channel_scid = mine_transaction(&nodes[0], &conf_tx);
 		let node_a_pub_channel_ready = get_event_msg!(nodes[0], MessageSendEvent::SendChannelReady, nodes[1].node.get_our_node_id());
 		nodes[1].node.handle_channel_ready(&nodes[0].node.get_our_node_id(), &node_a_pub_channel_ready);