devtools: revert changes and add sanity check

Author: vincenzopalazzo

devtools/gossipwith.c

@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <wire/peer_wire.h>
 
-#define chainparams_get_ln_port simple_get_ln_port
 #define io_write_ simple_write
 #define io_read_ simple_read
 #define io_close simple_close
@@ -46,11 +45,6 @@ static struct io_plan *simple_close(struct io_conn *conn)
 	return NULL;
 }
 
-static int simple_get_ln_port(const struct chainparams *params UNNEEDED)
-{
-	return 9735;
-}
-
  #include "../connectd/handshake.c"
 
 /* This makes the handshake prototypes work. */
@@ -328,7 +322,8 @@ int main(int argc, char *argv[])
 		opt_usage_exit_fail("Invalid id %.*s",
 				    (int)(at - argv[1]), argv[1]);
 
-	if (!parse_wireaddr_internal(at+1, &addr, simple_get_ln_port(NULL), NULL,
+	assert(chainparams && "chainparams MUST be not NULL");
+	if (!parse_wireaddr_internal(at+1, &addr, chainparams_get_ln_port(chainparams), NULL,
 				     true, false, true, &err_msg))
 		opt_usage_exit_fail("%s '%s'", err_msg, argv[1]);
 

tests/utils.py

@@ -8,6 +8,7 @@
 EXPERIMENTAL_FEATURES = env("EXPERIMENTAL_FEATURES", "0") == "1"
 COMPAT = env("COMPAT", "1") == "1"
 
+
 def default_ln_port(network: str) -> int:
     network_map = {
         "bitcoin": 9735,
@@ -19,6 +20,7 @@ def default_ln_port(network: str) -> int:
     }
     return network_map[network]
 
+
 def anchor_expected():
     return EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND