Update chanmon fuzzer to include small payment actions.

This change should allow the fuzzer to catch more edge cases, such as
channel reserve checks that cut it close when sending payments.

Author: valentinewallace

fuzz/src/chanmon_consistency.rs

@@ -405,7 +405,7 @@ pub fn do_test(data: &[u8]) {
 
 	loop {
 		macro_rules! send_payment {
-			($source: expr, $dest: expr) => { {
+			($source: expr, $dest: expr, $amt: expr) => { {
 				let payment_hash = Sha256::hash(&[payment_id; 1]);
 				payment_id = payment_id.wrapping_add(1);
 				if let Err(_) = $source.send_payment(Route {
@@ -414,15 +414,15 @@ pub fn do_test(data: &[u8]) {
 						node_features: NodeFeatures::empty(),
 						short_channel_id: $dest.1,
 						channel_features: ChannelFeatures::empty(),
-						fee_msat: 5000000,
+						fee_msat: $amt,
 						cltv_expiry_delta: 200,
 					}],
 				}, PaymentHash(payment_hash.into_inner())) {
 					// Probably ran out of funds
 					test_return!();
 				}
 			} };
-			($source: expr, $middle: expr, $dest: expr) => { {
+			($source: expr, $middle: expr, $dest: expr, $amt: expr) => { {
 				let payment_hash = Sha256::hash(&[payment_id; 1]);
 				payment_id = payment_id.wrapping_add(1);
 				if let Err(_) = $source.send_payment(Route {
@@ -438,7 +438,7 @@ pub fn do_test(data: &[u8]) {
 						node_features: NodeFeatures::empty(),
 						short_channel_id: $dest.1,
 						channel_features: ChannelFeatures::empty(),
-						fee_msat: 5000000,
+						fee_msat: $amt,
 						cltv_expiry_delta: 200,
 					}],
 				}, PaymentHash(payment_hash.into_inner())) {
@@ -646,12 +646,12 @@ pub fn do_test(data: &[u8]) {
 					nodes[2].channel_monitor_updated(&chan_2_funding, *id);
 				}
 			},
-			0x09 => send_payment!(nodes[0], (&nodes[1], chan_a)),
-			0x0a => send_payment!(nodes[1], (&nodes[0], chan_a)),
-			0x0b => send_payment!(nodes[1], (&nodes[2], chan_b)),
-			0x0c => send_payment!(nodes[2], (&nodes[1], chan_b)),
-			0x0d => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b)),
-			0x0e => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a)),
+			0x09 => send_payment!(nodes[0], (&nodes[1], chan_a), 5000000),
+			0x0a => send_payment!(nodes[1], (&nodes[0], chan_a), 5000000),
+			0x0b => send_payment!(nodes[1], (&nodes[2], chan_b), 5000000),
+			0x0c => send_payment!(nodes[2], (&nodes[1], chan_b), 5000000),
+			0x0d => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 5000000),
+			0x0e => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 5000000),
 			0x0f => {
 				if !chan_a_disconnected {
 					nodes[0].peer_disconnected(&nodes[1].get_our_node_id(), false);
@@ -734,6 +734,12 @@ pub fn do_test(data: &[u8]) {
 				nodes[2] = node_c.clone();
 				monitor_c = new_monitor_c;
 			},
+			0x22 => send_payment!(nodes[0], (&nodes[1], chan_a), 20),
+			0x23 => send_payment!(nodes[1], (&nodes[0], chan_a), 20),
+			0x25 => send_payment!(nodes[1], (&nodes[2], chan_b), 20),
+			0x26 => send_payment!(nodes[2], (&nodes[1], chan_b), 20),
+			0x27 => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 20),
+			0x28 => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 20),
 			// 0x24 defined above
 			_ => test_return!(),
 		}