fix unit test

Author: SWvheerden

src/ln/channel.rs

@@ -2343,12 +2343,12 @@ impl Channel {
 		if msg.next_remote_commitment_number > 0 {
 			if let Some(ref data_loss) = msg.data_loss_protect {
 				//check if provided signature is a valid signature from us
-				if chan_utils::build_commitment_secret(self.local_keys.commitment_seed, msg.next_remote_commitment_number-1) != data_loss.your_last_per_commitment_secret{
+				if chan_utils::build_commitment_secret(self.local_keys.commitment_seed, INITIAL_COMMITMENT_NUMBER - msg.next_remote_commitment_number + 1) != data_loss.your_last_per_commitment_secret{
 					return Err(ChannelError::Close("Peer sent a garbage channel_reestablish with secret key not matching the  commitment height provided"));
 				}
 				//check if we have fallen beind
 				//We should not broadcast commitment transaction or continue
-				if msg.next_remote_commitment_number > self.cur_local_commitment_transaction_number{
+				if msg.next_remote_commitment_number >= INITIAL_COMMITMENT_NUMBER- self.cur_local_commitment_transaction_number{
 					return Err(ChannelError::CloseNoPublish("We have fallen behind and we cannot catch up, need to close channel but not publish commitment"));
 				}
 			}

src/ln/functional_tests.rs

@@ -5590,6 +5590,8 @@ fn test_onchain_to_onchain_claim() {
 
 #[test]
 fn test_onchain_claim_after_reestablish_fail(){
+	//This test tries to claim after reestablishes fails and dataloss protect is on
+	//This means that peer A is behind and must not cleam as per bolt spec
 	let mut nodes = create_network(2);
 
 	// Create some initial channels
@@ -5639,18 +5641,21 @@ fn test_onchain_claim_after_reestablish_fail(){
 	let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]); 
 
 	nodes[1].node.handle_channel_reestablish(&nodes[0].node.get_our_node_id(), &reestablish_1[0]).unwrap();
-	assert!(!nodes[1].node.get_and_clear_pending_msg_events().is_empty()); //this should not be empty as node B must notify A is is behind
+	assert!(!nodes[1].node.get_and_clear_pending_msg_events().is_empty()); //this should not be empty
 
-	let me =nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]).unwrap();
-	assert!(nodes[0].node.get_and_clear_pending_msg_events().is_empty()); 
+	nodes[0].node.handle_channel_reestablish(&nodes[1].node.get_our_node_id(), &reestablish_2[0]); //throws an error do not publish error as expected
+	assert!(!nodes[0].node.get_and_clear_pending_msg_events().is_empty()); //this should not be empty
 
 	let commitment_tx = nodes[1].node.channel_state.lock().unwrap().by_id.get(&chan_1.2).unwrap().last_local_commitment_txn.clone();
 	assert_eq!(commitment_tx[0].input.len(), 1);
 	assert_eq!(commitment_tx[0].input[0].previous_output.txid, chan_1.3.txid());
 
+	// let A try and claim and fail as block limit has not passed
+	let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
+	nodes[0].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![commitment_tx[0].clone()] }, 1);
+	assert!(!nodes[0].node.claim_funds(payment_preimage));
 
 	// let B claim
-	let header = BlockHeader { version: 0x20000000, prev_blockhash: Default::default(), merkle_root: Default::default(), time: 42, bits: 42, nonce: 42 };
 	assert!(nodes[1].node.claim_funds(payment_preimage));
 	check_added_monitors!(nodes[1], 1);
 	nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: vec![commitment_tx[0].clone()] }, 1);
@@ -5663,18 +5668,6 @@ fn test_onchain_claim_after_reestablish_fail(){
 		MessageSendEvent::BroadcastChannelUpdate { .. } => {},
 		_ => panic!("Unexepected event"),
 	}
-
-	// Check B's monitor was able to send back output descriptor event for preimage tx on A's commitment tx
-	/*let node_txn = nodes[1].tx_broadcaster.txn_broadcasted.lock().unwrap(); // ChannelManager : 1 (local commitment tx), ChannelMonitor: 2 (1 preimage tx) * 2 (block-rescan)
-	check_spends!(node_txn[0], commitment_tx[0].clone());
-	assert_eq!(node_txn[0], node_txn[2]);
-	assert_eq!(node_txn[0].input[0].witness.last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
-	check_spends!(node_txn[1], chan_1.3.clone());
-
-	let spend_txn = check_spendable_outputs!(nodes[1], 1); // , 0, 0, 1, 1);
-	assert_eq!(spend_txn.len(), 2);
-	assert_eq!(spend_txn[0], spend_txn[1]);
-	check_spends!(spend_txn[0], node_txn[0].clone());*/
 }
 
 #[test]