f even moar test

Author: TheBlueMatt

lightning/src/ln/payment_tests.rs

@@ -11,7 +11,7 @@
 //! serialization ordering between ChannelManager/ChannelMonitors and ensuring we can still retry
 //! payments thereafter.
 
-use chain::Watch;
+use chain::{Confirm, Watch};
 use chain::channelmonitor::ChannelMonitor;
 use ln::{PaymentPreimage, PaymentHash};
 use ln::channelmanager::{ChannelManager, ChannelManagerReadArgs, PaymentId, PaymentSendFailure};
@@ -273,8 +273,7 @@ fn no_pending_leak_on_initial_send_failure() {
 	assert!(!nodes[0].node.has_pending_payments());
 }
 
-#[test]
-fn retry_with_no_persist() {
+fn do_retry_with_no_persist(confirm_before_reload: bool) {
 	// 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.
@@ -321,6 +320,12 @@ fn retry_with_no_persist() {
 
 	reconnect_nodes(&nodes[1], &nodes[2], (false, false), (0, 0), (0, 0), (0, 0), (0, 0), (0, 0), (false, false));
 
+	let as_commitment_tx = get_local_commitment_txn!(nodes[0], chan_id)[0].clone();
+	if confirm_before_reload {
+		mine_transaction(&nodes[0], &as_commitment_tx);
+		nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clear();
+	}
+
 	// The ChannelMonitor should always be the latest version, as we're required to persist it
 	// during the `commitment_signed_dance!()`.
 	let mut chan_0_monitor_serialized = test_utils::TestVecWriter(Vec::new());
@@ -361,8 +366,9 @@ fn retry_with_no_persist() {
 	check_closed_event!(nodes[0], 1, ClosureReason::OutdatedChannelManager);
 	assert!(nodes[0].node.list_channels().is_empty());
 	assert!(nodes[0].node.has_pending_payments());
-	let as_commitment_tx = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
-	assert_eq!(as_commitment_tx.len(), 1);
+	let as_broadcasted_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().split_off(0);
+	assert_eq!(as_broadcasted_txn.len(), 1);
+	assert_eq!(as_broadcasted_txn[0], as_commitment_tx);
 
 	nodes[1].node.peer_disconnected(&nodes[0].node.get_our_node_id(), false);
 	nodes[0].node.peer_connected(&nodes[1].node.get_our_node_id(), &msgs::Init { features: InitFeatures::known()});
@@ -396,26 +402,31 @@ fn retry_with_no_persist() {
 	check_added_monitors!(nodes[1], 1);
 	commitment_signed_dance!(nodes[1], nodes[2], htlc_fulfill_updates.commitment_signed, false);
 
+	if confirm_before_reload {
+		let best_block = nodes[0].blocks.lock().unwrap().last().unwrap().clone();
+		nodes[0].node.best_block_updated(&best_block.0, best_block.1);
+	}
+
 	// 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]);
+	mine_transaction(&nodes[1], &as_commitment_tx);
 	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]);
+	check_spends!(bs_htlc_claim_txn[0], as_commitment_tx);
 	expect_payment_forwarded!(nodes[1], None, false);
 
-	mine_transaction(&nodes[0], &as_commitment_tx[0]);
+	mine_transaction(&nodes[0], &as_commitment_tx);
 	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_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]);
+	check_spends!(as_htlc_timeout_txn[0], as_commitment_tx);
+	check_spends!(as_htlc_timeout_txn[1], as_commitment_tx);
 	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]);
@@ -437,3 +448,9 @@ fn retry_with_no_persist() {
 	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);
 }
+
+#[test]
+fn retry_with_no_persist() {
+	do_retry_with_no_persist(true);
+	do_retry_with_no_persist(false);
+}