Merge branch 'lightningdevkit:main' into main

Author: Sharmalm

fuzz/src/router.rs

@@ -149,6 +149,15 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 		}
 	}
 
+	macro_rules! get_pubkey_from_node_id {
+		($node_id: expr ) => {
+			match PublicKey::from_slice($node_id.as_slice()) {
+				Ok(pk) => pk,
+				Err(_) => return,
+			}
+		}
+	}
+
 	macro_rules! get_pubkey {
 		() => {
 			match PublicKey::from_slice(get_slice!(33)) {
@@ -175,19 +184,19 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 					return;
 				}
 				let msg = decode_msg_with_len16!(msgs::UnsignedNodeAnnouncement, 288);
-				node_pks.insert(msg.node_id);
+				node_pks.insert(get_pubkey_from_node_id!(msg.node_id));
 				let _ = net_graph.update_node_from_unsigned_announcement(&msg);
 			},
 			1 => {
 				let msg = decode_msg_with_len16!(msgs::UnsignedChannelAnnouncement, 32+8+33*4);
-				node_pks.insert(msg.node_id_1);
-				node_pks.insert(msg.node_id_2);
+				node_pks.insert(get_pubkey_from_node_id!(msg.node_id_1));
+				node_pks.insert(get_pubkey_from_node_id!(msg.node_id_2));
 				let _ = net_graph.update_channel_from_unsigned_announcement::<&FuzzChainSource>(&msg, &None);
 			},
 			2 => {
 				let msg = decode_msg_with_len16!(msgs::UnsignedChannelAnnouncement, 32+8+33*4);
-				node_pks.insert(msg.node_id_1);
-				node_pks.insert(msg.node_id_2);
+				node_pks.insert(get_pubkey_from_node_id!(msg.node_id_1));
+				node_pks.insert(get_pubkey_from_node_id!(msg.node_id_2));
 				let _ = net_graph.update_channel_from_unsigned_announcement(&msg, &Some(&FuzzChainSource { input: Arc::clone(&input) }));
 			},
 			3 => {

lightning-background-processor/src/lib.rs

@@ -659,7 +659,7 @@ mod tests {
 	use bitcoin::secp256k1::{SecretKey, PublicKey, Secp256k1};
 	use lightning::chain::{BestBlock, Confirm, chainmonitor};
 	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
-	use lightning::chain::keysinterface::{InMemorySigner, EntropySource, KeysManager};
+	use lightning::chain::keysinterface::{InMemorySigner, KeysManager};
 	use lightning::chain::transaction::OutPoint;
 	use lightning::get_event_msg;
 	use lightning::ln::PaymentHash;
@@ -676,7 +676,6 @@ mod tests {
 	use lightning::util::ser::Writeable;
 	use lightning::util::test_utils;
 	use lightning::util::persist::KVStorePersister;
-	use lightning_invoice::payment::{InvoicePayer, Retry};
 	use lightning_persister::FilesystemPersister;
 	use std::collections::VecDeque;
 	use std::fs;
@@ -1326,22 +1325,6 @@ mod tests {
 		assert_eq!(network_graph.read_only().channels().len(), 0);
 	}
 
-	#[test]
-	fn test_invoice_payer() {
-		let keys_manager = test_utils::TestKeysInterface::new(&[0u8; 32], Network::Testnet);
-		let random_seed_bytes = keys_manager.get_secure_random_bytes();
-		let nodes = create_nodes(2, "test_invoice_payer".to_string());
-
-		// Initiate the background processors to watch each node.
-		let data_dir = nodes[0].persister.get_data_dir();
-		let persister = Arc::new(Persister::new(data_dir));
-		let router = Arc::new(DefaultRouter::new(Arc::clone(&nodes[0].network_graph), Arc::clone(&nodes[0].logger), random_seed_bytes, Arc::clone(&nodes[0].scorer)));
-		let invoice_payer = Arc::new(InvoicePayer::new(Arc::clone(&nodes[0].node), router, Arc::clone(&nodes[0].logger), |_: _| {}, Retry::Attempts(2)));
-		let event_handler = Arc::clone(&invoice_payer);
-		let bg_processor = BackgroundProcessor::start(persister, event_handler, nodes[0].chain_monitor.clone(), nodes[0].node.clone(), nodes[0].no_gossip_sync(), nodes[0].peer_manager.clone(), nodes[0].logger.clone(), Some(nodes[0].scorer.clone()));
-		assert!(bg_processor.stop().is_ok());
-	}
-
 	#[test]
 	fn test_payment_path_scoring() {
 		// Ensure that we update the scorer when relevant events are processed. In this case, we ensure