aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-09 09:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

bkpr: invert channel + chain event printouts

Browse Source 
We now add chain events for starting channel balances, so print these
out with chain first then channel events.

Makes it less confusing for channel lease fee events.
This commit is contained in:
niftynei
2022-07-19 17:04:35 +09:30
committed by Rusty Russell
parent 8089f246c1
commit 307ea93592
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/bkpr/bookkeeper.c
View File

@@ -122,8 +122,8 @@ static struct command_result *json_list_account_events(struct command *cmd,
res = jsonrpc_stream_success(cmd);
json_array_start(res, "events");
for (size_t i = 0, j = 0, k = 0;
i < tal_count(channel_events)
|| j < tal_count(chain_events)
i < tal_count(chain_events)
|| j < tal_count(channel_events)
|| k < tal_count(onchain_fees);
/* Incrementing happens inside loop */) {
struct channel_event *chan;
@@ -131,42 +131,39 @@ static struct command_result *json_list_account_events(struct command *cmd,
struct onchain_fee *fee;
u64 lowest = 0;
if (i < tal_count(channel_events))
chan = channel_events[i];
else
chan = NULL;
if (j < tal_count(chain_events))
chain = chain_events[j];
if (i < tal_count(chain_events))
chain = chain_events[i];
else
chain = NULL;
if (j < tal_count(channel_events))
chan = channel_events[j];
else
chan = NULL;
if (k < tal_count(onchain_fees))
fee = onchain_fees[k];
else
fee = NULL;
if (chan)
lowest = chan->timestamp;
if (chain
&& (lowest == 0 || lowest > chain->timestamp))
if (chain)
lowest = chain->timestamp;
if (chan
&& (lowest == 0 || lowest > chan->timestamp))
lowest = chan->timestamp;
if (fee
&& (lowest == 0 || lowest > fee->timestamp))
lowest = fee->timestamp;
/* channel events first, then chain events, then fees.
* (channel events contain journal entries, which
* are the starting balance for accounts created
* before the accountant plugin was installed) */
if (chan && chan->timestamp == lowest) {
json_add_channel_event(res, chan);
/* chain events first, then channel events, then fees. */
if (chain && chain->timestamp == lowest) {
json_add_chain_event(res, chain);
i++;
continue;
}
if (chain && chain->timestamp == lowest) {
json_add_chain_event(res, chain);
if (chan && chan->timestamp == lowest) {
json_add_channel_event(res, chan);
j++;
continue;
}