Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

ease readability

Conditionnal compilation for weight of second one to handle test special
cltv values

Author: Antoine Riard

src/ln/channel.rs

@@ -363,6 +363,12 @@ const B_OUTPUT_PLUS_SPENDING_INPUT_WEIGHT: u64 = 104; // prevout: 40, nSequence:
 /// it's 2^24.
 pub const MAX_FUNDING_SATOSHIS: u64 = (1 << 24);
 
+#[cfg(test)]
+pub const ACCEPTED_HTLC_SCRIPT_WEIGHT: usize = 138; //Here we have a diff due to HTLC CLTV expiry being < 2^15 in test
+#[cfg(not(test))]
+pub const ACCEPTED_HTLC_SCRIPT_WEIGHT: usize = 139;
+pub const OFFERED_HTLC_SCRIPT_WEIGHT: usize = 133;
+
 /// Used to return a simple Error back to ChannelManager. Will get converted to a
 /// msgs::ErrorAction::SendErrorMessage or msgs::ErrorAction::IgnoreError as appropriate with our
 /// channel_id in ChannelManager.

src/ln/channelmanager.rs

@@ -3251,6 +3251,7 @@ mod tests {
 	use chain::keysinterface;
 	use ln::channelmanager::{ChannelManager,ChannelManagerReadArgs,OnionKeys,PaymentFailReason,RAACommitmentOrder};
 	use ln::channelmonitor::{ChannelMonitor, ChannelMonitorUpdateErr, CLTV_CLAIM_BUFFER, HTLC_FAIL_TIMEOUT_BLOCKS, ManyChannelMonitor};
+	use ln::channel::{ACCEPTED_HTLC_SCRIPT_WEIGHT, OFFERED_HTLC_SCRIPT_WEIGHT};
 	use ln::router::{Route, RouteHop, Router};
 	use ln::msgs;
 	use ln::msgs::{ChannelMessageHandler,RoutingMessageHandler};
@@ -5763,7 +5764,7 @@ mod tests {
 		assert_eq!(revoked_local_txn[0].output.len(), 2); // Only HTLC and output back to 0 are present
 		assert_eq!(revoked_local_txn[1].input.len(), 1);
 		assert_eq!(revoked_local_txn[1].input[0].previous_output.txid, revoked_local_txn[0].txid());
-		assert_eq!(revoked_local_txn[1].input[0].witness.last().unwrap().len(), 133); // HTLC-Timeout
+		assert_eq!(revoked_local_txn[1].input[0].witness.last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT); // HTLC-Timeout
 		// Revoke the old state
 		claim_payment(&nodes[0], &vec!(&nodes[1])[..], payment_preimage_3);
 
@@ -5882,7 +5883,7 @@ mod tests {
 		assert_eq!(revoked_local_txn[0].input[0].previous_output.txid, chan_1.3.txid());
 		assert_eq!(revoked_local_txn[1].input.len(), 1);
 		assert_eq!(revoked_local_txn[1].input[0].previous_output.txid, revoked_local_txn[0].txid());
-		assert_eq!(revoked_local_txn[1].input[0].witness.last().unwrap().len(), 133); // HTLC-Timeout
+		assert_eq!(revoked_local_txn[1].input[0].witness.last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT); // HTLC-Timeout
 		check_spends!(revoked_local_txn[1], revoked_local_txn[0].clone());
 
 		//Revoke the old state
@@ -5908,16 +5909,16 @@ mod tests {
 			witness_lens.insert(node_txn[0].input[2].witness.last().unwrap().len());
 			assert_eq!(witness_lens.len(), 3);
 			assert_eq!(*witness_lens.iter().skip(0).next().unwrap(), 77); // revoked to_local
-			assert_eq!(*witness_lens.iter().skip(1).next().unwrap(), 133); // revoked offered HTLC
-			assert_eq!(*witness_lens.iter().skip(2).next().unwrap(), 138); // revoked received HTLC
+			assert_eq!(*witness_lens.iter().skip(1).next().unwrap(), OFFERED_HTLC_SCRIPT_WEIGHT); // revoked offered HTLC
+			assert_eq!(*witness_lens.iter().skip(2).next().unwrap(), ACCEPTED_HTLC_SCRIPT_WEIGHT); // revoked received HTLC
 
 			// Next nodes[1] broadcasts its current local tx state:
 			assert_eq!(node_txn[1].input.len(), 1);
 			assert_eq!(node_txn[1].input[0].previous_output.txid, chan_1.3.txid()); //Spending funding tx unique txouput, tx broadcasted by ChannelManager
 
 			assert_eq!(node_txn[2].input.len(), 1);
 			let witness_script = node_txn[2].clone().input[0].witness.pop().unwrap();
-			assert_eq!(witness_script.len(), 133); //Spending an offered htlc output
+			assert_eq!(witness_script.len(), OFFERED_HTLC_SCRIPT_WEIGHT); //Spending an offered htlc output
 			assert_eq!(node_txn[2].input[0].previous_output.txid, node_txn[1].txid());
 			assert_ne!(node_txn[2].input[0].previous_output.txid, node_txn[0].input[0].previous_output.txid);
 			assert_ne!(node_txn[2].input[0].previous_output.txid, node_txn[0].input[1].previous_output.txid);
@@ -5980,15 +5981,15 @@ mod tests {
 			witness_lens.insert(node_txn[2].input[0].witness.last().unwrap().len());
 			assert_eq!(witness_lens.len(), 3);
 			assert_eq!(*witness_lens.iter().skip(0).next().unwrap(), 77); // revoked to_local
-			assert_eq!(*witness_lens.iter().skip(1).next().unwrap(), 133); // revoked offered HTLC
-			assert_eq!(*witness_lens.iter().skip(2).next().unwrap(), 138); // revoked received HTLC
+			assert_eq!(*witness_lens.iter().skip(1).next().unwrap(), OFFERED_HTLC_SCRIPT_WEIGHT); // revoked offered HTLC
+			assert_eq!(*witness_lens.iter().skip(2).next().unwrap(), ACCEPTED_HTLC_SCRIPT_WEIGHT); // revoked received HTLC
 
 			assert_eq!(node_txn[3].input.len(), 1);
 			check_spends!(node_txn[3], chan_1.3.clone());
 
 			assert_eq!(node_txn[4].input.len(), 1);
 			let witness_script = node_txn[4].input[0].witness.last().unwrap();
-			assert_eq!(witness_script.len(), 133); //Spending an offered htlc output
+			assert_eq!(witness_script.len(), OFFERED_HTLC_SCRIPT_WEIGHT); //Spending an offered htlc output
 			assert_eq!(node_txn[4].input[0].previous_output.txid, node_txn[3].txid());
 			assert_ne!(node_txn[4].input[0].previous_output.txid, node_txn[0].input[0].previous_output.txid);
 			assert_ne!(node_txn[4].input[0].previous_output.txid, node_txn[1].input[0].previous_output.txid);
@@ -6053,11 +6054,11 @@ mod tests {
 		let node_txn = nodes[2].tx_broadcaster.txn_broadcasted.lock().unwrap().clone(); // ChannelManager : 2 (commitment tx, HTLC-Success tx), ChannelMonitor : 1 (HTLC-Success tx)
 		assert_eq!(node_txn.len(), 3);
 		check_spends!(node_txn[0], commitment_tx[0].clone());
-		assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), 138);
+		assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
 		check_spends!(node_txn[1], chan_2.3.clone());
 		check_spends!(node_txn[2], node_txn[1].clone());
 		assert_eq!(node_txn[1].input[0].witness.clone().last().unwrap().len(), 71);
-		assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), 138);
+		assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
 
 		// Verify that B's ChannelManager is able to extract preimage from HTLC Success tx and pass it backward
 		nodes[1].chain_monitor.block_connected_with_filtering(&Block { header, txdata: node_txn}, 1);
@@ -6088,12 +6089,12 @@ mod tests {
 			assert_eq!(node_txn[0], node_txn[3]);
 			check_spends!(node_txn[0], commitment_tx[0].clone());
 			check_spends!(node_txn[3], commitment_tx[0].clone());
-			assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), 138);
-			assert_eq!(node_txn[3].input[0].witness.clone().last().unwrap().len(), 138);
+			assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
+			assert_eq!(node_txn[3].input[0].witness.clone().last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
 			check_spends!(node_txn[1], chan_2.3.clone());
 			check_spends!(node_txn[2], node_txn[1].clone());
 			assert_eq!(node_txn[1].input[0].witness.clone().last().unwrap().len(), 71);
-			assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), 133);
+			assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
 			node_txn.clear()
 		}
 
