@@ -79,15 +79,10 @@ static CDataStream AddrmanToStream(const AddrManSerializationMock& _addrman)
79
79
80
80
class AddrManTest : public AddrMan
81
81
{
82
- private:
83
- bool deterministic;
84
82
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
+ {}
91
86
92
87
AddrInfo* Find (const CService& addr, int * pnId = nullptr )
93
88
{
@@ -760,8 +755,8 @@ BOOST_AUTO_TEST_CASE(addrman_serialization)
760
755
{
761
756
std::vector<bool > asmap1 = FromBytes (asmap_raw, sizeof (asmap_raw) * 8 );
762
757
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);
765
760
auto addrman_noasmap = std::make_unique<AddrManTest>();
766
761
CDataStream stream (SER_NETWORK, PROTOCOL_VERSION);
767
762
@@ -792,7 +787,7 @@ BOOST_AUTO_TEST_CASE(addrman_serialization)
792
787
BOOST_CHECK (bucketAndEntry_asmap1.second != bucketAndEntry_noasmap.second );
793
788
794
789
// 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);
796
791
addrman_noasmap = std::make_unique<AddrManTest>();
797
792
addrman_noasmap->Add ({addr}, default_source);
798
793
stream << *addrman_noasmap;
@@ -804,7 +799,7 @@ BOOST_AUTO_TEST_CASE(addrman_serialization)
804
799
BOOST_CHECK (bucketAndEntry_asmap1_deser.second == bucketAndEntry_asmap1_dup.second );
805
800
806
801
// 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);
808
803
addrman_noasmap = std::make_unique<AddrManTest>();
809
804
CAddress addr1 = CAddress (ResolveService (" 250.1.1.1" ), NODE_NONE);
810
805
CAddress addr2 = CAddress (ResolveService (" 250.2.1.1" ), NODE_NONE);
0 commit comments