rpc: adds opener and closer to listpeers channels

Changelog-Added: RPC: Added 'opener' and 'closer' to listpeers channels
AdamKorcz · Nov 6, 2020 · b7c1851 · b7c1851
1 parent 083a856
commit b7c1851
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
@@ -802,6 +802,16 @@ static void json_add_channel(struct lightningd *ld,
 	    response, "private",
 	    !(channel->channel_flags & CHANNEL_FLAGS_ANNOUNCE_CHANNEL));
 
+	/* opener and closer */
+	assert(channel->opener != NUM_SIDES);
+	json_add_string(response, "opener", channel->opener == LOCAL ?
+					    "local" : "remote");
+	if (channel->closer != NUM_SIDES)
+		json_add_string(response, "closer", channel->closer == LOCAL ?
+						    "local" : "remote");
+	else
+		json_add_null(response, "closer");
+
 	json_array_start(response, "features");
 	if (channel->option_static_remotekey)
 		json_add_string(response, NULL, "option_static_remotekey");

diff --git a/wallet/db_postgres_sqlgen.c b/wallet/db_postgres_sqlgen.c
diff --git a/wallet/db_sqlite3_sqlgen.c b/wallet/db_sqlite3_sqlgen.c
diff --git a/wallet/statements_gettextgen.po b/wallet/statements_gettextgen.po
diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
@@ -287,6 +287,9 @@ void json_add_node_id(struct json_stream *response UNNEEDED,
 				const char *fieldname UNNEEDED,
 				const struct node_id *id UNNEEDED)
 { fprintf(stderr, "json_add_node_id called!\n"); abort(); }
+/* Generated stub for json_add_null */
+void json_add_null(struct json_stream *stream UNNEEDED, const char *fieldname UNNEEDED)
+{ fprintf(stderr, "json_add_null called!\n"); abort(); }
 /* Generated stub for json_add_num */
 void json_add_num(struct json_stream *result UNNEEDED, const char *fieldname UNNEEDED,
 		  unsigned int value UNNEEDED)