From 8de548694a06e99d8a0d870c07f23e92e24ea39a Mon Sep 17 00:00:00 2001 From: Gregory Maxwell Date: Wed, 6 Oct 2021 17:29:46 -0300 Subject: [PATCH] Remove pnodeLocalHost. Mostly a legacy of the long removed pub/sub system --- src/net.cpp | 15 --------------- test/functional/p2p_addr_relay.py | 4 ++-- test/functional/p2p_addrv2_relay.py | 4 ++-- test/functional/p2p_invalid_messages.py | 4 ++-- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 915a1a3cc24c9..67b5b7972c8de 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -71,7 +71,6 @@ bool fListen = true; RecursiveMutex cs_mapLocalHost; std::map mapLocalHost; static bool vfLimited[NET_MAX] = {}; -static CNode* pnodeLocalHost = NULL; std::string strSubVersion; limitedmap mapAlreadyAskedFor(MAX_INV_SZ); @@ -1971,17 +1970,6 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c semOutbound = std::make_unique(std::min((nMaxOutbound + nMaxFeeler), nMaxConnections)); } - if (pnodeLocalHost == nullptr) { - CNetAddr local; - LookupHost("127.0.0.1", local, false); - - NodeId id = GetNewNodeId(); - uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize(); - - pnodeLocalHost = new CNode(id, nLocalServices, GetBestHeight(), INVALID_SOCKET, CAddress(CService(local, 0), nLocalServices), 0, nonce); - m_msgproc->InitializeNode(pnodeLocalHost); - } - // // Start threads // @@ -2096,9 +2084,6 @@ void CConnman::Stop() vNodesDisconnected.clear(); vhListenSocket.clear(); semOutbound.reset(); - if(pnodeLocalHost) - DeleteNode(pnodeLocalHost); - pnodeLocalHost = NULL; } void CConnman::DeleteNode(CNode* pnode) diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py index 66bb463f2374a..1c92df28c00f4 100755 --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -59,8 +59,8 @@ def run_test(self): msg.addrs = ADDRS with self.nodes[0].assert_debug_log([ 'Added 10 addresses from 127.0.0.1: 0 tried', - 'received: addr (301 bytes) peer=1', - 'sending addr (301 bytes) peer=2', + 'received: addr (301 bytes) peer=0', + 'sending addr (301 bytes) peer=1', ]): addr_source.send_and_ping(msg) self.nodes[0].setmocktime(int(time.time()) + 30 * 60) diff --git a/test/functional/p2p_addrv2_relay.py b/test/functional/p2p_addrv2_relay.py index b6cb9b19f0030..3f6b681f232ec 100755 --- a/test/functional/p2p_addrv2_relay.py +++ b/test/functional/p2p_addrv2_relay.py @@ -64,8 +64,8 @@ def run_test(self): msg.addrs = ADDRS with self.nodes[0].assert_debug_log([ 'Added 10 addresses from 127.0.0.1: 0 tried', - 'received: addrv2 (131 bytes) peer=1', - 'sending addrv2 (131 bytes) peer=2', + 'received: addrv2 (131 bytes) peer=0', + 'sending addrv2 (131 bytes) peer=1', ]): addr_source.send_and_ping(msg) self.nodes[0].setmocktime(int(time.time()) + 30 * 60) diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py index a5a29ba9e4b40..2e088f9e3381a 100755 --- a/test/functional/p2p_invalid_messages.py +++ b/test/functional/p2p_invalid_messages.py @@ -179,10 +179,10 @@ def test_addrv2_unrecognized_network(self): def test_large_inv(self): conn = self.nodes[0].add_p2p_connection(P2PInterface()) - with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=9 (0 -> 20): message inv size() = 50001']): + with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=8 (0 -> 20): message inv size() = 50001']): msg = messages.msg_inv([messages.CInv(1, 1)] * 50001) conn.send_and_ping(msg) - with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=9 (20 -> 40): message getdata size() = 50001']): + with self.nodes[0].assert_debug_log(['Misbehaving', 'peer=8 (20 -> 40): message getdata size() = 50001']): msg = messages.msg_getdata([messages.CInv(1, 1)] * 50001) conn.send_and_ping(msg) self.nodes[0].disconnect_p2ps()