Fixed travis error and rebase

Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
ElementsProject · Sep 7, 2020 · f45c772 · f45c772
1 parent aa99230
commit f45c772
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/doc/PLUGINS.md b/doc/PLUGINS.md
@@ -215,7 +215,11 @@ simple JSON object containing the options:
         "invoice": "028200"
     }
     "startup": true,
-    "proxy-addr": "127.0.0.1:9050",
+    "proxy": {
+        "type": "ipv4",
+        "address": "127.0.0.1",
+        "port": 9050
+    }
     "torv3-enabled": true,
     "use_proxy_always": false
   }

diff --git a/lightningd/plugin.c b/lightningd/plugin.c
@@ -6,6 +6,7 @@
 #include <common/features.h>
 #include <common/utils.h>
 #include <common/version.h>
+#include <common/json_helpers.h>
 #include <lightningd/json.h>
 #include <lightningd/notification.h>
 #include <lightningd/options.h>
@@ -1453,7 +1454,7 @@ plugin_populate_init_request(struct plugin *plugin, struct jsonrpc_request *req)
 	json_add_bool(req->stream, "startup", plugin->plugins->startup);
 	json_add_string(req->stream, "network", chainparams->network_name);
 	if (ld->proxyaddr) {
-		json_add_string(req->stream, "proxy-addr", type_to_string(NULL, struct wireaddr, ld->proxyaddr));
+		json_add_address(req->stream, "proxy", ld->proxyaddr);
 		json_add_bool(req->stream, "torv3-enabled", ld->config.use_v3_autotor);
 		json_add_bool(req->stream, "use_proxy_always", ld->use_proxy_always);
 	}