f reload channels differently

Author: TheBlueMatt

fuzz/src/chanmon_consistency.rs

@@ -703,12 +703,13 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 
 			let mut monitors = new_hash_map();
 			let mut old_monitors = $old_monitors.latest_monitors.lock().unwrap();
+			let mut use_old_mons = $use_old_mons;
 			for (channel_id, mut prev_state) in old_monitors.drain() {
-				let serialized_mon = if $use_old_mons % 3 == 0 {
+				let serialized_mon = if use_old_mons % 3 == 0 {
 					// Reload with the oldest `ChannelMonitor` (the one that we already told
 					// `ChannelManager` we finished persisting).
 					prev_state.persisted_monitor
-				} else if $use_old_mons % 3 == 1 {
+				} else if use_old_mons % 3 == 1 {
 					// Reload with the second-oldest `ChannelMonitor`
 					let old_mon = prev_state.persisted_monitor;
 					prev_state.pending_monitors.drain(..).next().map(|(_, v)| v).unwrap_or(old_mon)
@@ -717,6 +718,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 					let old_mon = prev_state.persisted_monitor;
 					prev_state.pending_monitors.pop().map(|(_, v)| v).unwrap_or(old_mon)
 				};
+				// Use a different value of `use_old_mons` if we have another monitor (only node B)
+				use_old_mons /= 3;
 				let mon = <(BlockHash, ChannelMonitor<TestChannelSigner>)>::read(
 					&mut &serialized_mon[..],
 					(&*$keys, &*$keys),
@@ -1511,7 +1514,7 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 			0x26 => process_ev_noret!(2, true),
 			0x27 => process_ev_noret!(2, false),
 
-			0x2a | 0x2b | 0x2c => {
+			0xb0 | 0xb1 | 0xb2 => {
 				// Restart node A, picking among the in-flight `ChannelMonitor`s to use based on
 				// the value of `v` we're matching.
 				if !chan_a_disconnected {
@@ -1524,14 +1527,12 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 					ab_events.clear();
 					ba_events.clear();
 				}
-				// Note that we ensure 0x2c represents "use oldest monitor" to retain backwards
-				// compatibility with existing fuzz corpuses by using setting (v + 1) % 3 == 0
 				let (new_node_a, new_monitor_a) =
-					reload_node!(node_a_ser, 0, monitor_a, v + 1, keys_manager_a, fee_est_a);
+					reload_node!(node_a_ser, 0, monitor_a, v, keys_manager_a, fee_est_a);
 				nodes[0] = new_node_a;
 				monitor_a = new_monitor_a;
 			},
-			0x28 | 0x29 | 0x2d => {
+			0xb3..=0xbb => {
 				// Restart node B, picking among the in-flight `ChannelMonitor`s to use based on
 				// the value of `v` we're matching.
 				if !chan_a_disconnected {
@@ -1555,8 +1556,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 				nodes[1] = new_node_b;
 				monitor_b = new_monitor_b;
 			},
-			0x2e | 0x2f => {
-				// Restart node B, picking among the in-flight `ChannelMonitor`s to use based on
+			0xbc | 0xbd | 0xbe => {
+				// Restart node C, picking among the in-flight `ChannelMonitor`s to use based on
 				// the value of `v` we're matching.
 				if !chan_b_disconnected {
 					nodes[1].peer_disconnected(nodes[2].get_our_node_id());
@@ -1568,10 +1569,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 					bc_events.clear();
 					cb_events.clear();
 				}
-				// Note that we ensure 0x2e represents "use oldest monitor" to retain backwards
-				// compatibility with existing fuzz corpuses by using setting (v + 2) % 3 == 0
 				let (new_node_c, new_monitor_c) =
-					reload_node!(node_c_ser, 2, monitor_c, v + 2, keys_manager_c, fee_est_c);
+					reload_node!(node_c_ser, 2, monitor_c, v, keys_manager_c, fee_est_c);
 				nodes[2] = new_node_c;
 				monitor_c = new_monitor_c;
 			},