aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-07 08:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: make 'u8 *features' and 'struct feature_set *fset' more explicit.

Browse Source 
It's almost always "their_features" and "our_features" respectively, so
make those names clear.

Suggested-by: @cdecker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-04-03 10:33:59 +10:30
parent 28e3ffc66b
commit 2f1502abf4
31 changed files with 134 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/fundchannel.c
View File

@@ -27,7 +27,7 @@ struct funding_req {
struct amount_msat *push_msat;
/* Features offered by this peer. */
const u8 *features;
const u8 *their_features;
bool *announce_channel;
u32 *minconf;
@@ -335,7 +335,7 @@ static struct command_result *post_dryrun(struct command *cmd,
/* Update funding to actual amount */
if (fr->funding_all
&& !feature_negotiated(plugin_feature_set(cmd->plugin),
fr->features, OPT_LARGE_CHANNELS)
fr->their_features, OPT_LARGE_CHANNELS)
&& amount_sat_greater(funding, chainparams->max_funding))
funding = chainparams->max_funding;
@@ -355,8 +355,8 @@ static struct command_result *exec_dryrun(struct command *cmd,
t = json_get_member(buf, result, "features");
if (!t)
plugin_err(cmd->plugin, "No features found in connect response?");
fr->features = json_tok_bin_from_hex(fr, buf, t);
if (!fr->features)
fr->their_features = json_tok_bin_from_hex(fr, buf, t);
if (!fr->their_features)
plugin_err(cmd->plugin, "Bad features '%.*s' in connect response?",
t->end - t->start, buf + t->start);