Skip to content

Commit

Permalink
subd: remove "swap" methods
Browse files Browse the repository at this point in the history
only needed for moving the subd->channel from an uncommitted_channel to
a channel; we removed uncommitted_channel from dual_open so it's no
longer necessary
  • Loading branch information
niftynei authored and vibhaa committed Mar 24, 2021
1 parent 82784b1 commit 492ac13
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 40 deletions.
15 changes: 0 additions & 15 deletions lightningd/subd.c
Original file line number Diff line number Diff line change
Expand Up @@ -823,21 +823,6 @@ void subd_release_channel(struct subd *owner, void *channel)
}
}

void subd_swap_channel_(struct subd *daemon, void *channel,
void (*errcb)(void *channel,
struct per_peer_state *pps,
const struct channel_id *channel_id,
const char *desc,
bool warning,
const u8 *err_for_them),
void (*billboardcb)(void *channel, bool perm,
const char *happenings))
{
daemon->channel = channel;
daemon->errcb = errcb;
daemon->billboardcb = billboardcb;
}

#if DEVELOPER
char *opt_subd_dev_disconnect(const char *optarg, struct lightningd *ld)
{
Expand Down
25 changes: 0 additions & 25 deletions lightningd/subd.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,31 +146,6 @@ struct subd *new_channel_subd_(struct lightningd *ld,
const char *), \
__VA_ARGS__)

/* subd_swap_channel - Swap the daemon's channel out */
#define subd_swap_channel(subd, channel, errcb, billboardcb) \
subd_swap_channel_((subd), (channel), \
typesafe_cb_postargs(void, void *, \
(errcb), \
(channel), \
struct per_peer_state *,\
const struct channel_id *, \
const char *, bool, \
const u8 *), \
typesafe_cb_postargs(void, void *, (billboardcb), \
(channel), bool, \
const char *))

void subd_swap_channel_(struct subd *daemon, void *channel,
void (*errcb)(void *channel,
struct per_peer_state *pps,
const struct channel_id *channel_id,
const char *desc,
bool warning,
const u8 *err_for_them),
void (*billboardcb)(void *channel, bool perm,
const char *happenings));


/**
* subd_send_msg - queue a message to the subdaemon.
* @sd: subdaemon to request
Expand Down

0 comments on commit 492ac13

Please sign in to comment.