From bcce29eeb024554e1cfe3b2e2b4d7792ebb8fa90 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 20 Jan 2026 14:56:26 +1030 Subject: [PATCH] connectd: remove unused flag to connect_init. We haven't announced websocket addresses for some time! Signed-off-by: Rusty Russell --- connectd/connectd.c | 1 - connectd/connectd.h | 3 --- connectd/connectd_wire.csv | 1 - lightningd/connect_control.c | 1 - 4 files changed, 6 deletions(-) diff --git a/connectd/connectd.c b/connectd/connectd.c index 90cbc30cf..93fea082c 100644 --- a/connectd/connectd.c +++ b/connectd/connectd.c @@ -1652,7 +1652,6 @@ static void connect_init(struct daemon *daemon, const u8 *msg) &tor_password, &daemon->timeout_secs, &daemon->websocket_helper, - &daemon->announce_websocket, &daemon->dev_fast_gossip, &dev_disconnect, &daemon->dev_no_ping_timer, diff --git a/connectd/connectd.h b/connectd/connectd.h index 1e78834ba..41a86cd10 100644 --- a/connectd/connectd.h +++ b/connectd/connectd.h @@ -338,9 +338,6 @@ struct daemon { u32 gossip_recent_time; struct gossmap_iter *gossmap_iter_recent; - /* We only announce websocket addresses if !deprecated_apis */ - bool announce_websocket; - /* Shutting down, don't send new stuff */ bool shutting_down; diff --git a/connectd/connectd_wire.csv b/connectd/connectd_wire.csv index d3af2709d..4b4d54577 100644 --- a/connectd/connectd_wire.csv +++ b/connectd/connectd_wire.csv @@ -18,7 +18,6 @@ msgdata,connectd_init,use_dns,bool, msgdata,connectd_init,tor_password,wirestring, msgdata,connectd_init,timeout_secs,u32, msgdata,connectd_init,websocket_helper,wirestring, -msgdata,connectd_init,announce_websocket,bool, msgdata,connectd_init,dev_fast_gossip,bool, # If this is set, then fd 5 is dev_disconnect_fd. msgdata,connectd_init,dev_disconnect,bool, diff --git a/lightningd/connect_control.c b/lightningd/connect_control.c index 611b5ba26..ae0bde7a3 100644 --- a/lightningd/connect_control.c +++ b/lightningd/connect_control.c @@ -711,7 +711,6 @@ int connectd_init(struct lightningd *ld) ld->tor_service_password ? ld->tor_service_password : "", ld->config.connection_timeout_secs, websocket_helper_path, - !ld->deprecated_ok, ld->dev_fast_gossip, ld->dev_disconnect_fd >= 0, ld->dev_no_ping_timer,