From ef84d6eec505390aed9623a11a92f6b5372df804 Mon Sep 17 00:00:00 2001
From: Michael Schmoock <michael@schmoock.net>
Date: Tue, 8 Mar 2022 15:31:26 +0100
Subject: [PATCH] chore: remove EXPERIMENTAL for rfc #917 remote_addr

---
 connectd/peer_exchange_initmsg.c | 6 ++----
 tests/test_connection.py         | 6 ++----
 tests/test_plugin.py             | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/connectd/peer_exchange_initmsg.c b/connectd/peer_exchange_initmsg.c
index 8223bd751..6dc36d534 100644
--- a/connectd/peer_exchange_initmsg.c
+++ b/connectd/peer_exchange_initmsg.c
@@ -90,7 +90,7 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
 
 	/* fetch optional tlv `remote_addr` */
 	remote_addr = NULL;
-#if EXPERIMENTAL_FEATURES /* BOLT1 remote_addr #917 */
+
 	/* BOLT-remote-address #1:
 	 * The receiving node:
 	 * ...
@@ -115,7 +115,6 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
 			break;
 		}
 	}
-#endif
 
 	/* The globalfeatures field is now unused, but there was a
 	 * window where it was: combine the two. */
@@ -217,7 +216,7 @@ struct io_plan *peer_exchange_initmsg(struct io_conn *conn,
 
 	/* set optional tlv `remote_addr` on incoming IP connections */
 	tlvs->remote_addr = NULL;
-#if EXPERIMENTAL_FEATURES /* BOLT1 remote_addr #917 */
+
 	/* BOLT-remote-address #1:
 	 * The sending node:
 	 * ...
@@ -241,7 +240,6 @@ struct io_plan *peer_exchange_initmsg(struct io_conn *conn,
 			break;
 		}
 	}
-#endif
 
 	/* Initially, there were two sets of feature bits: global and local.
 	 * Local affected peer nodes only, global affected everyone.  Both were
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 20e1eec00..23aaabafe 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -46,9 +46,8 @@ def test_connect_basic(node_factory):
     assert len(l1.rpc.listpeers()) == 1
     assert len(l2.rpc.listpeers()) == 1
 
-    if EXPERIMENTAL_FEATURES:  # BOLT1 remote_addr #917
-        if DEVELOPER:
-            print(l1.daemon.wait_for_log("Peer says it sees our address as: 127.0.0.1:[0-9]{5}"))
+    if DEVELOPER:
+        print(l1.daemon.wait_for_log("Peer says it sees our address as: 127.0.0.1:[0-9]{5}"))
 
     # Should get reasonable error if unknown addr for peer.
     with pytest.raises(RpcError, match=r'Unable to connect, no address known'):
@@ -64,7 +63,6 @@ def test_connect_basic(node_factory):
 
 
 @pytest.mark.developer("needs DEVELOPER=1 for having localhost remote_addr and fast gossip")
-@unittest.skipIf(not EXPERIMENTAL_FEATURES, "BOLT1 remote_addr #917")
 def test_remote_addr(node_factory, bitcoind):
     """Check address discovery (BOLT1 #917) init remote_addr works as designed:
 
diff --git a/tests/test_plugin.py b/tests/test_plugin.py
index 979d8c41a..bde2da4e7 100644
--- a/tests/test_plugin.py
+++ b/tests/test_plugin.py
@@ -10,7 +10,7 @@ from utils import (
     DEPRECATED_APIS, expected_peer_features, expected_node_features,
     expected_channel_features, account_balance,
     check_coin_moves, first_channel_id, EXPERIMENTAL_DUAL_FUND,
-    mine_funding_to_announce, EXPERIMENTAL_FEATURES
+    mine_funding_to_announce
 )
 
 import ast
@@ -451,7 +451,6 @@ def test_plugin_connected_hook_chaining(node_factory):
     assert not l1.daemon.is_in_log(f"peer_connected_logger_b {l3id}")
 
 
-@unittest.skipIf(not EXPERIMENTAL_FEATURES, "BOLT1 remote_addr #917")
 @pytest.mark.developer("localhost remote_addr will be filtered without DEVELOEPR")
 def test_peer_connected_remote_addr(node_factory):
     """This tests the optional tlv `remote_addr` being passed to a plugin.