lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

cleanup: Use the most common abbreviation of 'ctx' in `json_tok_address_scriptpubkey`

pull/2938/head
trueptolemy 6 years ago
committed by ZmnSCPxj, ZmnSCPxj jxPCSmnZ
parent
8eddbb4561
commit
5f6196a42d
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      lightningd/jsonrpc.c

10
lightningd/jsonrpc.c
View File

@ -990,7 +990,7 @@ static const char *segwit_addr_net_decode(int *witness_version,
} }
enum address_parse_result enum address_parse_result
json_tok_address_scriptpubkey(const tal_t *cxt, json_tok_address_scriptpubkey(const tal_t *ctx,
const struct chainparams *chainparams, const struct chainparams *chainparams,
const char *buffer, const char *buffer,
const jsmntok_t *tok, const u8 **scriptpubkey) const jsmntok_t *tok, const u8 **scriptpubkey)
@ -1016,11 +1016,11 @@ json_tok_address_scriptpubkey(const tal_t *cxt,
if (parsed) { if (parsed) {
if (addr_version == chainparams->p2pkh_version) { if (addr_version == chainparams->p2pkh_version) {
*scriptpubkey = scriptpubkey_p2pkh(cxt, &destination); *scriptpubkey = scriptpubkey_p2pkh(ctx, &destination);
return ADDRESS_PARSE_SUCCESS; return ADDRESS_PARSE_SUCCESS;
} else if (addr_version == chainparams->p2sh_version) { } else if (addr_version == chainparams->p2sh_version) {
*scriptpubkey = *scriptpubkey =
scriptpubkey_p2sh_hash(cxt, &destination.addr); scriptpubkey_p2sh_hash(ctx, &destination.addr);
return ADDRESS_PARSE_SUCCESS; return ADDRESS_PARSE_SUCCESS;
} else { } else {
return ADDRESS_PARSE_WRONG_NETWORK; return ADDRESS_PARSE_WRONG_NETWORK;
@ -1029,7 +1029,7 @@ json_tok_address_scriptpubkey(const tal_t *cxt,
} }
/* Generate null-terminated address. */ /* Generate null-terminated address. */
addrz = tal_dup_arr(cxt, char, buffer + tok->start, tok->end - tok->start, 1); addrz = tal_dup_arr(ctx, char, buffer + tok->start, tok->end - tok->start, 1);
addrz[tok->end - tok->start] = '\0'; addrz[tok->end - tok->start] = '\0';
bip173 = segwit_addr_net_decode(&witness_version, witness_program, bip173 = segwit_addr_net_decode(&witness_version, witness_program,
@ -1044,7 +1044,7 @@ json_tok_address_scriptpubkey(const tal_t *cxt,
/* Insert other witness versions here. */ /* Insert other witness versions here. */
if (witness_ok) { if (witness_ok) {
*scriptpubkey = scriptpubkey_witness_raw(cxt, witness_version, *scriptpubkey = scriptpubkey_witness_raw(ctx, witness_version,
witness_program, witness_program_len); witness_program, witness_program_len);
parsed = true; parsed = true;
right_network = streq(bip173, chainparams->bip173_name); right_network = streq(bip173, chainparams->bip173_name);

Write Preview
Loading…
Cancel
Save