mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-03 10:46:58 +01:00
Code Issues Projects Releases Wiki Activity

chore: remove EXPERIMENTAL for rfc #917 remote_addr

Browse source
This commit is contained in:
Michael Schmoock 2022-03-08 15:31:26 +01:00 • committed by Rusty Russell
parent 57fb34ed06
commit ef84d6eec5
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
connectd/peer_exchange_initmsg.c
View file

@ -90,7 +90,7 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
/* fetch optional tlv `remote_addr` */ /* fetch optional tlv `remote_addr` */
remote_addr = NULL; remote_addr = NULL;
#if EXPERIMENTAL_FEATURES /* BOLT1 remote_addr #917 */
/* BOLT-remote-address #1: /* BOLT-remote-address #1:
* The receiving node: * The receiving node:
* ... * ...
@ -115,7 +115,6 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
break; break;
} }
} }
#endif
/* The globalfeatures field is now unused, but there was a /* The globalfeatures field is now unused, but there was a
* window where it was: combine the two. */ * 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 */ /* set optional tlv `remote_addr` on incoming IP connections */
tlvs->remote_addr = NULL; tlvs->remote_addr = NULL;
#if EXPERIMENTAL_FEATURES /* BOLT1 remote_addr #917 */
/* BOLT-remote-address #1: /* BOLT-remote-address #1:
* The sending node: * The sending node:
* ... * ...
@ -241,7 +240,6 @@ struct io_plan *peer_exchange_initmsg(struct io_conn *conn,
break; break;
} }
} }
#endif
/* Initially, there were two sets of feature bits: global and local. /* Initially, there were two sets of feature bits: global and local.
* Local affected peer nodes only, global affected everyone. Both were * Local affected peer nodes only, global affected everyone. Both were

6
tests/test_connection.py
View file

@ -46,9 +46,8 @@ def test_connect_basic(node_factory):
assert len(l1.rpc.listpeers()) == 1 assert len(l1.rpc.listpeers()) == 1
assert len(l2.rpc.listpeers()) == 1 assert len(l2.rpc.listpeers()) == 1
if EXPERIMENTAL_FEATURES: # BOLT1 remote_addr #917 if DEVELOPER:
if DEVELOPER: print(l1.daemon.wait_for_log("Peer says it sees our address as: 127.0.0.1:[0-9]{5}"))
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. # Should get reasonable error if unknown addr for peer.
with pytest.raises(RpcError, match=r'Unable to connect, no address known'): 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") @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): def test_remote_addr(node_factory, bitcoind):
"""Check address discovery (BOLT1 #917) init remote_addr works as designed: """Check address discovery (BOLT1 #917) init remote_addr works as designed:

3
tests/test_plugin.py
View file

@ -10,7 +10,7 @@ from utils import (
DEPRECATED_APIS, expected_peer_features, expected_node_features, DEPRECATED_APIS, expected_peer_features, expected_node_features,
expected_channel_features, account_balance, expected_channel_features, account_balance,
check_coin_moves, first_channel_id, EXPERIMENTAL_DUAL_FUND, check_coin_moves, first_channel_id, EXPERIMENTAL_DUAL_FUND,
mine_funding_to_announce, EXPERIMENTAL_FEATURES mine_funding_to_announce
) )
import ast 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}") 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") @pytest.mark.developer("localhost remote_addr will be filtered without DEVELOEPR")
def test_peer_connected_remote_addr(node_factory): def test_peer_connected_remote_addr(node_factory):
"""This tests the optional tlv `remote_addr` being passed to a plugin. """This tests the optional tlv `remote_addr` being passed to a plugin.