Revert "makes our_node_id not be an Option<>, this forces it to be required"

Keeps our_node_id as optional

This reverts commit d2a50b0.

Author: tee8z

lightning/src/ln/chanmon_update_fail_tests.rs

@@ -203,7 +203,7 @@ fn do_test_simple_monitor_temporary_update_fail(disconnect: bool) {
 		Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(payment_hash_1, *payment_hash);
 			assert_eq!(amount_msat, 1_000_000);
-			assert_eq!(our_node_id, nodes[1].node.get_our_node_id());
+			assert_eq!(our_node_id.unwrap(), nodes[1].node.get_our_node_id());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());
@@ -572,7 +572,7 @@ fn do_test_monitor_temporary_update_fail(disconnect_count: usize) {
 		Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(payment_hash_2, *payment_hash);
 			assert_eq!(amount_msat, 1_000_000);
-			assert_eq!(our_node_id, nodes[1].node.get_our_node_id());
+			assert_eq!(our_node_id.unwrap(), nodes[1].node.get_our_node_id());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());
@@ -690,7 +690,7 @@ fn test_monitor_update_fail_cs() {
 		Event::PaymentReceived { payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(payment_hash, our_payment_hash);
 			assert_eq!(amount_msat, 1_000_000);
-			assert_eq!(our_node_id, nodes[1].node.get_our_node_id());
+			assert_eq!(our_node_id.unwrap(), nodes[1].node.get_our_node_id());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());
@@ -1665,7 +1665,7 @@ fn test_monitor_update_fail_claim() {
 		Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(payment_hash_2, *payment_hash);
 			assert_eq!(1_000_000, amount_msat);
-			assert_eq!(our_node_id, nodes[0].node.get_our_node_id());
+			assert_eq!(our_node_id.unwrap(), nodes[0].node.get_our_node_id());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());
@@ -1680,7 +1680,7 @@ fn test_monitor_update_fail_claim() {
 		Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(payment_hash_3, *payment_hash);
 			assert_eq!(1_000_000, amount_msat);
-			assert_eq!(our_node_id, nodes[0].node.get_our_node_id());
+			assert_eq!(our_node_id.unwrap(), nodes[0].node.get_our_node_id());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());

lightning/src/ln/channelmanager.rs

@@ -3486,7 +3486,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 										} else if total_value == $payment_data.total_msat {
 											htlcs.push(claimable_htlc);
 											new_events.push(events::Event::PaymentReceived {
-												our_node_id: self.our_network_pubkey,
+												our_node_id: Some(self.our_network_pubkey),
 												payment_hash,
 												purpose: purpose(),
 												amount_msat: total_value,
@@ -3529,7 +3529,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 														let purpose = events::PaymentPurpose::SpontaneousPayment(preimage);
 														e.insert((purpose.clone(), vec![claimable_htlc]));
 														new_events.push(events::Event::PaymentReceived {
-															our_node_id: self.our_network_pubkey,
+															our_node_id: Some(self.our_network_pubkey),
 															payment_hash,
 															amount_msat: outgoing_amt_msat,
 															purpose,
@@ -4276,7 +4276,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 
 			if claimed_any_htlcs {
 				self.pending_events.lock().unwrap().push(events::Event::PaymentClaimed {
-					our_node_id: self.our_network_pubkey,
+					our_node_id: Some(self.our_network_pubkey),
 					payment_hash,
 					purpose: payment_purpose,
 					amount_msat: claimable_amt_msat,
@@ -7517,7 +7517,7 @@ impl<'a, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref>
 						}
 					}
 					pending_events_read.push(events::Event::PaymentClaimed {
-						our_node_id: our_network_pubkey,
+						our_node_id: Some(our_network_pubkey),
 						payment_hash,
 						purpose: payment_purpose,
 						amount_msat: claimable_amt_msat,

lightning/src/ln/functional_test_utils.rs

@@ -1447,7 +1447,7 @@ macro_rules! expect_payment_received {
 			$crate::util::events::Event::PaymentReceived {ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 				assert_eq!($expected_payment_hash, *payment_hash);
 				assert_eq!($expected_recv_value, amount_msat);
-				assert_eq!($node.node.get_our_node_id(), our_node_id);
+				assert_eq!($node.node.get_our_node_id(), our_node_id.unwrap());
 				match purpose {
 					$crate::util::events::PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 						assert_eq!(&$expected_payment_preimage, payment_preimage);
@@ -1741,7 +1741,7 @@ pub fn do_pass_along_path<'a, 'b, 'c>(origin_node: &Node<'a, 'b, 'c>, expected_p
 				match events_2[0] {
 					Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 						assert_eq!(our_payment_hash, *payment_hash);
-						assert_eq!(node.node.get_our_node_id(), our_node_id);
+						assert_eq!(node.node.get_our_node_id(), our_node_id.unwrap());
 						match &purpose {
 							PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 								assert_eq!(expected_preimage, *payment_preimage);

lightning/src/ln/functional_tests.rs

@@ -1959,7 +1959,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 		Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(our_payment_hash_21, *payment_hash);
 			assert_eq!(recv_value_21, amount_msat);
-			assert_eq!(nodes[2].node.get_our_node_id(), our_node_id);
+			assert_eq!(nodes[2].node.get_our_node_id(), our_node_id.unwrap());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());
@@ -1974,7 +1974,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 		Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(our_payment_hash_22, *payment_hash);
 			assert_eq!(recv_value_22, amount_msat);
-			assert_eq!(nodes[2].node.get_our_node_id(), our_node_id);
+			assert_eq!(nodes[2].node.get_our_node_id(), our_node_id.unwrap());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());
@@ -3728,7 +3728,7 @@ fn do_test_drop_messages_peer_disconnect(messages_delivered: u8, simulate_broken
 		Event::PaymentReceived { ref payment_hash, ref purpose, amount_msat, our_node_id } => {
 			assert_eq!(payment_hash_1, *payment_hash);
 			assert_eq!(amount_msat, 1_000_000);
-			assert_eq!(our_node_id, nodes[1].node.get_our_node_id());
+			assert_eq!(our_node_id.unwrap(), nodes[1].node.get_our_node_id());
 			match &purpose {
 				PaymentPurpose::InvoicePayment { payment_preimage, payment_secret, .. } => {
 					assert!(payment_preimage.is_none());

lightning/src/util/events.rs

@@ -343,7 +343,7 @@ pub enum Event {
 	/// [`ChannelManager::fail_htlc_backwards`]: crate::ln::channelmanager::ChannelManager::fail_htlc_backwards
 	PaymentReceived {
 		/// The node that recieved the payment, ie our node
-		our_node_id: PublicKey,
+		our_node_id: Option<PublicKey>,
 		/// The hash for which the preimage should be handed to the ChannelManager. Note that LDK will
 		/// not stop you from registering duplicate payment hashes for inbound payments.
 		payment_hash: PaymentHash,
@@ -369,7 +369,7 @@ pub enum Event {
 	/// [`ChannelManager::claim_funds`]: crate::ln::channelmanager::ChannelManager::claim_funds
 	PaymentClaimed {
 		/// The node that recieved the payment, ie our node
-		our_node_id: PublicKey,
+		our_node_id: Option<PublicKey>,
 		/// The payment hash of the claimed payment. Note that LDK will not stop you from
 		/// registering duplicate payment hashes for inbound payments.
 		payment_hash: PaymentHash,
@@ -762,7 +762,7 @@ impl Writeable for Event {
 					(4, amount_msat, required),
 					(6, 0u64, required), // user_payment_id required for compatibility with 0.0.103 and earlier
 					(8, payment_preimage, option),
-					(10, our_node_id, required),
+					(10, our_node_id, option),
 				});
 			},
 			&Event::PaymentSent { ref payment_id, ref payment_preimage, ref payment_hash, ref fee_paid_msat } => {
@@ -865,7 +865,7 @@ impl Writeable for Event {
 					(0, payment_hash, required),
 					(2, purpose, required),
 					(4, amount_msat, required),
-					(6, our_node_id, required),
+					(6, our_node_id, option),
 				});
 			},
 			&Event::ProbeSuccessful { ref payment_id, ref payment_hash, ref path } => {
@@ -948,7 +948,7 @@ impl MaybeReadable for Event {
 						None => return Err(msgs::DecodeError::InvalidValue),
 					};
 					Ok(Some(Event::PaymentReceived {
-						our_node_id: our_node_id.unwrap(),
+						our_node_id,
 						payment_hash,
 						amount_msat,
 						purpose,
@@ -1131,12 +1131,12 @@ impl MaybeReadable for Event {
 						(0, payment_hash, required),
 						(2, purpose, ignorable),
 						(4, amount_msat, required),
-						(6, our_node_id, required),
+						(6, our_node_id, option),
 					});
 					if purpose.is_none() { return Ok(None); }
 
 					Ok(Some(Event::PaymentClaimed {
-						our_node_id: our_node_id.unwrap(),
+						our_node_id,
 						payment_hash,
 						purpose: purpose.unwrap(),
 						amount_msat,