From 12adcda370a17b9bc899cd6e73038d1ff54c0a5c Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Fri, 19 Oct 2018 11:47:48 +1030
Subject: [PATCH] test/run-param: don't reach into json_result to get the
 string.

It's about to change, so refactor this first.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
 lightningd/test/run-param.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lightningd/test/run-param.c b/lightningd/test/run-param.c
index 1ff2c98d3..5e98e3ad0 100644
--- a/lightningd/test/run-param.c
+++ b/lightningd/test/run-param.c
@@ -323,13 +323,17 @@ static void bad_programmer(void)
 #endif
 
 static void add_members(struct param **params,
-			struct json_result *obj,
-			struct json_result *arr, unsigned int **ints)
+			char **obj,
+			char **arr, unsigned int **ints)
 {
 	for (int i = 0; i < tal_count(ints); ++i) {
-		char *name = tal_fmt(tmpctx, "%i", i);
-		json_add_num(obj, name, i);
-		json_add_num(arr, NULL, i);
+		const char *name = tal_fmt(*params, "%i", i);
+		if (i != 0) {
+			tal_append_fmt(obj, ", ");
+			tal_append_fmt(arr, ", ");
+		}
+		tal_append_fmt(obj, "\"%i\" : %i", i, i);
+		tal_append_fmt(arr, "%i", i);
 		param_add(params, name, true,
 			  typesafe_cb_preargs(bool, void **,
 					      json_tok_number,
@@ -351,16 +355,14 @@ static void five_hundred_params(void)
 	struct param *params = tal_arr(NULL, struct param, 0);
 
 	unsigned int **ints = tal_arr(params, unsigned int*, 500);
-	struct json_result *obj = new_json_result(params);
-	struct json_result *arr = new_json_result(params);
-	json_object_start(obj, NULL);
-	json_array_start(arr, NULL);
-	add_members(&params, obj, arr, ints);
-	json_object_end(obj);
-	json_array_end(arr);
+	char *obj = tal_fmt(params, "{ ");
+	char *arr = tal_fmt(params, "[ ");
+	add_members(&params, &obj, &arr, ints);
+	tal_append_fmt(&obj, "}");
+	tal_append_fmt(&arr, "]");
 
 	/* first test object version */
-	struct json *j = json_parse(params, obj->s);
+	struct json *j = json_parse(params, obj);
 	assert(param_arr(cmd, j->buffer, j->toks, params));
 	for (int i = 0; i < tal_count(ints); ++i) {
 		assert(ints[i]);
@@ -369,7 +371,7 @@ static void five_hundred_params(void)
 	}
 
 	/* now test array */
-	j = json_parse(params, arr->s);
+	j = json_parse(params, arr);
 	assert(param_arr(cmd, j->buffer, j->toks, params));
 	for (int i = 0; i < tal_count(ints); ++i) {
 		assert(*ints[i] == i);