f DRY

Author: TheBlueMatt

fuzz/src/chanmon_consistency.rs

@@ -1077,6 +1077,8 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 			} }
 		}
 
+		let complete_first = |v: &mut Vec<_>| if !v.is_empty() { Some(v.remove(0)) } else { None };
+		let complete_second = |v: &mut Vec<_>| if v.len() > 1 { Some(v.remove(1)) } else { None };
 		let complete_monitor_update = |
 			monitor: &Arc<TestChainMonitor>, chan_funding,
 			compl_selector: &dyn Fn(&mut Vec<(u64, Vec<u8>)>) -> Option<(u64, Vec<u8>)>,
@@ -1337,45 +1339,21 @@ pub fn do_test<Out: Output>(data: &[u8], underlying_out: Out, anchors: bool) {
 			},
 			0x89 => { fee_est_c.ret_val.store(253, atomic::Ordering::Release); nodes[2].maybe_update_chan_fees(); },
 
-			0xf0 =>
-				complete_monitor_update(&monitor_a, &chan_1_funding,
-					&|v: &mut Vec<_>| if !v.is_empty() { Some(v.remove(0)) } else { None }),
-			0xf1 =>
-				complete_monitor_update(&monitor_a, &chan_1_funding,
-					&|v: &mut Vec<_>| if v.len() > 1 { Some(v.remove(1)) } else { None }),
-			0xf2 =>
-				complete_monitor_update(&monitor_a, &chan_1_funding,
-					&|v: &mut Vec<_>| v.pop()),
-
-			0xf4 =>
-				complete_monitor_update(&monitor_b, &chan_1_funding,
-					&|v: &mut Vec<_>| if !v.is_empty() { Some(v.remove(0)) } else { None }),
-			0xf5 =>
-				complete_monitor_update(&monitor_b, &chan_1_funding,
-					&|v: &mut Vec<_>| if v.len() > 1 { Some(v.remove(1)) } else { None }),
-			0xf6 =>
-				complete_monitor_update(&monitor_b, &chan_1_funding,
-					&|v: &mut Vec<_>| v.pop()),
-
-			0xf8 =>
-				complete_monitor_update(&monitor_b, &chan_2_funding,
-					&|v: &mut Vec<_>| if !v.is_empty() { Some(v.remove(0)) } else { None }),
-			0xf9 =>
-				complete_monitor_update(&monitor_b, &chan_2_funding,
-					&|v: &mut Vec<_>| if v.len() > 1 { Some(v.remove(1)) } else { None }),
-			0xfa =>
-				complete_monitor_update(&monitor_b, &chan_2_funding,
-					&|v: &mut Vec<_>| v.pop()),
-
-			0xfc =>
-				complete_monitor_update(&monitor_c, &chan_2_funding,
-					&|v: &mut Vec<_>| if !v.is_empty() { Some(v.remove(0)) } else { None }),
-			0xfd =>
-				complete_monitor_update(&monitor_c, &chan_2_funding,
-					&|v: &mut Vec<_>| if v.len() > 1 { Some(v.remove(1)) } else { None }),
-			0xfe =>
-				complete_monitor_update(&monitor_c, &chan_2_funding,
-					&|v: &mut Vec<_>| v.pop()),
+			0xf0 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_first),
+			0xf1 => complete_monitor_update(&monitor_a, &chan_1_funding, &complete_second),
+			0xf2 => complete_monitor_update(&monitor_a, &chan_1_funding, &Vec::pop),
+
+			0xf4 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_first),
+			0xf5 => complete_monitor_update(&monitor_b, &chan_1_funding, &complete_second),
+			0xf6 => complete_monitor_update(&monitor_b, &chan_1_funding, &Vec::pop),
+
+			0xf8 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_first),
+			0xf9 => complete_monitor_update(&monitor_b, &chan_2_funding, &complete_second),
+			0xfa => complete_monitor_update(&monitor_b, &chan_2_funding, &Vec::pop),
+
+			0xfc => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_first),
+			0xfd => complete_monitor_update(&monitor_c, &chan_2_funding, &complete_second),
+			0xfe => complete_monitor_update(&monitor_c, &chan_2_funding, &Vec::pop),
 
 			0xff => {
 				// Test that no channel is in a stuck state where neither party can send funds even