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

openingd: use deconstructed read_peer_msg helpers.

Browse Source 
This is more verbose but I still think it's clearer.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-02 16:19:56 +09:30
parent 6b5462b637
commit 90b43a6f47
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
openingd/opening.c
View File

@@ -226,18 +226,25 @@ static void temporary_channel_id(struct channel_id *channel_id)
}
/* Handle random messages we might get, returning the first non-handled one. */
static u8 *opening_read_peer_msg(struct state *state)
static u8 *opening_read_peer_msg(const tal_t *ctx, struct state *state)
{
for (;;) {
u8 *msg;
bool from_gossipd;
while ((msg = read_peer_msg(state, &state->cs,
&state->channel_id,
sync_crypto_write_arg,
state)) == NULL)
clean_tmpctx();
msg = peer_or_gossip_sync_read(ctx, PEER_FD, GOSSIP_FD,
&state->cs, &from_gossipd);
if (from_gossipd) {
handle_gossip_msg(msg, &state->cs, sync_crypto_write_arg,
NULL);
continue;
}
if (!handle_peer_gossip_or_error(PEER_FD, GOSSIP_FD, &state->cs,
&state->channel_id, msg))
return msg;
}
}
static u8 *funder_channel(struct state *state,
const struct pubkey *our_funding_pubkey,
@@ -303,7 +310,7 @@ static u8 *funder_channel(struct state *state,
peer_billboard(false,
"Funding channel: offered, now waiting for accept_channel");
msg = opening_read_peer_msg(state);
msg = opening_read_peer_msg(tmpctx, state);
/* BOLT #2:
*
@@ -470,7 +477,7 @@ static u8 *funder_channel(struct state *state,
peer_billboard(false,
"Funding channel: create first tx, now waiting for their signature");
msg = opening_read_peer_msg(state);
msg = opening_read_peer_msg(tmpctx, state);
if (!fromwire_funding_signed(msg, &id_in, &sig))
peer_failed(&state->cs,
@@ -693,7 +700,7 @@ static u8 *fundee_channel(struct state *state,
peer_billboard(false,
"Incoming channel: accepted, now waiting for them to create funding tx");
msg = opening_read_peer_msg(state);
msg = opening_read_peer_msg(tmpctx, state);
if (!fromwire_funding_created(msg, &id_in,
&state->funding_txid,