diff --git a/channeld/Makefile b/channeld/Makefile index 1b9a7317c200..5e98db2f0147 100644 --- a/channeld/Makefile +++ b/channeld/Makefile @@ -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 \ @@ -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 \ diff --git a/channeld/channeld.c b/channeld/channeld.c index ef6400565d14..3e3bffea955e 100644 --- a/channeld/channeld.c +++ b/channeld/channeld.c @@ -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)); @@ -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, diff --git a/channeld/channeld_wire.csv b/channeld/channeld_wire.csv index 8827fa7b8cd1..f4b60fe8b75f 100644 --- a/channeld/channeld_wire.csv +++ b/channeld/channeld_wire.csv @@ -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 diff --git a/lightningd/channel_control.c b/lightningd/channel_control.c index 5d4873d8c5ad..9bfcf9310990 100644 --- a/lightningd/channel_control.c +++ b/lightningd/channel_control.c @@ -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,