mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-02-22 14:42:40 +01:00
8f17191099
This was a very simple change and allowed us to remove the special `json_opt_tok` macro. Moved the callback out of `common/json.c` to `lightningd/json.c` because the new callbacks are dependent on `struct command` etc. (I already started on `json_tok_number`) My plan is to: 1. upgrade json_tok_X one a time, maybe a PR for each one. 2. When done, rename macros (i.e, remove "_tal"). 3. Remove all vestiges of the old callbacks 4. Add new callbacks so that we no longer need json_tok_tok! (e.g., json_tok_label, json_tok_str, json_tok_msat) Signed-off-by: Mark Beckwith <wythe@intrig.com>
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
/* lightningd/json.h
|
|
* Helpers for outputting JSON results that are specific only for
|
|
* lightningd.
|
|
*/
|
|
#ifndef LIGHTNING_LIGHTNINGD_JSON_H
|
|
#define LIGHTNING_LIGHTNINGD_JSON_H
|
|
#include "config.h"
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
|
|
#define JSMN_STRICT 1
|
|
# include <external/jsmn/jsmn.h>
|
|
|
|
struct bitcoin_txid;
|
|
struct channel_id;
|
|
struct command;
|
|
struct json_result;
|
|
struct pubkey;
|
|
struct route_hop;
|
|
struct short_channel_id;
|
|
struct wallet_payment;
|
|
struct wireaddr;
|
|
struct wireaddr_internal;
|
|
|
|
/* Output a route array. */
|
|
void json_add_route(struct json_result *r, char const *n,
|
|
const struct route_hop *hops, size_t hops_len);
|
|
|
|
/* Output the fields of a wallet payment.
|
|
* Should be used within an object context. */
|
|
void json_add_payment_fields(struct json_result *response,
|
|
const struct wallet_payment *t);
|
|
|
|
/* '"fieldname" : "0289abcdef..."' or "0289abcdef..." if fieldname is NULL */
|
|
void json_add_pubkey(struct json_result *response,
|
|
const char *fieldname,
|
|
const struct pubkey *key);
|
|
|
|
/* '"fieldname" : <hexrev>' or "<hexrev>" if fieldname is NULL */
|
|
void json_add_txid(struct json_result *result, const char *fieldname,
|
|
const struct bitcoin_txid *txid);
|
|
|
|
/* Extract a pubkey from this */
|
|
bool json_tok_pubkey(const char *buffer, const jsmntok_t *tok,
|
|
struct pubkey *pubkey);
|
|
|
|
/* Extract a short_channel_id from this */
|
|
bool json_tok_short_channel_id(const char *buffer, const jsmntok_t *tok,
|
|
struct short_channel_id *scid);
|
|
|
|
/* '"fieldname" : "1234:5:6"' */
|
|
void json_add_short_channel_id(struct json_result *response,
|
|
const char *fieldname,
|
|
const struct short_channel_id *id);
|
|
|
|
bool json_tok_channel_id(const char *buffer, const jsmntok_t *tok,
|
|
struct channel_id *cid);
|
|
|
|
/* JSON serialize a network address for a node */
|
|
void json_add_address(struct json_result *response, const char *fieldname,
|
|
const struct wireaddr *addr);
|
|
|
|
/* JSON serialize a network address for a node. */
|
|
void json_add_address_internal(struct json_result *response,
|
|
const char *fieldname,
|
|
const struct wireaddr_internal *addr);
|
|
|
|
/*
|
|
* Set the address of @out to @tok. Used as a callback by handlers that
|
|
* want to unmarshal @tok themselves.
|
|
*/
|
|
bool json_tok_tok(struct command *cmd, const char *name,
|
|
const char *buffer, const jsmntok_t * tok,
|
|
const jsmntok_t **out);
|
|
|
|
#endif /* LIGHTNING_LIGHTNINGD_JSON_H */
|