From 8600ba403c19827b8a33eeee1e88e35804684607 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 26 Oct 2018 16:31:30 +1030 Subject: [PATCH] wireaddr: remove handling for addr->type == ADDR_TYPE_PADDING We used to use this for "no known address", but we don't any more. Signed-off-by: Rusty Russell --- common/wireaddr.c | 4 ---- connectd/netaddress.c | 2 +- lightningd/json.c | 4 ---- lightningd/peer_control.c | 10 ++++------ wallet/wallet.c | 10 +++------- 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/common/wireaddr.c b/common/wireaddr.c index 48542eb78..648c28424 100644 --- a/common/wireaddr.c +++ b/common/wireaddr.c @@ -55,10 +55,6 @@ bool fromwire_wireaddr(const u8 **cursor, size_t *max, struct wireaddr *addr) void towire_wireaddr(u8 **pptr, const struct wireaddr *addr) { - if (!addr || addr->type == ADDR_TYPE_PADDING) { - towire_u8(pptr, ADDR_TYPE_PADDING); - return; - } towire_u8(pptr, addr->type); towire(pptr, addr->addr, addr->addrlen); towire_u16(pptr, addr->port); diff --git a/connectd/netaddress.c b/connectd/netaddress.c index 5a9737e78..612d6ef12 100644 --- a/connectd/netaddress.c +++ b/connectd/netaddress.c @@ -158,7 +158,7 @@ static bool IsLocal(const struct wireaddr *addr) static bool IsInternal(const struct wireaddr *addr) { - return addr->type == ADDR_TYPE_PADDING; + return false; } static bool IsValid(const struct wireaddr *addr) diff --git a/lightningd/json.c b/lightningd/json.c index a97accf0e..9d6c87639 100644 --- a/lightningd/json.c +++ b/lightningd/json.c @@ -408,10 +408,6 @@ json_tok_channel_id(const char *buffer, const jsmntok_t *tok, void json_add_address(struct json_stream *response, const char *fieldname, const struct wireaddr *addr) { - /* No need to print padding */ - if (addr->type == ADDR_TYPE_PADDING) - return; - json_object_start(response, fieldname); char *addrstr = tal_arr(response, char, INET6_ADDRSTRLEN); if (addr->type == ADDR_TYPE_IPV4) { diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 2ca9a36b2..037145d58 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -661,12 +661,10 @@ static void json_add_peer(struct lightningd *ld, * their features *last* time they connected. */ if (connected) { json_array_start(response, "netaddr"); - if (p->addr.itype != ADDR_INTERNAL_WIREADDR - || p->addr.u.wireaddr.type != ADDR_TYPE_PADDING) - json_add_string(response, NULL, - type_to_string(response, - struct wireaddr_internal, - &p->addr)); + json_add_string(response, NULL, + type_to_string(response, + struct wireaddr_internal, + &p->addr)); json_array_end(response); if (deprecated_apis) { json_add_hex_talarr(response, "global_features", diff --git a/wallet/wallet.c b/wallet/wallet.c index d9bce0752..fc6dfdee5 100644 --- a/wallet/wallet.c +++ b/wallet/wallet.c @@ -1037,13 +1037,9 @@ void wallet_channel_insert(struct wallet *w, struct channel *chan) /* Need to create the peer first */ stmt = db_prepare(w->db, "INSERT INTO peers (node_id, address) VALUES (?, ?);"); sqlite3_bind_pubkey(stmt, 1, &chan->peer->id); - if (chan->peer->addr.itype == ADDR_INTERNAL_WIREADDR - && chan->peer->addr.u.wireaddr.type == ADDR_TYPE_PADDING) - sqlite3_bind_null(stmt, 2); - else - sqlite3_bind_text(stmt, 2, - type_to_string(tmpctx, struct wireaddr_internal, &chan->peer->addr), - -1, SQLITE_TRANSIENT); + sqlite3_bind_text(stmt, 2, + type_to_string(tmpctx, struct wireaddr_internal, &chan->peer->addr), + -1, SQLITE_TRANSIENT); db_exec_prepared(w->db, stmt); chan->peer->dbid = sqlite3_last_insert_rowid(w->db->sql); }