diff --git a/src/seeder/bitcoin.h b/src/seeder/bitcoin.h --- a/src/seeder/bitcoin.h +++ b/src/seeder/bitcoin.h @@ -16,6 +16,8 @@ return Params().GetDefaultPort(); } +static const unsigned int MAX_ADDRS_PER_MESSAGE = 1000; + // The network magic to use. extern CMessageHeader::MessageMagic netMagic; diff --git a/src/seeder/bitcoin.cpp b/src/seeder/bitcoin.cpp --- a/src/seeder/bitcoin.cpp +++ b/src/seeder/bitcoin.cpp @@ -153,7 +153,7 @@ // fprintf(stdout, "%s: added address %s (#%i)\n", // ToString(you).c_str(), // addr.ToString().c_str(), (int)(vAddr->size())); - if (vAddr->size() > 1000) { + if (vAddr->size() > MAX_ADDRS_PER_MESSAGE) { doneAfter = 1; return PeerMessagingState::Finished; } diff --git a/src/seeder/test/p2p_messaging_tests.cpp b/src/seeder/test/p2p_messaging_tests.cpp --- a/src/seeder/test/p2p_messaging_tests.cpp +++ b/src/seeder/test/p2p_messaging_tests.cpp @@ -102,31 +102,27 @@ return payload; } -// After the 1000th addr, the seeder will only add one more address per addr -// message. -static const int ADDR_SOFT_CAP = 1000; - BOOST_AUTO_TEST_CASE(seeder_node_addr_test) { // vAddrs starts with 1 entry. - std::vector sendAddrs(ADDR_SOFT_CAP - 1, vAddr[0]); + std::vector sendAddrs(MAX_ADDRS_PER_MESSAGE - 1, vAddr[0]); // Happy path - // addrs are added normally to vAddr until ADDR_SOFT_CAP is reached. + // addrs are added normally to vAddr until MAX_ADDRS_PER_MESSAGE is reached. // Add addrs up to the soft cap. CDataStream addrMessage = CreateAddrMessage(sendAddrs); BOOST_CHECK_EQUAL(1, vAddr.size()); testNode->TestProcessMessage(NetMsgType::ADDR, addrMessage, PeerMessagingState::AwaitingMessages); - BOOST_CHECK_EQUAL(ADDR_SOFT_CAP, vAddr.size()); + BOOST_CHECK_EQUAL(MAX_ADDRS_PER_MESSAGE, vAddr.size()); - // ADDR_SOFT_CAP is exceeded + // MAX_ADDRS_PER_MESSAGE is exceeded sendAddrs.resize(1); addrMessage = CreateAddrMessage(sendAddrs); testNode->TestProcessMessage(NetMsgType::ADDR, addrMessage, PeerMessagingState::Finished); - BOOST_CHECK_EQUAL(ADDR_SOFT_CAP + 1, vAddr.size()); + BOOST_CHECK_EQUAL(MAX_ADDRS_PER_MESSAGE + 1, vAddr.size()); - // Test the seeder's behavior after ADDR_SOFT_CAP addrs + // Test the seeder's behavior after MAX_ADDRS_PER_MESSAGE addrs // Only one addr per ADDR message will be added, the rest are ignored size_t expectedSize = vAddr.size() + 1; for (size_t i = 1; i < 10; i++) {