Browse Source

gather_updates: fix rebase error.

Didn't update amount field in d00eeded9f.
Didn't compile test either :(

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 9 years ago
parent
commit
f0cab4e74b
  1. 4
      test-cli/gather_updates.c

4
test-cli/gather_updates.c

@ -204,7 +204,7 @@ struct channel_state *gather_updates(const tal_t *ctx,
pkt->update_routefail_htlc->r_hash); pkt->update_routefail_htlc->r_hash);
if (n == tal_count(cstate->a.htlcs)) if (n == tal_count(cstate->a.htlcs))
errx(1, "Unknown R hash in %s", *argv); errx(1, "Unknown R hash in %s", *argv);
amount = cstate->a.htlcs[n]->amount; amount = cstate->a.htlcs[n]->amount_msat;
if (!funding_delta(o1, o2, oa, 0, -amount, if (!funding_delta(o1, o2, oa, 0, -amount,
&cstate->a, &cstate->b)) &cstate->a, &cstate->b))
errx(1, "Impossible htlc %llu %s", errx(1, "Impossible htlc %llu %s",
@ -215,7 +215,7 @@ struct channel_state *gather_updates(const tal_t *ctx,
pkt->update_routefail_htlc->r_hash); pkt->update_routefail_htlc->r_hash);
if (n == tal_count(cstate->b.htlcs)) if (n == tal_count(cstate->b.htlcs))
errx(1, "Unknown R hash in %s", *argv); errx(1, "Unknown R hash in %s", *argv);
amount = cstate->b.htlcs[n]->amount; amount = cstate->b.htlcs[n]->amount_msat;
if (!funding_delta(o2, o1, oa, 0, -amount, if (!funding_delta(o2, o1, oa, 0, -amount,
&cstate->b, &cstate->a)) &cstate->b, &cstate->a))
errx(1, "Impossible htlc %llu %s", errx(1, "Impossible htlc %llu %s",

Loading…
Cancel
Save