Rename struct json_result to struct json_stream (RENAMEONLY)

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

lightningd/chaintopology.c

@@ -466,7 +466,7 @@ static void json_feerates(struct command *cmd,
 			    const char *buffer, const jsmntok_t *params)
 {
 	struct chain_topology *topo = cmd->ld->topology;
-	struct json_result *response;
+	struct json_stream *response;
 	u32 feerates[NUM_FEERATES];
 	bool missing;
 	enum feerate_style *style;

lightningd/connect_control.c

@@ -65,7 +65,7 @@ static struct connect *find_connect(struct lightningd *ld,
 
 static void connect_cmd_succeed(struct command *cmd, const struct pubkey *id)
 {
-	struct json_result *response = json_stream_success(cmd);
+	struct json_stream *response = json_stream_success(cmd);
 	json_object_start(response, NULL);
 	json_add_pubkey(response, "id", id);
 	json_object_end(response);

lightningd/gossip_control.c

@@ -178,7 +178,7 @@ void gossipd_notify_spend(struct lightningd *ld,
 }
 
 /* Gossipd shouldn't give us bad pubkeys, but don't abort if they do */
-static void json_add_raw_pubkey(struct json_result *response,
+static void json_add_raw_pubkey(struct json_stream *response,
 			 const char *fieldname,
 			 const u8 raw_pubkey[sizeof(struct pubkey)])
 {
@@ -200,7 +200,7 @@ static void json_getnodes_reply(struct subd *gossip UNUSED, const u8 *reply,
 				struct command *cmd)
 {
 	struct gossip_getnodes_entry **nodes;
-	struct json_result *response;
+	struct json_stream *response;
 	size_t i, j;
 
 	if (!fromwire_gossip_getnodes_reply(reply, reply, &nodes)) {
@@ -273,7 +273,7 @@ AUTODATA(json_command, &listnodes_command);
 static void json_getroute_reply(struct subd *gossip UNUSED, const u8 *reply, const int *fds UNUSED,
 				struct command *cmd)
 {
-	struct json_result *response;
+	struct json_stream *response;
 	struct route_hop *hops;
 
 	fromwire_gossip_getroute_reply(reply, reply, &hops);
@@ -355,7 +355,7 @@ static void json_listchannels_reply(struct subd *gossip UNUSED, const u8 *reply,
 {
 	size_t i;
 	struct gossip_getchannels_entry *entries;
-	struct json_result *response;
+	struct json_stream *response;
 
 	if (!fromwire_gossip_getchannels_reply(reply, reply, &entries)) {
 		command_fail(cmd, LIGHTNINGD, "Invalid reply from gossipd");
@@ -425,7 +425,7 @@ static void json_scids_reply(struct subd *gossip UNUSED, const u8 *reply,
 			     const int *fds UNUSED, struct command *cmd)
 {
 	bool ok, complete;
-	struct json_result *response;
+	struct json_stream *response;
 
 	if (!fromwire_gossip_scids_reply(reply, &ok, &complete)) {
 		command_fail(cmd, LIGHTNINGD,
@@ -521,7 +521,7 @@ AUTODATA(json_command, &dev_send_timestamp_filter);
 static void json_channel_range_reply(struct subd *gossip UNUSED, const u8 *reply,
 				     const int *fds UNUSED, struct command *cmd)
 {
-	struct json_result *response;
+	struct json_stream *response;
 	u32 final_first_block, final_num_blocks;
 	bool final_complete;
 	struct short_channel_id *scids;

lightningd/invoice.c

@@ -37,7 +37,7 @@ static const char *invoice_status_str(const struct invoice_details *inv)
 	return "unpaid";
 }
 
-static void json_add_invoice(struct json_result *response,
+static void json_add_invoice(struct json_stream *response,
 			     const struct invoice_details *inv)
 {
 	json_object_start(response, NULL);
@@ -64,7 +64,7 @@ static void json_add_invoice(struct json_result *response,
 
 static void tell_waiter(struct command *cmd, const struct invoice *inv)
 {
-	struct json_result *response;
+	struct json_stream *response;
 	const struct invoice_details *details;
 
 	details = wallet_invoice_details(cmd, cmd->ld->wallet, *inv);
@@ -213,7 +213,7 @@ static void gossipd_incoming_channels_reply(struct subd *gossipd,
 					    const int *fs,
 					    struct invoice_info *info)
 {
-	struct json_result *response;
+	struct json_stream *response;
 	struct route_info *inchans;
 	bool any_offline;
 	struct invoice invoice;
@@ -390,7 +390,7 @@ static const struct json_command invoice_command = {
 			     "(default autogenerated)"};
 AUTODATA(json_command, &invoice_command);
 
-static void json_add_invoices(struct json_result *response,
+static void json_add_invoices(struct json_stream *response,
 			      struct wallet *wallet,
 			      const struct json_escaped *label)
 {
@@ -418,7 +418,7 @@ static void json_listinvoices(struct command *cmd,
 			      const char *buffer, const jsmntok_t *params)
 {
 	struct json_escaped *label;
-	struct json_result *response;
+	struct json_stream *response;
 	struct wallet *wallet = cmd->ld->wallet;
 	if (!param(cmd, buffer, params,
 		   p_opt("label", json_tok_label, &label),
@@ -445,7 +445,7 @@ static void json_delinvoice(struct command *cmd,
 {
 	struct invoice i;
 	const struct invoice_details *details;
-	struct json_result *response;
+	struct json_stream *response;
 	const char *status, *actual_status;
 	struct json_escaped *label;
 	struct wallet *wallet = cmd->ld->wallet;
@@ -612,7 +612,7 @@ static const struct json_command waitinvoice_command = {
 };
 AUTODATA(json_command, &waitinvoice_command);
 
-static void json_add_fallback(struct json_result *response,
+static void json_add_fallback(struct json_stream *response,
 			      const char *fieldname,
 			      const u8 *fallback,
 			      const struct chainparams *chain)
@@ -651,7 +651,7 @@ static void json_decodepay(struct command *cmd,
                            const char *buffer, const jsmntok_t *params)
 {
 	struct bolt11 *b11;
-	struct json_result *response;
+	struct json_stream *response;
 	const char *str, *desc;
 	char *fail;