|
|
@ -519,10 +519,10 @@ int main(void) |
|
|
|
local_config->dust_limit, |
|
|
|
to_local, |
|
|
|
to_remote, |
|
|
|
NULL, &htlc_map, 0x2bb038521914 ^ 42, LOCAL); |
|
|
|
NULL, &htlc_map, NULL, 0x2bb038521914 ^ 42, LOCAL); |
|
|
|
|
|
|
|
txs = channel_txs(tmpctx, |
|
|
|
&htlc_map, &funding_wscript_alt, |
|
|
|
&htlc_map, NULL, &funding_wscript_alt, |
|
|
|
lchannel, &local_per_commitment_point, 42, LOCAL); |
|
|
|
assert(tal_count(txs) == 1); |
|
|
|
assert(tal_count(htlc_map) == 2); |
|
|
@ -530,7 +530,7 @@ int main(void) |
|
|
|
tx_must_be_eq(txs[0], raw_tx); |
|
|
|
|
|
|
|
txs2 = channel_txs(tmpctx, |
|
|
|
&htlc_map, &funding_wscript, |
|
|
|
&htlc_map, NULL, &funding_wscript, |
|
|
|
rchannel, &local_per_commitment_point, 42, REMOTE); |
|
|
|
txs_must_be_eq(txs, txs2); |
|
|
|
|
|
|
@ -557,10 +557,10 @@ int main(void) |
|
|
|
assert(lchannel->view[REMOTE].owed[REMOTE].millisatoshis |
|
|
|
== rchannel->view[LOCAL].owed[LOCAL].millisatoshis); |
|
|
|
|
|
|
|
txs = channel_txs(tmpctx, &htlc_map, &funding_wscript, |
|
|
|
txs = channel_txs(tmpctx, &htlc_map, NULL, &funding_wscript, |
|
|
|
lchannel, &local_per_commitment_point, 42, LOCAL); |
|
|
|
assert(tal_count(txs) == 1); |
|
|
|
txs2 = channel_txs(tmpctx, &htlc_map, &funding_wscript, |
|
|
|
txs2 = channel_txs(tmpctx, &htlc_map, NULL, &funding_wscript, |
|
|
|
rchannel, &local_per_commitment_point, 42, REMOTE); |
|
|
|
txs_must_be_eq(txs, txs2); |
|
|
|
|
|
|
@ -575,10 +575,10 @@ int main(void) |
|
|
|
assert(lchannel->view[REMOTE].owed[REMOTE].millisatoshis |
|
|
|
== rchannel->view[LOCAL].owed[LOCAL].millisatoshis); |
|
|
|
|
|
|
|
txs = channel_txs(tmpctx, &htlc_map, &funding_wscript, |
|
|
|
txs = channel_txs(tmpctx, &htlc_map, NULL, &funding_wscript, |
|
|
|
lchannel, &local_per_commitment_point, 42, LOCAL); |
|
|
|
assert(tal_count(txs) == 6); |
|
|
|
txs2 = channel_txs(tmpctx, &htlc_map, &funding_wscript, |
|
|
|
txs2 = channel_txs(tmpctx, &htlc_map, NULL, &funding_wscript, |
|
|
|
rchannel, &local_per_commitment_point, 42, REMOTE); |
|
|
|
txs_must_be_eq(txs, txs2); |
|
|
|
|
|
|
@ -641,15 +641,15 @@ int main(void) |
|
|
|
tmpctx, &funding_txid, funding_output_index, |
|
|
|
funding_amount, LOCAL, remote_config->to_self_delay, |
|
|
|
&keyset, feerate_per_kw[LOCAL], local_config->dust_limit, |
|
|
|
to_local, to_remote, htlcs, &htlc_map, 0x2bb038521914 ^ 42, |
|
|
|
LOCAL); |
|
|
|
to_local, to_remote, htlcs, &htlc_map, NULL, |
|
|
|
0x2bb038521914 ^ 42, LOCAL); |
|
|
|
|
|
|
|
txs = channel_txs(tmpctx, &htlc_map, &funding_wscript, |
|
|
|
txs = channel_txs(tmpctx, &htlc_map, NULL, &funding_wscript, |
|
|
|
lchannel, &local_per_commitment_point, 42, |
|
|
|
LOCAL); |
|
|
|
tx_must_be_eq(txs[0], raw_tx); |
|
|
|
|
|
|
|
txs2 = channel_txs(tmpctx, &htlc_map, &funding_wscript, |
|
|
|
txs2 = channel_txs(tmpctx, &htlc_map, NULL, &funding_wscript, |
|
|
|
rchannel, &local_per_commitment_point, |
|
|
|
42, REMOTE); |
|
|
|
txs_must_be_eq(txs, txs2); |
|
|
|