Browse Source

chore: cleanup some nits

rearranges the`peer_connected_hook_payload` definition to the location
where this is used in the file.

Fixes certain blanklines and linebreaks to make the code look nicer.
master
Michael Schmoock 4 years ago
committed by Rusty Russell
parent
commit
9eeb290637
  1. 38
      lightningd/peer_control.c

38
lightningd/peer_control.c

@ -437,15 +437,6 @@ void channel_errmsg(struct channel *channel,
err_for_them ? "sent" : "received", desc); err_for_them ? "sent" : "received", desc);
} }
struct peer_connected_hook_payload {
struct lightningd *ld;
struct channel *channel;
struct wireaddr_internal addr;
struct peer *peer;
struct per_peer_state *pps;
u8 *error;
};
static void json_add_htlcs(struct lightningd *ld, static void json_add_htlcs(struct lightningd *ld,
struct json_stream *response, struct json_stream *response,
const struct channel *channel) const struct channel *channel)
@ -933,6 +924,15 @@ static void json_add_channel(struct lightningd *ld,
json_object_end(response); json_object_end(response);
} }
struct peer_connected_hook_payload {
struct lightningd *ld;
struct channel *channel;
struct wireaddr_internal addr;
struct peer *peer;
struct per_peer_state *pps;
u8 *error;
};
static void static void
peer_connected_serialize(struct peer_connected_hook_payload *payload, peer_connected_serialize(struct peer_connected_hook_payload *payload,
struct json_stream *stream) struct json_stream *stream)
@ -978,8 +978,7 @@ static void peer_connected_hook_final(struct peer_connected_hook_payload *payloa
#if DEVELOPER #if DEVELOPER
if (dev_disconnect_permanent(ld)) { if (dev_disconnect_permanent(ld)) {
channel_fail_permanent(channel, channel_fail_permanent(channel, REASON_LOCAL,
REASON_LOCAL,
"dev_disconnect permfail"); "dev_disconnect permfail");
error = channel->error; error = channel->error;
goto send_error; goto send_error;
@ -1008,11 +1007,8 @@ static void peer_connected_hook_final(struct peer_connected_hook_payload *payloa
case DUALOPEND_AWAITING_LOCKIN: case DUALOPEND_AWAITING_LOCKIN:
#if EXPERIMENTAL_FEATURES #if EXPERIMENTAL_FEATURES
assert(!channel->owner); assert(!channel->owner);
channel->peer->addr = addr; channel->peer->addr = addr;
peer_restart_dualopend(peer, payload->pps, peer_restart_dualopend(peer, payload->pps, channel, NULL);
channel, NULL);
return; return;
#else #else
abort(); abort();
@ -1021,18 +1017,14 @@ static void peer_connected_hook_final(struct peer_connected_hook_payload *payloa
case CHANNELD_NORMAL: case CHANNELD_NORMAL:
case CHANNELD_SHUTTING_DOWN: case CHANNELD_SHUTTING_DOWN:
assert(!channel->owner); assert(!channel->owner);
channel->peer->addr = addr; channel->peer->addr = addr;
peer_start_channeld(channel, payload->pps, peer_start_channeld(channel, payload->pps, NULL, true);
NULL, true);
return; return;
case CLOSINGD_SIGEXCHANGE: case CLOSINGD_SIGEXCHANGE:
assert(!channel->owner); assert(!channel->owner);
channel->peer->addr = addr; channel->peer->addr = addr;
peer_start_closingd(channel, payload->pps, peer_start_closingd(channel, payload->pps, true, NULL);
true, NULL);
return; return;
} }
abort(); abort();
@ -1052,12 +1044,10 @@ send_error:
* dualopend. we only get here if there's an error */ * dualopend. we only get here if there's an error */
if (channel) { if (channel) {
assert(!channel->owner); assert(!channel->owner);
assert(channel->state == DUALOPEND_OPEN_INIT assert(channel->state == DUALOPEND_OPEN_INIT
|| channel->state == DUALOPEND_AWAITING_LOCKIN); || channel->state == DUALOPEND_AWAITING_LOCKIN);
channel->peer->addr = addr; channel->peer->addr = addr;
peer_restart_dualopend(peer, payload->pps, peer_restart_dualopend(peer, payload->pps, channel, error);
channel, error);
} else } else
peer_start_dualopend(peer, payload->pps, error); peer_start_dualopend(peer, payload->pps, error);
} else } else

Loading…
Cancel
Save