Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge #10765: Tests: address placement should be deterministic by def…
…ault

c5ebddd Tests: address placement should be deterministic by default (René Nyffenegger)

Pull request description:

  Better version of wrong and closed pull request #10764

Tree-SHA512: dfda6ea4a9dd0f4c8b96212ad43a716ff1dddf115cd2712a2a7e42c97fc9494079c746906b39d880a9827c05d2b75c728afd4ca4519ce4d365f0dae0c4aec24c
  • Loading branch information
MarcoFalke committed Aug 11, 2017
2 parents e5d26e4 + c5ebddd commit 2c811e0
Showing 1 changed file with 6 additions and 34 deletions.
40 changes: 6 additions & 34 deletions src/test/addrman_tests.cpp
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

0 comments on commit 2c811e0

Please sign in to comment.