@@ -6112,9 +6113,9 @@ mod tests {
 		assert_eq!(node_txn.len(), 3);
 		assert_eq!(node_txn[0], node_txn[2]);
 		check_spends!(node_txn[0], commitment_tx[0].clone());
-		assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), 133);
+		assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
 		check_spends!(node_txn[2], commitment_tx[0].clone());
-		assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), 133);
+		assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
 		check_spends!(node_txn[1], chan_1.3.clone());
 		assert_eq!(node_txn[1].input[0].witness.clone().last().unwrap().len(), 71);
 		let commitment_tx = node_txn[1].clone();
@@ -6132,12 +6133,12 @@ mod tests {
 		assert_eq!(node_txn[0], node_txn[3]);
 		check_spends!(node_txn[0], commitment_tx.clone());
 		check_spends!(node_txn[3], commitment_tx.clone());
-		assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), 138);
-		assert_eq!(node_txn[3].input[0].witness.clone().last().unwrap().len(), 138);
+		assert_eq!(node_txn[0].input[0].witness.clone().last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
+		assert_eq!(node_txn[3].input[0].witness.clone().last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
 		check_spends!(node_txn[1], chan_1.3.clone());
 		check_spends!(node_txn[2], node_txn[1].clone());
 		assert_eq!(node_txn[1].input[0].witness.clone().last().unwrap().len(), 71);
-		assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), 133);
+		assert_eq!(node_txn[2].input[0].witness.clone().last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
 	}
 
 	#[test]
