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

lightningd/json: Move json helpers specific for lightningd to new module.

Browse Source
This commit is contained in:
ZmnSCPxj
2018-03-16 03:45:08 +00:00
committed by Rusty Russell
parent 6391645b83
commit 9efe123a0d
14 changed files with 204 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lightningd/payalgo.c
View File

@@ -9,6 +9,7 @@
#include <common/type_to_string.h>
#include <gossipd/gen_gossip_wire.h>
#include <gossipd/routing.h>
#include <lightningd/json.h>
#include <lightningd/jsonrpc.h>
#include <lightningd/jsonrpc_errors.h>
#include <lightningd/lightningd.h>
@@ -39,36 +40,6 @@ struct pay_failure {
struct routing_failure *routing_failure;
};
/* FIXME: move json_add_route_hop and json_add_route to
* common/json.c, share code with getroute */
/* Output a route hop */
static void
json_add_route_hop(struct json_result *r, char const *n,
const struct route_hop *h)
{
/* Imitate what getroute/sendpay use */
json_object_start(r, n);
json_add_pubkey(r, "id", &h->nodeid);
json_add_short_channel_id(r, "channel",
&h->channel_id);
json_add_u64(r, "msatoshi", h->amount);
json_add_num(r, "delay", h->delay);
json_object_end(r);
}
/* Output a route */
static void
json_add_route(struct json_result *r, char const *n,
const struct route_hop *hops, size_t hops_len)
{
size_t i;
json_array_start(r, n);
for (i = 0; i < hops_len; ++i) {
json_add_route_hop(r, NULL, &hops[i]);
}
json_array_end(r);
}
/* Output a pay failure */
static void
json_add_failure(struct json_result *r, char const *n,