Skip to content

Commit 7784a9a

Browse files
committed
[addrman] [tests] Remove deterministic argument and member from AddrManTest
It's always set to true.
1 parent a749fa5 commit 7784a9a

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/test/addrman_tests.cpp

+7-12
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,10 @@ static CDataStream AddrmanToStream(const AddrManSerializationMock& _addrman)
7979

8080
class AddrManTest : public AddrMan
8181
{
82-
private:
83-
bool deterministic;
8482
public:
85-
explicit AddrManTest(bool makeDeterministic = true,
86-
std::vector<bool> asmap = std::vector<bool>())
87-
: AddrMan(asmap, makeDeterministic, /* consistency_check_ratio */ 100)
88-
{
89-
deterministic = makeDeterministic;
90-
}
83+
explicit AddrManTest(std::vector<bool> asmap = std::vector<bool>())
84+
: AddrMan(asmap, /*deterministic=*/true, /* consistency_check_ratio */ 100)
85+
{}
9186

9287
AddrInfo* Find(const CService& addr, int* pnId = nullptr)
9388
{
@@ -760,8 +755,8 @@ BOOST_AUTO_TEST_CASE(addrman_serialization)
760755
{
761756
std::vector<bool> asmap1 = FromBytes(asmap_raw, sizeof(asmap_raw) * 8);
762757

763-
auto addrman_asmap1 = std::make_unique<AddrManTest>(true, asmap1);
764-
auto addrman_asmap1_dup = std::make_unique<AddrManTest>(true, asmap1);
758+
auto addrman_asmap1 = std::make_unique<AddrManTest>(asmap1);
759+
auto addrman_asmap1_dup = std::make_unique<AddrManTest>(asmap1);
765760
auto addrman_noasmap = std::make_unique<AddrManTest>();
766761
CDataStream stream(SER_NETWORK, PROTOCOL_VERSION);
767762

@@ -792,7 +787,7 @@ BOOST_AUTO_TEST_CASE(addrman_serialization)
792787
BOOST_CHECK(bucketAndEntry_asmap1.second != bucketAndEntry_noasmap.second);
793788

794789
// deserializing non-asmaped peers.dat to asmaped addrman
795-
addrman_asmap1 = std::make_unique<AddrManTest>(true, asmap1);
790+
addrman_asmap1 = std::make_unique<AddrManTest>(asmap1);
796791
addrman_noasmap = std::make_unique<AddrManTest>();
797792
addrman_noasmap->Add({addr}, default_source);
798793
stream << *addrman_noasmap;
@@ -804,7 +799,7 @@ BOOST_AUTO_TEST_CASE(addrman_serialization)
804799
BOOST_CHECK(bucketAndEntry_asmap1_deser.second == bucketAndEntry_asmap1_dup.second);
805800

806801
// used to map to different buckets, now maps to the same bucket.
807-
addrman_asmap1 = std::make_unique<AddrManTest>(true, asmap1);
802+
addrman_asmap1 = std::make_unique<AddrManTest>(asmap1);
808803
addrman_noasmap = std::make_unique<AddrManTest>();
809804
CAddress addr1 = CAddress(ResolveService("250.1.1.1"), NODE_NONE);
810805
CAddress addr2 = CAddress(ResolveService("250.2.1.1"), NODE_NONE);

0 commit comments

Comments
 (0)