gossipd: remove gossip_msg.[ch]

This was a remnant from when we used to get routing from gossipd.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

channeld/Makefile

@@ -92,7 +92,6 @@ CHANNELD_COMMON_OBJS :=				\
 	common/wireaddr.o			\
 	gossipd/gossipd_peerd_wiregen.o		\
 	gossipd/gossip_store_wiregen.o		\
-	lightningd/gossip_msg.o			\
 	wire/fromwire.o				\
 	wire/towire.o
 

connectd/Makefile

@@ -71,7 +71,6 @@ CONNECTD_COMMON_OBJS :=				\
 	common/wireaddr.o			\
 	common/wire_error.o			\
 	gossipd/gossipd_wiregen.o		\
-	lightningd/gossip_msg.o			\
 	wire/onion$(EXP)_wiregen.o
 
 lightningd/lightning_connectd: $(CONNECTD_OBJS) $(CONNECTD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS)

connectd/connectd.c

@@ -10,7 +10,9 @@
 #include "config.h"
 #include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
+#include <ccan/crypto/siphash24/siphash24.h>
 #include <ccan/fdpass/fdpass.h>
+#include <ccan/htable/htable_type.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>

connectd/connectd_wire.csv

@@ -1,8 +1,9 @@
+#include <bitcoin/block.h>
 #include <common/cryptomsg.h>
 #include <common/features.h>
+#include <common/node_id.h>
 #include <common/per_peer_state.h>
 #include <common/wireaddr.h>
-#include <lightningd/gossip_msg.h>
 
 msgtype,connectd_init,2000
 msgdata,connectd_init,chainparams,chainparams,

gossipd/Makefile

@@ -75,7 +75,6 @@ GOSSIPD_COMMON_OBJS :=				\
 	common/wireaddr.o			\
 	common/wire_error.o			\
 	connectd/connectd_gossipd_wiregen.o	\
-	lightningd/gossip_msg.o			\
 	wire/onion$(EXP)_wiregen.o
 
 lightningd/lightning_gossipd: $(GOSSIPD_OBJS) $(GOSSIPD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS)

gossipd/gossipd.c

@@ -34,8 +34,8 @@
 #include <gossipd/gossipd_peerd_wiregen.h>
 #include <gossipd/gossipd_wiregen.h>
 #include <gossipd/queries.h>
+#include <gossipd/routing.h>
 #include <gossipd/seeker.h>
-#include <lightningd/gossip_msg.h>
 #include <sodium/crypto_aead_chacha20poly1305.h>
 
 /*~ A channel consists of a `struct half_chan` for each direction, each of

lightningd/Makefile

@@ -11,7 +11,6 @@ LIGHTNINGD_SRC :=				\
 	lightningd/connect_control.c		\
 	lightningd/onion_message.c		\
 	lightningd/gossip_control.c		\
-	lightningd/gossip_msg.c			\
 	lightningd/hsm_control.c		\
 	lightningd/htlc_end.c			\
 	lightningd/htlc_set.c			\

lightningd/gossip_msg.c

@@ -1,24 +0,0 @@
-#include "config.h"
-#include <ccan/array_size/array_size.h>
-#include <common/bolt11.h>
-#include <common/wireaddr.h>
-#include <lightningd/gossip_msg.h>
-#include <wire/peer_wire.h>
-
-void fromwire_route_info(const u8 **pptr, size_t *max, struct route_info *entry)
-{
-	fromwire_node_id(pptr, max, &entry->pubkey);
-	fromwire_short_channel_id(pptr, max, &entry->short_channel_id);
-	entry->fee_base_msat = fromwire_u32(pptr, max);
-	entry->fee_proportional_millionths = fromwire_u32(pptr, max);
-	entry->cltv_expiry_delta = fromwire_u16(pptr, max);
-}
-
-void towire_route_info(u8 **pptr, const struct route_info *entry)
-{
-	towire_node_id(pptr, &entry->pubkey);
-	towire_short_channel_id(pptr, &entry->short_channel_id);
-	towire_u32(pptr, entry->fee_base_msat);
-	towire_u32(pptr, entry->fee_proportional_millionths);
-	towire_u16(pptr, entry->cltv_expiry_delta);
-}

lightningd/gossip_msg.h

@@ -1,44 +0,0 @@
-#ifndef LIGHTNING_LIGHTNINGD_GOSSIP_MSG_H
-#define LIGHTNING_LIGHTNINGD_GOSSIP_MSG_H
-#include "config.h"
-#include <bitcoin/pubkey.h>
-#include <gossipd/routing.h>
-
-struct route_info;
-struct lease_rates;
-
-struct gossip_getnodes_entry {
-	struct node_id nodeid;
-	s64 last_timestamp; /* -1 means never: following fields ignored */
-	u8 *features;
-	struct wireaddr *addresses;
-	u8 alias[32];
-	u8 color[3];
-	struct lease_rates *rates;
-};
-
-struct gossip_halfchannel_entry {
-	u8 message_flags;
-	u8 channel_flags;
-	u32 last_update_timestamp;
-	u32 delay;
-	u32 base_fee_msat;
-	u32 fee_per_millionth;
-	struct amount_msat min, max;
-};
-
-struct gossip_getchannels_entry {
-	struct node_id node[2];
-	struct amount_sat sat;
-	struct short_channel_id short_channel_id;
-	bool public;
-	bool local_disabled;
-	/* NULL if we haven't received an update */
-	struct gossip_halfchannel_entry *e[2];
-	u8 *features;
-};
-
-void fromwire_route_info(const u8 **pprt, size_t *max, struct route_info *entry);
-void towire_route_info(u8 **pprt, const struct route_info *entry);
-
-#endif /* LIGHTNING_LIGHTNINGD_GOSSIP_MSG_H */