Merge pull request #4289 from valentinewallace/2025-12-reconstruct-fwds-followup

Fix double-forward, prefer legacy forward maps

Author: TheBlueMatt

CONTRIBUTING.md

@@ -192,6 +192,12 @@ welcomed.
 
 * `LDK_TEST_DETERMINISTIC_HASHES` - When set to `1`, uses deterministic hash map iteration order in tests. This ensures consistent test output across runs, useful for comparing logs before and after changes.
 
+* `LDK_TEST_REBUILD_MGR_FROM_MONITORS` - If set to `1`, on test node reload the `ChannelManager`'s
+  HTLC set will be reconstructed from `Channel{Monitor}` persisted data. If `0`, test nodes will be
+  reloaded from persisted `ChannelManager` data using legacy code paths. This ensures consistent
+  test output across runs, useful for comparing logs before and after changes, since otherwise the
+  selection of which codepaths to be used on reload will be chosen randomly.
+
 C/C++ Bindings
 --------------
 

lightning/src/ln/channel.rs

@@ -14723,7 +14723,7 @@ where
 			}
 		}
 		let mut removed_htlc_attribution_data: Vec<&Option<AttributionData>> = Vec::new();
-		let mut inbound_committed_update_adds: Vec<Option<msgs::UpdateAddHTLC>> = Vec::new();
+		let mut inbound_committed_update_adds: Vec<&Option<msgs::UpdateAddHTLC>> = Vec::new();
 		(self.context.pending_inbound_htlcs.len() as u64 - dropped_inbound_htlcs).write(writer)?;
 		for htlc in self.context.pending_inbound_htlcs.iter() {
 			if let &InboundHTLCState::RemoteAnnounced(_) = &htlc.state {
@@ -14745,7 +14745,7 @@ where
 				},
 				&InboundHTLCState::Committed { ref update_add_htlc_opt } => {
 					3u8.write(writer)?;
-					inbound_committed_update_adds.push(update_add_htlc_opt.clone());
+					inbound_committed_update_adds.push(update_add_htlc_opt);
 				},
 				&InboundHTLCState::LocalRemoved(ref removal_reason) => {
 					4u8.write(writer)?;