aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-24 01:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use global secp256k1_ctx instead of passing it around.

Browse Source 
If I'd known how large this patch would be (though trivial), I'd
have done it in parts.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-12-02 18:12:58 +10:30
parent c938ebb5c0
commit a4fdaab5b3
34 changed files with 300 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
daemon/routing.c
View File

@@ -411,11 +411,11 @@ char *opt_add_route(const char *arg, struct lightningd_state *dstate)
u32 base, var, delay, minblocks;
len = strcspn(arg, "/");
if (!pubkey_from_hexstr(dstate->secpctx, arg, len, &src))
if (!pubkey_from_hexstr(arg, len, &src))
return "Bad src pubkey";
arg += len + 1;
len = strcspn(arg, "/");
if (!pubkey_from_hexstr(dstate->secpctx, arg, len, &dst))
if (!pubkey_from_hexstr(arg, len, &dst))
return "Bad dst pubkey";
arg += len;
@@ -450,8 +450,7 @@ static void json_add_route(struct command *cmd,
return;
}
if (!pubkey_from_hexstr(cmd->dstate->secpctx,
buffer + srctok->start,
if (!pubkey_from_hexstr(buffer + srctok->start,
srctok->end - srctok->start, &src)) {
command_fail(cmd, "src %.*s not valid",
srctok->end - srctok->start,
@@ -459,8 +458,7 @@ static void json_add_route(struct command *cmd,
return;
}
if (!pubkey_from_hexstr(cmd->dstate->secpctx,
buffer + dsttok->start,
if (!pubkey_from_hexstr(buffer + dsttok->start,
dsttok->end - dsttok->start, &dst)) {
command_fail(cmd, "dst %.*s not valid",
dsttok->end - dsttok->start,
@@ -505,8 +503,8 @@ static void json_getchannels(struct command *cmd,
for (i = 0; i < num_conn; i++){
c = n->out[i];
json_object_start(response, NULL);
json_add_pubkey(response, cmd->dstate->secpctx, "from", &n->id);
json_add_pubkey(response, cmd->dstate->secpctx, "to", &c->dst->id);
json_add_pubkey(response, "from", &n->id);
json_add_pubkey(response, "to", &c->dst->id);
json_add_num(response, "base_fee", c->base_fee);
json_add_num(response, "proportional_fee", c->proportional_fee);
json_object_end(response);
@@ -569,8 +567,7 @@ static void json_getnodes(struct command *cmd,
while (n != NULL) {
json_object_start(response, NULL);
json_add_pubkey(response, cmd->dstate->secpctx,
"nodeid", &n->id);
json_add_pubkey(response, "nodeid", &n->id);
json_add_num(response, "port", n->port);
if (!n->port)
json_add_null(response, "hostname");