@@ -1308,18 +1308,21 @@ fn test_duplicate_htlc_different_direction_onchain() {
1308
1308
1309
1309
let chan_1 = create_announced_chan_between_nodes(&nodes, 0, 1);
1310
1310
1311
+ let payment_value_sats = 546;
1312
+ let payment_value_msats = payment_value_sats * 1000;
1313
+
1311
1314
// balancing
1312
1315
send_payment(&nodes[0], &vec!(&nodes[1])[..], 8000000);
1313
1316
1314
1317
let (payment_preimage, payment_hash, ..) = route_payment(&nodes[0], &vec!(&nodes[1])[..], 900_000);
1315
1318
1316
- let (route, _, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], 800_000 );
1319
+ let (route, _, _, _) = get_route_and_payment_hash!(nodes[1], nodes[0], payment_value_msats );
1317
1320
let node_a_payment_secret = nodes[0].node.create_inbound_payment_for_hash(payment_hash, None, 7200, None).unwrap();
1318
- send_along_route_with_secret(&nodes[1], route, &[&[&nodes[0]]], 800_000 , payment_hash, node_a_payment_secret);
1321
+ send_along_route_with_secret(&nodes[1], route, &[&[&nodes[0]]], payment_value_msats , payment_hash, node_a_payment_secret);
1319
1322
1320
1323
// Provide preimage to node 0 by claiming payment
1321
1324
nodes[0].node.claim_funds(payment_preimage);
1322
- expect_payment_claimed!(nodes[0], payment_hash, 800_000 );
1325
+ expect_payment_claimed!(nodes[0], payment_hash, payment_value_msats );
1323
1326
check_added_monitors!(nodes[0], 1);
1324
1327
1325
1328
// Broadcast node 1 commitment txn
@@ -1328,7 +1331,7 @@ fn test_duplicate_htlc_different_direction_onchain() {
1328
1331
assert_eq!(remote_txn[0].output.len(), 4); // 1 local, 1 remote, 1 htlc inbound, 1 htlc outbound
1329
1332
let mut has_both_htlcs = 0; // check htlcs match ones committed
1330
1333
for outp in remote_txn[0].output.iter() {
1331
- if outp.value.to_sat() == 800_000 / 1000 {
1334
+ if outp.value.to_sat() == payment_value_sats {
1332
1335
has_both_htlcs += 1;
1333
1336
} else if outp.value.to_sat() == 900_000 / 1000 {
1334
1337
has_both_htlcs += 1;
@@ -1342,24 +1345,22 @@ fn test_duplicate_htlc_different_direction_onchain() {
1342
1345
connect_blocks(&nodes[0], TEST_FINAL_CLTV); // Confirm blocks until the HTLC expires
1343
1346
1344
1347
let claim_txn = nodes[0].tx_broadcaster.txn_broadcasted.lock().unwrap().clone();
1345
- assert_eq!(claim_txn.len(), 3);
1348
+ assert!(claim_txn.len() >= 3);
1349
+ assert!(claim_txn.len() <= 5);
1346
1350
1347
1351
check_spends!(claim_txn[0], remote_txn[0]); // Immediate HTLC claim with preimage
1348
1352
check_spends!(claim_txn[1], remote_txn[0]);
1349
1353
check_spends!(claim_txn[2], remote_txn[0]);
1350
1354
let preimage_tx = &claim_txn[0];
1351
- let (preimage_bump_tx, timeout_tx) = if claim_txn[1].input[0].previous_output == preimage_tx.input[0].previous_output {
1352
- (&claim_txn[1], &claim_txn[2])
1353
- } else {
1354
- (&claim_txn[2], &claim_txn[1])
1355
- };
1355
+ let timeout_tx = claim_txn.iter().skip(1).find(|t| t.input[0].previous_output != preimage_tx.input[0].previous_output).unwrap();
1356
+ let preimage_bump_tx = claim_txn.iter().skip(1).find(|t| t.input[0].previous_output == preimage_tx.input[0].previous_output).unwrap();
1356
1357
1357
1358
assert_eq!(preimage_tx.input.len(), 1);
1358
1359
assert_eq!(preimage_bump_tx.input.len(), 1);
1359
1360
1360
1361
assert_eq!(preimage_tx.input.len(), 1);
1361
1362
assert_eq!(preimage_tx.input[0].witness.last().unwrap().len(), OFFERED_HTLC_SCRIPT_WEIGHT); // HTLC 1 <--> 0, preimage tx
1362
- assert_eq!(remote_txn[0].output[preimage_tx.input[0].previous_output.vout as usize].value.to_sat(), 800 );
1363
+ assert_eq!(remote_txn[0].output[preimage_tx.input[0].previous_output.vout as usize].value.to_sat(), payment_value_sats );
1363
1364
1364
1365
assert_eq!(timeout_tx.input.len(), 1);
1365
1366
assert_eq!(timeout_tx.input[0].witness.last().unwrap().len(), ACCEPTED_HTLC_SCRIPT_WEIGHT); // HTLC 0 <--> 1, timeout tx
0 commit comments