@@ -6207,15 +6208,15 @@ mod tests {
 			assert_eq!(node_txn[1], node_txn[6]);
 			assert_eq!(node_txn[2], node_txn[7]);
 			check_spends!(node_txn[0], commitment_tx[0].clone());
-			assert_eq!(node_txn[0].clone().input[0].witness.last().unwrap().len(), 138);
+			assert_eq!(node_txn[0].clone().input[0].witness.last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
 			check_spends!(node_txn[1], chan_2.3.clone());
 			check_spends!(node_txn[2], node_txn[1].clone());
 			assert_eq!(node_txn[1].clone().input[0].witness.last().unwrap().len(), 71);
-			assert_eq!(node_txn[2].clone().input[0].witness.last().unwrap().len(), 133);
+			assert_eq!(node_txn[2].clone().input[0].witness.last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
 			check_spends!(node_txn[3], chan_2.3.clone());
 			check_spends!(node_txn[4], node_txn[3].clone());
 			assert_eq!(node_txn[3].input[0].witness.clone().last().unwrap().len(), 71);
-			assert_eq!(node_txn[4].input[0].witness.clone().last().unwrap().len(), 133);
+			assert_eq!(node_txn[4].input[0].witness.clone().last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
 			timeout_tx = node_txn[0].clone();
 			node_txn.clear();
 		}
@@ -6260,11 +6261,11 @@ mod tests {
 		assert_eq!(node_txn.len(), 4);
 		assert_eq!(node_txn[0], node_txn[3]);
 		check_spends!(node_txn[0], commitment_tx[0].clone());
-		assert_eq!(node_txn[0].clone().input[0].witness.last().unwrap().len(), 138);
+		assert_eq!(node_txn[0].clone().input[0].witness.last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT);
 		check_spends!(node_txn[1], chan_1.3.clone());
 		check_spends!(node_txn[2], node_txn[1].clone());
 		assert_eq!(node_txn[1].clone().input[0].witness.last().unwrap().len(), 71);
-		assert_eq!(node_txn[2].clone().input[0].witness.last().unwrap().len(), 133);
+		assert_eq!(node_txn[2].clone().input[0].witness.last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT);
 	}
 
 	#[test]

src/ln/channelmonitor.rs

@@ -28,6 +28,7 @@ use secp256k1;
 use ln::msgs::{DecodeError, HandleError};
 use ln::chan_utils;
 use ln::chan_utils::HTLCOutputInCommitment;
+use ln::channel::{ACCEPTED_HTLC_SCRIPT_WEIGHT, OFFERED_HTLC_SCRIPT_WEIGHT};
 use chain::chaininterface::{ChainListener, ChainWatchInterface, BroadcasterInterface};
 use chain::transaction::OutPoint;
 use chain::keysinterface::SpendableOutputDescriptor;
@@ -1541,13 +1542,13 @@ impl ChannelMonitor {
 					}
 				}
 				if payment_data.1.is_some() {
-					if input.witness.len() == 5 && input.witness[4].len() == 138 {
+					if input.witness.len() == 5 && input.witness[4].len() == ACCEPTED_HTLC_SCRIPT_WEIGHT {
 						let mut payment_preimage = [0; 32];
 						for (arr, vec) in payment_preimage.iter_mut().zip(tx.input[0].witness[3].iter()) {
 							*arr = *vec;
 						}
 						payment_data = (Some(payment_preimage), payment_data.1);
-					} else if input.witness.len() == 3 && input.witness[2].len() == 133 {
+					} else if input.witness.len() == 3 && input.witness[2].len() == OFFERED_HTLC_SCRIPT_WEIGHT {
 						let mut payment_preimage = [0; 32];
 						for (arr, vec) in payment_preimage.iter_mut().zip(tx.input[0].witness[1].iter()) {
 							*arr = *vec;