diff --git a/src/Makefile.seedertest.include b/src/Makefile.seedertest.include
index e76f9a7ba..73c916583 100644
--- a/src/Makefile.seedertest.include
+++ b/src/Makefile.seedertest.include
@@ -1,29 +1,29 @@
# Copyright (c) 2019 The Bitcoin developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
bin_PROGRAMS += seeder/test/test_bitcoin-seeder
TESTS += seeder/test/test_bitcoin-seeder
seeder_test_test_bitcoin_seeder_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_SEEDER_INCLUDES) \
$(SEEDER_INCLUDES) $(SEEDER_TEST_INCLUDES) $(TESTDEFS)
seeder_test_test_bitcoin_seeder_SOURCES = \
- seeder/test/seeder_tests.cpp \
+ seeder/test/p2p_messaging_tests.cpp \
seeder/test/dns_tests.cpp
seeder_test_test_bitcoin_seeder_LDADD = $(LIBBITCOIN_SEEDER)
seeder_test_test_bitcoin_seeder_LDADD += $(LIBBITCOIN_COMMON) $(LIBBITCOIN_CONSENSUS) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UTIL) \
$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(CRYPTO_LIBS)
seeder_test_test_bitcoin_seeder_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
seeder_test_test_bitcoin_seeder_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
test_bitcoin_seeder : seeder/test/test_bitcoin-seeder$(EXEEXT)
test_bitcoin_seeder_check : seeder/test/test_bitcoin-seeder$(EXEEXT) FORCE
$(MAKE) check-TESTS TESTS=$^
test_bitcoin_seeder_clean: FORCE
rm -f $(seeder_test_test_bitcoin_seeder_OBJECTS)
diff --git a/src/seeder/test/CMakeLists.txt b/src/seeder/test/CMakeLists.txt
index 41c1d4929..fb0d2588e 100644
--- a/src/seeder/test/CMakeLists.txt
+++ b/src/seeder/test/CMakeLists.txt
@@ -1,21 +1,21 @@
# Copyright (c) 2019 The Bitcoin developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
project(bitcoin-seeder-test)
include(TestSuite)
create_test_suite(bitcoin-seeder)
add_dependencies(check check-bitcoin-seeder)
add_boost_unit_tests_to_suite(bitcoin-seeder test_bitcoin-seeder
TESTS
- seeder_tests.cpp
+ p2p_messaging_tests.cpp
dns_tests.cpp
)
target_link_libraries(test_bitcoin-seeder
common
bitcoinconsensus
seeder
)
diff --git a/src/seeder/test/seeder_tests.cpp b/src/seeder/test/p2p_messaging_tests.cpp
similarity index 98%
rename from src/seeder/test/seeder_tests.cpp
rename to src/seeder/test/p2p_messaging_tests.cpp
index ea34ae7a6..ca01ee5d1 100644
--- a/src/seeder/test/seeder_tests.cpp
+++ b/src/seeder/test/p2p_messaging_tests.cpp
@@ -1,137 +1,137 @@
// Copyright (c) 2019 The Bitcoin developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#define BOOST_TEST_MODULE Bitcoin Seeder Test Suite
#include <chainparams.h>
#include <protocol.h>
#include <seeder/bitcoin.h>
#include <seeder/db.h>
#include <serialize.h>
#include <streams.h>
#include <util/system.h>
#include <version.h>
#include <memory>
#include <string>
#include <vector>
const std::function<std::string(const char *)> G_TRANSLATION_FUN = nullptr;
#include <boost/test/unit_test.hpp>
static const unsigned short SERVICE_PORT = 18444;
static const int SEEDER_INIT_VERSION = 0;
// After the 1000th addr, the seeder will only add one more address per addr
// message.
static const int ADDR_SOFT_CAP = 1000;
enum PeerMessagingState : bool {
Finished = true,
AwaitingMessages = false,
};
static CDataStream
CreateVersionMessage(int64_t now, CAddress addrTo, CAddress addrFrom,
int32_t start_height, uint32_t nVersion,
uint64_t nonce = 0,
std::string user_agent = "/bitcoin-cash-seeder:0.15/") {
CDataStream payload(SER_NETWORK, 0);
payload.SetVersion(nVersion);
ServiceFlags serviceflags = ServiceFlags(NODE_NETWORK);
payload << nVersion << uint64_t(serviceflags) << now << addrTo << addrFrom
<< nonce << user_agent << start_height;
return payload;
}
static CDataStream CreateAddrMessage(std::vector<CAddress> sendAddrs,
uint32_t nVersion = INIT_PROTO_VERSION) {
CDataStream payload(SER_NETWORK, 0);
payload.SetVersion(nVersion);
payload << sendAddrs;
return payload;
}
class TestCSeederNode : public CSeederNode {
public:
TestCSeederNode(const CService &service, std::vector<CAddress> *vAddrIn)
: CSeederNode(service, vAddrIn) {
SelectParams(CBaseChainParams::REGTEST);
}
void TestProcessMessage(const std::string &strCommand, CDataStream &message,
PeerMessagingState state) {
bool ret = CSeederNode::ProcessMessage(strCommand, message);
BOOST_CHECK_EQUAL(ret, bool(state));
}
};
struct SeederTestingSetup {
SeederTestingSetup() {
CNetAddr ip;
ip.SetInternal("bitcoin.test");
CService service = {ip, SERVICE_PORT};
vAddr.emplace_back(service, ServiceFlags());
testNode = std::make_unique<TestCSeederNode>(service, &vAddr);
}
std::vector<CAddress> vAddr;
std::unique_ptr<TestCSeederNode> testNode;
};
-BOOST_FIXTURE_TEST_SUITE(seeder_tests, SeederTestingSetup)
+BOOST_FIXTURE_TEST_SUITE(p2p_messaging_tests, SeederTestingSetup)
BOOST_AUTO_TEST_CASE(seeder_node_version_test) {
CService serviceFrom;
CAddress addrFrom(serviceFrom,
ServiceFlags(NODE_NETWORK | NODE_BITCOIN_CASH));
CDataStream versionMessage =
CreateVersionMessage(time(nullptr), vAddr[0], addrFrom,
GetRequireHeight(), INIT_PROTO_VERSION);
// Verify the version is set as the initial value
BOOST_CHECK_EQUAL(testNode->CSeederNode::GetClientVersion(),
SEEDER_INIT_VERSION);
testNode->TestProcessMessage(NetMsgType::VERSION, versionMessage,
PeerMessagingState::AwaitingMessages);
// Verify the version has been updated
BOOST_CHECK_EQUAL(testNode->CSeederNode::GetClientVersion(),
versionMessage.GetVersion());
}
BOOST_AUTO_TEST_CASE(seeder_node_addr_test) {
// vAddrs starts with 1 entry.
std::vector<CAddress> sendAddrs(ADDR_SOFT_CAP - 1, vAddr[0]);
// Happy path
// addrs are added normally to vAddr until ADDR_SOFT_CAP 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());
// ADDR_SOFT_CAP is exceeded
sendAddrs.resize(1);
addrMessage = CreateAddrMessage(sendAddrs);
testNode->TestProcessMessage(NetMsgType::ADDR, addrMessage,
PeerMessagingState::Finished);
BOOST_CHECK_EQUAL(ADDR_SOFT_CAP + 1, vAddr.size());
// Test the seeder's behavior after ADDR_SOFT_CAP 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++) {
sendAddrs.resize(i, sendAddrs[0]);
addrMessage = CreateAddrMessage(sendAddrs);
testNode->TestProcessMessage(NetMsgType::ADDR, addrMessage,
PeerMessagingState::Finished);
BOOST_CHECK_EQUAL(expectedSize, vAddr.size());
++expectedSize;
}
}
BOOST_AUTO_TEST_SUITE_END()