channeld: rename channel_splice_txs to channel_txs.
channel_txs was a thin wrapper around channel_splice_txs, but that's just confusing. Rename channel_splice_txs to channel_txs, and just call it everywhere. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
@@ -422,9 +422,10 @@ int main(int argc, char *argv[])
|
||||
if (!per_commit_point(&localseed, &local_per_commit_point, commitnum))
|
||||
errx(1, "Bad deriving local per-commitment-point");
|
||||
|
||||
local_txs = channel_txs(NULL, &htlcmap, NULL, &funding_wscript, channel,
|
||||
local_txs = channel_txs(NULL, &channel->funding, channel->funding_sats,
|
||||
&htlcmap, NULL, &funding_wscript, channel,
|
||||
&local_per_commit_point, commitnum,
|
||||
LOCAL);
|
||||
LOCAL, 0, 0);
|
||||
|
||||
printf("## local_commitment\n"
|
||||
"# input amount %s, funding_wscript %s, pubkey %s\n",
|
||||
@@ -532,9 +533,10 @@ int main(int argc, char *argv[])
|
||||
/* Create the remote commitment tx */
|
||||
if (!per_commit_point(&remoteseed, &remote_per_commit_point, commitnum))
|
||||
errx(1, "Bad deriving remote per-commitment-point");
|
||||
remote_txs = channel_txs(NULL, &htlcmap, NULL, &funding_wscript, channel,
|
||||
remote_txs = channel_txs(NULL, &channel->funding, channel->funding_sats,
|
||||
&htlcmap, NULL, &funding_wscript, channel,
|
||||
&remote_per_commit_point, commitnum,
|
||||
REMOTE);
|
||||
REMOTE, 0, 0);
|
||||
|
||||
printf("## remote_commitment\n"
|
||||
"# input amount %s, funding_wscript %s, key %s\n",
|
||||
|
||||
Reference in New Issue
Block a user