Skip to content

Tests: address placement should be deterministic by default #10765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2017
Merged

Tests: address placement should be deterministic by default #10765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 6 additions & 34 deletions src/test/addrman_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@ class CAddrManTest : public CAddrMan
uint64_t state;

public:
CAddrManTest()
CAddrManTest(bool makeDeterministic = true)
{
state = 1;

if (makeDeterministic) {
// Set addrman addr placement to be deterministic.
MakeDeterministic();
}
}

//! Ensure that bucket placement is always the same for testing purposes.
Expand Down Expand Up @@ -79,9 +84,6 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

CNetAddr source = ResolveIP("252.2.2.2");

// Test: Does Addrman respond correctly when empty.
Expand Down Expand Up @@ -131,9 +133,6 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

CNetAddr source = ResolveIP("252.2.2.2");

BOOST_CHECK_EQUAL(addrman.size(), 0);
Expand Down Expand Up @@ -163,9 +162,6 @@ BOOST_AUTO_TEST_CASE(addrman_select)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

CNetAddr source = ResolveIP("252.2.2.2");

// Test: Select from new with 1 addr in new.
Expand Down Expand Up @@ -225,9 +221,6 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

CNetAddr source = ResolveIP("252.2.2.2");

BOOST_CHECK_EQUAL(addrman.size(), 0);
Expand All @@ -254,9 +247,6 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

CNetAddr source = ResolveIP("252.2.2.2");

BOOST_CHECK_EQUAL(addrman.size(), 0);
Expand Down Expand Up @@ -284,9 +274,6 @@ BOOST_AUTO_TEST_CASE(addrman_find)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

BOOST_CHECK_EQUAL(addrman.size(), 0);

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
Expand Down Expand Up @@ -320,9 +307,6 @@ BOOST_AUTO_TEST_CASE(addrman_create)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

BOOST_CHECK_EQUAL(addrman.size(), 0);

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
Expand All @@ -343,9 +327,6 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

BOOST_CHECK_EQUAL(addrman.size(), 0);

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
Expand All @@ -366,9 +347,6 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

// Test: Sanity check, GetAddr should never return anything if addrman
// is empty.
BOOST_CHECK_EQUAL(addrman.size(), 0);
Expand Down Expand Up @@ -430,9 +408,6 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE);
CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE);

Expand Down Expand Up @@ -487,9 +462,6 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
{
CAddrManTest addrman;

// Set addrman addr placement to be deterministic.
addrman.MakeDeterministic();

CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE);
CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE);

Expand Down