aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

utils: remove tal_tmpctx altogether, use global.

Browse Source 
In particular, we now only free tmpctx at the end of main().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-15 16:40:20 +10:30
parent 40fe5b7bac
commit 0a6e3d1e13
45 changed files with 115 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lightningd/onchain_control.c
View File

@@ -347,7 +347,6 @@ enum watch_result funding_spent(struct channel *channel,
u8 *msg;
struct bitcoin_txid our_last_txid;
struct htlc_stub *stubs;
const tal_t *tmpctx = tal_tmpctx(channel);
struct lightningd *ld = channel->peer->ld;
struct pubkey final_key;
@@ -369,14 +368,12 @@ enum watch_result funding_spent(struct channel *channel,
if (!channel->owner) {
log_broken(channel->log, "Could not subdaemon onchain: %s",
strerror(errno));
tal_free(tmpctx);
return KEEP_WATCHING;
}
stubs = wallet_htlc_stubs(tmpctx, ld->wallet, channel);
if (!stubs) {
log_broken(channel->log, "Could not load htlc_stubs");
tal_free(tmpctx);
return KEEP_WATCHING;
}
@@ -384,7 +381,6 @@ enum watch_result funding_spent(struct channel *channel,
channel->final_key_idx)) {
log_broken(channel->log, "Could not derive onchain key %"PRIu64,
channel->final_key_idx);
tal_free(tmpctx);
return KEEP_WATCHING;
}
/* This could be a mutual close, but it doesn't matter. */
@@ -434,7 +430,6 @@ enum watch_result funding_spent(struct channel *channel,
watch_tx_and_outputs(channel, tx);
tal_free(tmpctx);
/* We keep watching until peer finally deleted, for reorgs. */
return KEEP_WATCHING;
}