f - fix tests running with --no-default-features

Author: jkczyz

lightning/src/ln/channel.rs

@@ -17432,7 +17432,7 @@ mod tests {
 		// splice initiator
 		assert_eq!(
 			estimate_v2_funding_transaction_fee(&one_input, &[], true, true, 2000),
-			1738,
+			if cfg!(feature = "grind_signatures") { 1738 } else { 1740 },
 		);
 
 		// splice acceptor
@@ -17462,40 +17462,46 @@ mod tests {
 		use crate::ln::channel::check_v2_funding_inputs_sufficient;
 
 		// positive case, inputs well over intended contribution
-		assert_eq!(
-			check_v2_funding_inputs_sufficient(
-				220_000,
-				&[
-					funding_input_sats(200_000),
-					funding_input_sats(100_000),
-				],
-				true,
-				true,
-				2000,
-			).unwrap(),
-			2282,
-		);
+		{
+			let expected_fee = if cfg!(feature = "grind_signatures") { 2282 } else { 2284 };
+			assert_eq!(
+				check_v2_funding_inputs_sufficient(
+					220_000,
+					&[
+						funding_input_sats(200_000),
+						funding_input_sats(100_000),
+					],
+					true,
+					true,
+					2000,
+				).unwrap(),
+				expected_fee,
+			);
+		}
 
 		// negative case, inputs clearly insufficient
 		{
-			let res = check_v2_funding_inputs_sufficient(
-				220_000,
-				&[
-					funding_input_sats(100_000),
-				],
-				true,
-				true,
-				2000,
-			);
+			let expected_fee = if cfg!(feature = "grind_signatures") { 1738 } else { 1740 };
 			assert_eq!(
-				res.err().unwrap(),
-				"Total input amount 100000 is lower than needed for contribution 220000, considering fees of 1738. Need more inputs.",
+				check_v2_funding_inputs_sufficient(
+					220_000,
+					&[
+						funding_input_sats(100_000),
+					],
+					true,
+					true,
+					2000,
+				),
+				Err(format!(
+					"Total input amount 100000 is lower than needed for contribution 220000, considering fees of {}. Need more inputs.",
+					expected_fee,
+				)),
 			);
 		}
 
 		// barely covers
 		{
-			let expected_fee: u64 = 2282;
+			let expected_fee = if cfg!(feature = "grind_signatures") { 2282 } else { 2284 };
 			assert_eq!(
 				check_v2_funding_inputs_sufficient(
 					(300_000 - expected_fee - 20) as i64,
@@ -17513,25 +17519,28 @@ mod tests {
 
 		// higher fee rate, does not cover
 		{
-			let res = check_v2_funding_inputs_sufficient(
-				298032,
-				&[
-					funding_input_sats(200_000),
-					funding_input_sats(100_000),
-				],
-				true,
-				true,
-				2200,
-			);
+			let expected_fee = if cfg!(feature = "grind_signatures") { 2511 } else { 2513 };
 			assert_eq!(
-				res.err().unwrap(),
-				"Total input amount 300000 is lower than needed for contribution 298032, considering fees of 2511. Need more inputs.",
+				check_v2_funding_inputs_sufficient(
+					298032,
+					&[
+						funding_input_sats(200_000),
+						funding_input_sats(100_000),
+					],
+					true,
+					true,
+					2200,
+				),
+				Err(format!(
+					"Total input amount 300000 is lower than needed for contribution 298032, considering fees of {}. Need more inputs.",
+					expected_fee
+				)),
 			);
 		}
 
-		// barely covers, less fees (no extra weight, no init)
+		// barely covers, less fees (no extra weight, not initiator)
 		{
-			let expected_fee: u64 = 1088;
+			let expected_fee = 1088;
 			assert_eq!(
 				check_v2_funding_inputs_sufficient(
 					(300_000 - expected_fee - 20) as i64,