Skip to content

Commit 13e4a45

Browse files
JaredTateJaredTate
committed
Test Build Fixes
1 parent 8a4f945 commit 13e4a45

File tree

3 files changed

+29
-211
lines changed

3 files changed

+29
-211
lines changed

‎src/test/addrman_tests.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ class CAddrManTest
8282

8383
size_t size() const { return m_addrman->Size(); }
8484

85-
CAddrInfo Select() { return m_addrman->Select().first; }
85+
CAddress Select() { return m_addrman->Select().first; }
8686

87-
bool Good(const CAddress& addr) { return m_addrman->Good(addr); }
87+
bool Good(const CService& addr) { return m_addrman->Good(addr); }
8888

8989
void Attempt(const CService& addr, bool fCountFailure, NodeSeconds nTime) {
9090
m_addrman->Attempt(addr, fCountFailure, nTime);
@@ -110,7 +110,7 @@ BOOST_FIXTURE_TEST_SUITE(addrman_tests, BasicTestingSetup)
110110

111111
BOOST_AUTO_TEST_CASE(addrman_simple)
112112
{
113-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
113+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
114114

115115
CNetAddr source = ResolveIP("252.2.2.2");
116116

@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
144144
BOOST_CHECK(addrman->Size() >= 1);
145145

146146
// Test: reset addrman and test AddrMan::Add multiple addresses works as expected
147-
addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
147+
addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
148148
std::vector<CAddress> vAddr;
149149
vAddr.emplace_back(ResolveService("250.1.1.3", 8333), NODE_NONE);
150150
vAddr.emplace_back(ResolveService("250.1.1.4", 8333), NODE_NONE);
@@ -154,7 +154,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
154154

155155
BOOST_AUTO_TEST_CASE(addrman_ports)
156156
{
157-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
157+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
158158

159159
CNetAddr source = ResolveIP("252.2.2.2");
160160

@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
182182

183183
BOOST_AUTO_TEST_CASE(addrman_select)
184184
{
185-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
185+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
186186
BOOST_CHECK(!addrman->Select(false).first.IsValid());
187187
BOOST_CHECK(!addrman->Select(true).first.IsValid());
188188

@@ -241,7 +241,7 @@ BOOST_AUTO_TEST_CASE(addrman_select)
241241

242242
BOOST_AUTO_TEST_CASE(addrman_select_by_network)
243243
{
244-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
244+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
245245
BOOST_CHECK(!addrman->Select(/*new_only=*/true, NET_IPV4).first.IsValid());
246246
BOOST_CHECK(!addrman->Select(/*new_only=*/false, NET_IPV4).first.IsValid());
247247

@@ -328,7 +328,7 @@ BOOST_AUTO_TEST_CASE(addrman_select_special)
328328

329329
BOOST_AUTO_TEST_CASE(addrman_new_collisions)
330330
{
331-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
331+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
332332

333333
CNetAddr source = ResolveIP("252.2.2.2");
334334

@@ -338,7 +338,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
338338

339339
while (num_addrs < 22) { // Magic number! 250.1.1.1 - 250.1.1.22 do not collide with deterministic key = 1
340340
CService addr = ResolveService("250.1.1." + ToString(++num_addrs));
341-
BOOST_CHECK(addrman->Add({addr}, source));
341+
BOOST_CHECK(addrman->Add({CAddress(addr, NODE_NONE)}, source));
342342

343343
// Test: No collision in new table yet.
344344
BOOST_CHECK_EQUAL(addrman->Size(), num_addrs);
@@ -357,7 +357,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions)
357357

358358
BOOST_AUTO_TEST_CASE(addrman_new_multiplicity)
359359
{
360-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
360+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
361361
CAddress addr{CAddress(ResolveService("253.3.3.3", 8333), NODE_NONE)};
362362
const auto start_time{Now<NodeSeconds>()};
363363
addr.nTime = start_time;
@@ -389,7 +389,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_multiplicity)
389389

390390
BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
391391
{
392-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
392+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
393393

394394
CNetAddr source = ResolveIP("252.2.2.2");
395395

@@ -399,7 +399,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
399399

400400
while (num_addrs < 35) { // Magic number! 250.1.1.1 - 250.1.1.35 do not collide in tried with deterministic key = 1
401401
CService addr = ResolveService("250.1.1." + ToString(++num_addrs));
402-
BOOST_CHECK(addrman->Add({addr}, source));
402+
BOOST_CHECK(addrman->Add({CAddress(addr, NODE_NONE)}, source));
403403

404404
// Test: Add to tried without collision
405405
BOOST_CHECK(addrman->Good(CAddress(addr, NODE_NONE)));
@@ -418,7 +418,7 @@ BOOST_AUTO_TEST_CASE(addrman_tried_collisions)
418418

419419
BOOST_AUTO_TEST_CASE(addrman_getaddr)
420420
{
421-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
421+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
422422

423423
// Test: Sanity check, GetAddr should never return anything if addrman
424424
// is empty.
@@ -740,7 +740,7 @@ BOOST_AUTO_TEST_CASE(addrman_serialization)
740740
std::vector<bool> asmap1 = FromBytes(asmap_raw, sizeof(asmap_raw) * 8);
741741
NetGroupManager netgroupman{asmap1};
742742

743-
const auto ratio = GetCheckRatio(m_node);
743+
const auto ratio = 0;
744744
auto addrman_asmap1 = std::make_unique<AddrMan>(netgroupman, DETERMINISTIC, ratio);
745745
auto addrman_asmap1_dup = std::make_unique<AddrMan>(netgroupman, DETERMINISTIC, ratio);
746746
auto addrman_noasmap = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, ratio);
@@ -804,7 +804,7 @@ BOOST_AUTO_TEST_CASE(remove_invalid)
804804
{
805805
// Confirm that invalid addresses are ignored in unserialization.
806806

807-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
807+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
808808
DataStream stream{};
809809

810810
const CAddress new1{ResolveService("5.5.5.5"), NODE_NONE};
@@ -836,14 +836,14 @@ BOOST_AUTO_TEST_CASE(remove_invalid)
836836
BOOST_REQUIRE(pos + sizeof(tried2_raw_replacement) <= stream.size());
837837
memcpy(stream.data() + pos, tried2_raw_replacement, sizeof(tried2_raw_replacement));
838838

839-
addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
839+
addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
840840
stream >> *addrman;
841841
BOOST_CHECK_EQUAL(addrman->Size(), 2);
842842
}
843843

844844
BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
845845
{
846-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
846+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
847847

848848
BOOST_CHECK(addrman->Size() == 0);
849849

@@ -854,7 +854,7 @@ BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
854854
CNetAddr source = ResolveIP("252.2.2.2");
855855
for (unsigned int i = 1; i < 23; i++) {
856856
CService addr = ResolveService("250.1.1." + ToString(i));
857-
BOOST_CHECK(addrman->Add({addr}, source));
857+
BOOST_CHECK(addrman->Add({CAddress(addr, NODE_NONE)}, source));
858858

859859
// No collisions in tried.
860860
BOOST_CHECK(addrman->Good(addr));
@@ -876,13 +876,13 @@ BOOST_AUTO_TEST_CASE(addrman_selecttriedcollision)
876876

877877
BOOST_AUTO_TEST_CASE(addrman_noevict)
878878
{
879-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
879+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
880880

881881
// Add 35 addresses.
882882
CNetAddr source = ResolveIP("252.2.2.2");
883883
for (unsigned int i = 1; i < 36; i++) {
884884
CService addr = ResolveService("250.1.1." + ToString(i));
885-
BOOST_CHECK(addrman->Add({addr}, source));
885+
BOOST_CHECK(addrman->Add({CAddress(addr, NODE_NONE)}, source));
886886

887887
// No collision yet.
888888
BOOST_CHECK(addrman->Good(addr));
@@ -903,7 +903,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
903903
// Lets create two collisions.
904904
for (unsigned int i = 37; i < 59; i++) {
905905
CService addr = ResolveService("250.1.1." + ToString(i));
906-
BOOST_CHECK(addrman->Add({addr}, source));
906+
BOOST_CHECK(addrman->Add({CAddress(addr, NODE_NONE)}, source));
907907
BOOST_CHECK(addrman->Good(addr));
908908
}
909909

@@ -928,7 +928,7 @@ BOOST_AUTO_TEST_CASE(addrman_noevict)
928928

929929
BOOST_AUTO_TEST_CASE(addrman_evictionworks)
930930
{
931-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
931+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
932932

933933
BOOST_CHECK(addrman->Size() == 0);
934934

@@ -939,15 +939,15 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks)
939939
CNetAddr source = ResolveIP("252.2.2.2");
940940
for (unsigned int i = 1; i < 36; i++) {
941941
CService addr = ResolveService("250.1.1." + ToString(i));
942-
BOOST_CHECK(addrman->Add({addr}, source));
942+
BOOST_CHECK(addrman->Add({CAddress(addr, NODE_NONE)}, source));
943943

944944
// No collision yet.
945945
BOOST_CHECK(addrman->Good(addr));
946946
}
947947

948948
// Collision between 36 and 19.
949949
CService addr = ResolveService("250.1.1.36");
950-
BOOST_CHECK(addrman->Add({addr}, source));
950+
BOOST_CHECK(addrman->Add({CAddress(addr, NODE_NONE)}, source));
951951
BOOST_CHECK(!addrman->Good(addr));
952952

953953
auto info = addrman->SelectTriedCollision().first;
@@ -1016,7 +1016,7 @@ BOOST_AUTO_TEST_CASE(load_addrman)
10161016
const std::optional<CService> source{Lookup("252.5.1.1", 8333, false)};
10171017
BOOST_CHECK(source.has_value());
10181018
std::vector<CAddress> addresses{CAddress(addr1.value(), NODE_NONE), CAddress(addr2.value(), NODE_NONE), CAddress(addr3.value(), NODE_NONE)};
1019-
BOOST_CHECK(addrman->Add(addresses, source.value()));
1019+
BOOST_CHECK(addrman.Add(addresses, source.value()));
10201020
BOOST_CHECK(addrman.Size() == 3);
10211021

10221022
// Test that the de-serialization does not throw an exception.
@@ -1099,7 +1099,7 @@ BOOST_AUTO_TEST_CASE(load_addrman_corrupted)
10991099
BOOST_AUTO_TEST_CASE(addrman_update_address)
11001100
{
11011101
// Tests updating nTime via Connected() and nServices via SetServices()
1102-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
1102+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
11031103
CNetAddr source{ResolveIP("252.2.2.2")};
11041104
CAddress addr{CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE)};
11051105

@@ -1129,7 +1129,7 @@ BOOST_AUTO_TEST_CASE(addrman_update_address)
11291129

11301130
BOOST_AUTO_TEST_CASE(addrman_size)
11311131
{
1132-
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node));
1132+
auto addrman = std::make_unique<AddrMan>(EMPTY_NETGROUPMAN, DETERMINISTIC, 0);
11331133
const CNetAddr source = ResolveIP("252.2.2.2");
11341134

11351135
// empty addrman

‎src/test/bip32_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ TestVector test4 =
100100
0);
101101

102102
static void RunTest(const TestVector &test) {
103-
std::vector<unsigned char> seed = ParseHex(test.strHexMaster);
103+
std::vector<std::byte> seed{ParseHex<std::byte>(test.strHexMaster)};
104104
CExtKey key;
105105
CExtPubKey pubkey;
106-
key.SetSeed(seed.data(), seed.size());
106+
key.SetSeed(seed);
107107
pubkey = key.Neuter();
108108
for (const TestDerivation &derive : test.vDerive) {
109109
unsigned char data[74];

0 commit comments

Comments
 (0)