Add unit test coverage for package::weight_received_htlc

Author: ksedgwic

lightning/src/chain/package.rs

@@ -842,7 +842,7 @@ fn feerate_bump<F: Deref, L: Deref>(predicted_weight: usize, input_amounts: u64,
 
 #[cfg(test)]
 mod tests {
-	use chain::package::{CounterpartyReceivedHTLCOutput, HolderHTLCOutput, PackageTemplate, PackageSolvingData, RevokedOutput, WEIGHT_REVOKED_OUTPUT};
+	use chain::package::{CounterpartyReceivedHTLCOutput, HolderHTLCOutput, PackageTemplate, PackageSolvingData, RevokedOutput, WEIGHT_REVOKED_OUTPUT, weight_received_htlc};
 	use chain::Txid;
 	use ln::chan_utils::HTLCOutputInCommitment;
 	use ln::{PaymentPreimage, PaymentHash};
@@ -1042,13 +1042,25 @@ mod tests {
 	fn test_package_weight() {
 		let txid = Txid::from_hex("c2d4449afa8d26140898dd54d3390b057ba2a5afcf03ba29d7dc0d8b9ffe966e").unwrap();
 		let secp_ctx = Secp256k1::new();
-		let revk_outp = dumb_revk_output!(secp_ctx);
 
-		let package = PackageTemplate::build_package(txid, 0, revk_outp, 0, true, 100);
-		// (nVersion (4) + nLocktime (4) + count_tx_in (1) + prevout (36) + sequence (4) + script_length (1) + count_tx_out (1) + value (8) + var_int (1)) * WITNESS_SCALE_FACTOR
-		// + witness marker (2) + WEIGHT_REVOKED_OUTPUT
-		for &opt_anchors in [false, true].iter() {
-			assert_eq!(package.package_weight(&Script::new(), opt_anchors), (4 + 4 + 1 + 36 + 4 + 1 + 1 + 8 + 1) * WITNESS_SCALE_FACTOR + 2 + WEIGHT_REVOKED_OUTPUT as usize);
+		{
+			let revk_outp = dumb_revk_output!(secp_ctx);
+			let package = PackageTemplate::build_package(txid, 0, revk_outp, 0, true, 100);
+			// (nVersion (4) + nLocktime (4) + count_tx_in (1) + prevout (36) + sequence (4) + script_length (1) + count_tx_out (1) + value (8) + var_int (1)) * WITNESS_SCALE_FACTOR
+			// + witness marker (2) + WEIGHT_REVOKED_OUTPUT
+			for &opt_anchors in [false, true].iter() {
+				assert_eq!(package.package_weight(&Script::new(), opt_anchors), (4 + 4 + 1 + 36 + 4 + 1 + 1 + 8 + 1) * WITNESS_SCALE_FACTOR + 2 + WEIGHT_REVOKED_OUTPUT as usize);
+			}
+		}
+
+		{
+			let counterparty_outp = dumb_counterparty_output!(secp_ctx, 1_000_000);
+			let package = PackageTemplate::build_package(txid, 0, counterparty_outp, 1000, true, 100);
+			// (nVersion (4) + nLocktime (4) + count_tx_in (1) + prevout (36) + sequence (4) + script_length (1) + count_tx_out (1) + value (8) + var_int (1)) * WITNESS_SCALE_FACTOR
+			// + witness marker (2) + weight_received_htlc(opt_anchors)
+			for &opt_anchors in [false, true].iter() {
+				assert_eq!(package.package_weight(&Script::new(), opt_anchors), (4 + 4 + 1 + 36 + 4 + 1 + 1 + 8 + 1) * WITNESS_SCALE_FACTOR + 2 + weight_received_htlc(opt_anchors) as usize);
+			}
 		}
 	}
 }