From d9f2b37a050104a32345a260fdf93ad9017deab5 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 7 Aug 2015 12:45:20 +0930 Subject: [PATCH] commit_tx: remove to_me weirdness. It's a synonym for theirkey. Signed-off-by: Rusty Russell --- commit_tx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/commit_tx.c b/commit_tx.c index c321fe671..e1734b8c5 100644 --- a/commit_tx.c +++ b/commit_tx.c @@ -17,7 +17,7 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx, { struct bitcoin_tx *tx; const u8 *redeemscript; - struct pubkey ourkey, theirkey, to_me; + struct pubkey ourkey, theirkey; u32 locktime; /* Now create commitment tx: one input, two outputs. */ @@ -47,11 +47,9 @@ struct bitcoin_tx *create_commit_tx(const tal_t *ctx, tx->output[0].amount = to_us; /* Second output is a P2SH payment to them. */ - if (!proto_to_pubkey(theirs->final_key, &to_me)) - return tal_free(tx); tx->output[1].script = scriptpubkey_p2sh(ctx, bitcoin_redeem_single(ctx, - &to_me)); + &theirkey)); tx->output[1].script_length = tal_count(tx->output[1].script); tx->output[1].amount = to_them;