Skip to content

Commit d66f5f3

Browse files
committed
More renaming of gfeatures to globalfeatures.
Use the BOLT #1 naming. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
1 parent 9455331 commit d66f5f3

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

common/features.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <ccan/tal/tal.h>
66

77
/* Returns true if we're OK with all these offered features. */
8-
bool features_supported(const u8 *gfeatures, const u8 *lfeatures);
8+
bool features_supported(const u8 *globalfeatures, const u8 *localfeatures);
99

1010
/* For sending our features: tal_count() returns length. */
1111
u8 *get_offered_globalfeatures(const tal_t *ctx);

gossipd/gossip_wire.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gossipctl_init,,broadcast_interval,u32
88
gossipctl_init,,chain_hash,struct bitcoin_blkid
99
gossipctl_init,,id,struct pubkey
1010
gossipctl_init,,gflen,u16
11-
gossipctl_init,,gfeatures,gflen*u8
11+
gossipctl_init,,globalfeatures,gflen*u8
1212
gossipctl_init,,rgb,3*u8
1313
gossipctl_init,,alias,32*u8
1414
gossipctl_init,,update_channel_interval,u32

gossipd/gossipd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,12 +1429,12 @@ static struct io_plan *getnodes(struct io_conn *conn, struct daemon *daemon,
14291429
if (id) {
14301430
n = get_node(daemon->rstate, id);
14311431
if (n)
1432-
append_node(&nodes, id, n->gfeatures, n);
1432+
append_node(&nodes, id, n->globalfeatures, n);
14331433
} else {
14341434
struct node_map_iter i;
14351435
n = node_map_first(daemon->rstate->nodes, &i);
14361436
while (n != NULL) {
1437-
append_node(&nodes, &n->id, n->gfeatures, n);
1437+
append_node(&nodes, &n->id, n->globalfeatures, n);
14381438
n = node_map_next(daemon->rstate->nodes, &i);
14391439
}
14401440
}

gossipd/routing.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ static struct node *new_node(struct routing_state *rstate,
146146
n->id = *id;
147147
n->chans = tal_arr(n, struct chan *, 0);
148148
n->alias = NULL;
149-
n->gfeatures = NULL;
149+
n->globalfeatures = NULL;
150150
n->node_announcement = NULL;
151151
n->node_announcement_index = 0;
152152
n->last_timestamp = -1;
@@ -1309,8 +1309,8 @@ bool routing_add_node_announcement(struct routing_state *rstate, const u8 *msg T
13091309
memcpy(node->rgb_color, rgb_color, 3);
13101310
tal_free(node->alias);
13111311
node->alias = tal_dup_arr(node, u8, alias, 32, 0);
1312-
tal_free(node->gfeatures);
1313-
node->gfeatures = tal_steal(node, features);
1312+
tal_free(node->globalfeatures);
1313+
node->globalfeatures = tal_steal(node, features);
13141314

13151315
tal_free(node->node_announcement);
13161316
node->node_announcement = tal_dup_arr(node, u8, msg, tal_count(msg), 0);

gossipd/routing.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ struct node {
117117
u8 rgb_color[3];
118118

119119
/* (Global) features */
120-
u8 *gfeatures;
120+
u8 *globalfeatures;
121121

122122
/* Cached `node_announcement` we might forward to new peers (or NULL). */
123123
const u8 *node_announcement;

0 commit comments

Comments
 (0)