Skip to content

Commit

Permalink
channeld: remove onion objects.
Browse files Browse the repository at this point in the history
We don't actually process onion messages here any more (they moved to
connectd), but the flag and object files were still linked.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
rustyrussell committed Sep 29, 2022
1 parent 9cd2520 commit b19fd13
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions channeld/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ CHANNELD_COMMON_OBJS := \
common/memleak.o \
common/msg_queue.o \
common/node_id.o \
common/onion.o \
common/onionreply.o \
common/peer_billboard.o \
common/peer_failed.o \
Expand All @@ -78,7 +77,6 @@ CHANNELD_COMMON_OBJS := \
common/pseudorand.o \
common/read_peer_msg.o \
common/setup.o \
common/sphinx.o \
common/status.o \
common/status_wire.o \
common/subdaemon.o \
Expand Down
4 changes: 0 additions & 4 deletions channeld/channeld.c
Original file line number Diff line number Diff line change
Expand Up @@ -3802,9 +3802,6 @@ static void init_channel(struct peer *peer)
struct channel_type *channel_type;
u32 *dev_disable_commit; /* Always NULL */
bool dev_fast_gossip;
#if !DEVELOPER
bool dev_fail_process_onionpacket; /* Ignored */
#endif

assert(!(fcntl(MASTER_FD, F_GETFL) & O_NONBLOCK));

Expand Down Expand Up @@ -3867,7 +3864,6 @@ static void init_channel(struct peer *peer)
&remote_ann_bitcoin_sig,
&channel_type,
&dev_fast_gossip,
&dev_fail_process_onionpacket,
&dev_disable_commit,
&pbases,
&reestablish_only,
Expand Down
1 change: 0 additions & 1 deletion channeld/channeld_wire.csv
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ msgdata,channeld_init,remote_ann_node_sig,?secp256k1_ecdsa_signature,
msgdata,channeld_init,remote_ann_bitcoin_sig,?secp256k1_ecdsa_signature,
msgdata,channeld_init,desired_type,channel_type,
msgdata,channeld_init,dev_fast_gossip,bool,
msgdata,channeld_init,dev_fail_process_onionpacket,bool,
msgdata,channeld_init,dev_disable_commit,?u32,
msgdata,channeld_init,num_penalty_bases,u32,
msgdata,channeld_init,pbases,penalty_base,num_penalty_bases
Expand Down
1 change: 0 additions & 1 deletion lightningd/channel_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,6 @@ bool peer_start_channeld(struct channel *channel,
remote_ann_bitcoin_sig,
channel->type,
IFDEV(ld->dev_fast_gossip, false),
IFDEV(dev_fail_process_onionpacket, false),
IFDEV(ld->dev_disable_commit == -1
? NULL
: (u32 *)&ld->dev_disable_commit,
Expand Down

0 comments on commit b19fd13

Please sign in to comment.