f test multiple payments reloaded since it was broken

Author: TheBlueMatt

lightning/src/ln/payment_tests.rs

@@ -278,6 +278,7 @@ fn retry_with_no_persist() {
 	// If we send a pending payment and `send_payment` returns success, we should always either
 	// return a payment failure event or a payment success event, and on failure the payment should
 	// be retryable.
+	//
 	// In order to do so when the ChannelManager isn't immediately persisted (which is normal - its
 	// always persisted asynchronously), the ChannelManager has to reload some payment data from
 	// ChannelMonitor(s) in some cases. This tests that reloading.
@@ -289,13 +290,16 @@ fn retry_with_no_persist() {
 	let nodes_0_deserialized: ChannelManager<EnforcingSigner, &test_utils::TestChainMonitor, &test_utils::TestBroadcaster, &test_utils::TestKeysInterface, &test_utils::TestFeeEstimator, &test_utils::TestLogger>;
 	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 
-	let chan_id = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known()).2;
+	let (_, _, chan_id, funding_tx) = create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 	create_announced_chan_between_nodes(&nodes, 1, 2, InitFeatures::known(), InitFeatures::known());
 
-	// Serialize the ChannelManager prior to sending the payment
+	// Serialize the ChannelManager prior to sending payments
 	let nodes_0_serialized = nodes[0].node.encode();
 
-	let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], 100_000);
+	// Send two payments - one which will get to nodes[2] and will be claimed, one which we'll time
+	// out and retry.
+	let payment_preimage_1 = route_payment(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000).0;
+	let (route, payment_hash, payment_preimage, payment_secret) = get_route_and_payment_hash!(nodes[0], nodes[2], 1_000_000);
 	let payment_id = nodes[0].node.send_payment(&route, payment_hash, &Some(payment_secret)).unwrap();
 	check_added_monitors!(nodes[0], 1);
 
@@ -315,7 +319,7 @@ fn retry_with_no_persist() {
 	// nodes[1] now immediately fails the HTLC as the next-hop channel is disconnected
 	let _ = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
 
-	reconnect_nodes(&nodes[1], &nodes[2], (true, true), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
+	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 
 	// The ChannelMonitor should always be the latest version, as we're required to persist it
 	// during the `commitment_signed_dance!()`.
@@ -383,29 +387,53 @@ fn retry_with_no_persist() {
 	}
 	check_closed_broadcast!(nodes[1], false);
 
+	// Now claim the first payment, which should allow nodes[1] to claim the payment on-chain when
+	// we close in a moment.
+	nodes[2].node.claim_funds(payment_preimage_1);
+	check_added_monitors!(nodes[2], 1);
+	let htlc_fulfill_updates = get_htlc_update_msgs!(nodes[2], nodes[1].node.get_our_node_id());
+	nodes[1].node.handle_update_fulfill_htlc(&nodes[2].node.get_our_node_id(), &htlc_fulfill_updates.update_fulfill_htlcs[0]);
+	check_added_monitors!(nodes[1], 1);
+	commitment_signed_dance!(nodes[1], nodes[2], htlc_fulfill_updates.commitment_signed, false);
+
 	// Create a new channel on which to retry the payment before we fail the payment via the
 	// HTLC-Timeout transaction. This avoids ChannelManager timing out the payment due to us
 	// connecting several blocks while creating the channel (implying time has passed).
 	create_announced_chan_between_nodes(&nodes, 0, 1, InitFeatures::known(), InitFeatures::known());
 	assert_eq!(nodes[0].node.list_usable_channels().len(), 1);
 
+	mine_transaction(&nodes[1], &as_commitment_tx[0]);
+	let bs_htlc_claim_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
+	assert_eq!(bs_htlc_claim_txn.len(), 1);
+	check_spends!(bs_htlc_claim_txn[0], as_commitment_tx[0]);
+	expect_payment_forwarded!(nodes[1], None, false);
+
 	mine_transaction(&nodes[0], &as_commitment_tx[0]);
+	mine_transaction(&nodes[0], &bs_htlc_claim_txn[0]);
+	expect_payment_sent!(nodes[0], payment_preimage_1);
 	connect_blocks(&nodes[0], TEST_FINAL_CLTV*4 + 20);
-	let as_htlc_timeout_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
-	assert_eq!(as_htlc_timeout_tx.len(), 1);
-	confirm_transaction(&nodes[0], &as_htlc_timeout_tx[0]);
+	let as_htlc_timeout_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
+	check_spends!(as_htlc_timeout_txn[2], funding_tx);
+	check_spends!(as_htlc_timeout_txn[0], as_commitment_tx[0]);
+	check_spends!(as_htlc_timeout_txn[1], as_commitment_tx[0]);
+	assert_eq!(as_htlc_timeout_txn.len(), 3);
+	if as_htlc_timeout_txn[0].input[0].previous_output == bs_htlc_claim_txn[0].input[0].previous_output {
+		confirm_transaction(&nodes[0], &as_htlc_timeout_txn[1]);
+	} else {
+		confirm_transaction(&nodes[0], &as_htlc_timeout_txn[0]);
+	}
 	nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();
 	expect_payment_failed!(nodes[0], payment_hash, false);
 
 	// Finally, retry the payment (which was reloaded from the ChannelMonitor when nodes[0] was
 	// reloaded) via a route over the new channel, which work without issue and eventually be
 	// received and claimed at the recipient just like any other payment.
-	let (new_route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[2], 100_000);
+	let (new_route, _, _, _) = get_route_and_payment_hash!(nodes[0], nodes[2], 1_000_000);
 
 	nodes[0].node.retry_payment(&new_route, payment_id).unwrap();
 	check_added_monitors!(nodes[0], 1);
 	let mut events = nodes[0].node.get_and_clear_pending_msg_events();
 	assert_eq!(events.len(), 1);
-	pass_along_path(&nodes[0], &[&nodes[1], &nodes[2]], 100_000, payment_hash, Some(payment_secret), events.pop().unwrap(), true, None);
+	pass_along_path(&nodes[0], &[&nodes[1], &nodes[2]], 1_000_000, payment_hash, Some(payment_secret), events.pop().unwrap(), true, None);
 	claim_payment_along_route(&nodes[0], &[&[&nodes[1], &nodes[2]]], false, payment_preimage);
 }