@@ -143,15 +143,15 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
143
143
BOOST_CHECK_EQUAL (addr_null.ToString (), " [::]:0" );
144
144
145
145
// Test: Does Addrman::Add work as expected.
146
- CService addr1 = ResolveService (" 250.1.1.1" , 8333 );
146
+ CService addr1 = ResolveService (" 250.1.1.1" , 12024 );
147
147
BOOST_CHECK (addrman.Add (CAddress (addr1, NODE_NONE), source));
148
148
BOOST_CHECK_EQUAL (addrman.size (), 1U );
149
149
CAddrInfo addr_ret1 = addrman.Select ();
150
- BOOST_CHECK_EQUAL (addr_ret1.ToString (), " 250.1.1.1:8333 " );
150
+ BOOST_CHECK_EQUAL (addr_ret1.ToString (), " 250.1.1.1:12024 " );
151
151
152
152
// Test: Does IP address deduplication work correctly.
153
153
// Expected dup IP should not be added.
154
- CService addr1_dup = ResolveService (" 250.1.1.1" , 8333 );
154
+ CService addr1_dup = ResolveService (" 250.1.1.1" , 12024 );
155
155
BOOST_CHECK (!addrman.Add (CAddress (addr1_dup, NODE_NONE), source));
156
156
BOOST_CHECK_EQUAL (addrman.size (), 1U );
157
157
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
162
162
// hash collisions may occur. But we can always be sure of at least one
163
163
// success.
164
164
165
- CService addr2 = ResolveService (" 250.1.1.2" , 8333 );
165
+ CService addr2 = ResolveService (" 250.1.1.2" , 12024 );
166
166
BOOST_CHECK (addrman.Add (CAddress (addr2, NODE_NONE), source));
167
167
BOOST_CHECK (addrman.size () >= 1 );
168
168
@@ -174,8 +174,8 @@ BOOST_AUTO_TEST_CASE(addrman_simple)
174
174
175
175
// Test: AddrMan::Add multiple addresses works as expected
176
176
std::vector<CAddress> vAddr;
177
- vAddr.push_back (CAddress (ResolveService (" 250.1.1.3" , 8333 ), NODE_NONE));
178
- vAddr.push_back (CAddress (ResolveService (" 250.1.1.4" , 8333 ), NODE_NONE));
177
+ vAddr.push_back (CAddress (ResolveService (" 250.1.1.3" , 12024 ), NODE_NONE));
178
+ vAddr.push_back (CAddress (ResolveService (" 250.1.1.4" , 12024 ), NODE_NONE));
179
179
BOOST_CHECK (addrman.Add (vAddr, source));
180
180
BOOST_CHECK (addrman.size () >= 1 );
181
181
}
@@ -189,23 +189,23 @@ BOOST_AUTO_TEST_CASE(addrman_ports)
189
189
BOOST_CHECK_EQUAL (addrman.size (), 0U );
190
190
191
191
// Test 7; Addr with same IP but diff port does not replace existing addr.
192
- CService addr1 = ResolveService (" 250.1.1.1" , 8333 );
192
+ CService addr1 = ResolveService (" 250.1.1.1" , 12024 );
193
193
BOOST_CHECK (addrman.Add (CAddress (addr1, NODE_NONE), source));
194
194
BOOST_CHECK_EQUAL (addrman.size (), 1U );
195
195
196
196
CService addr1_port = ResolveService (" 250.1.1.1" , 8334 );
197
197
BOOST_CHECK (!addrman.Add (CAddress (addr1_port, NODE_NONE), source));
198
198
BOOST_CHECK_EQUAL (addrman.size (), 1U );
199
199
CAddrInfo addr_ret2 = addrman.Select ();
200
- BOOST_CHECK_EQUAL (addr_ret2.ToString (), " 250.1.1.1:8333 " );
200
+ BOOST_CHECK_EQUAL (addr_ret2.ToString (), " 250.1.1.1:12024 " );
201
201
202
202
// Test: Add same IP but diff port to tried table, it doesn't get added.
203
203
// Perhaps this is not ideal behavior but it is the current behavior.
204
204
addrman.Good (CAddress (addr1_port, NODE_NONE));
205
205
BOOST_CHECK_EQUAL (addrman.size (), 1U );
206
206
bool newOnly = true ;
207
207
CAddrInfo addr_ret3 = addrman.Select (newOnly);
208
- BOOST_CHECK_EQUAL (addr_ret3.ToString (), " 250.1.1.1:8333 " );
208
+ BOOST_CHECK_EQUAL (addr_ret3.ToString (), " 250.1.1.1:12024 " );
209
209
}
210
210
211
211
@@ -216,13 +216,13 @@ BOOST_AUTO_TEST_CASE(addrman_select)
216
216
CNetAddr source = ResolveIP (" 252.2.2.2" );
217
217
218
218
// Test: Select from new with 1 addr in new.
219
- CService addr1 = ResolveService (" 250.1.1.1" , 8333 );
219
+ CService addr1 = ResolveService (" 250.1.1.1" , 12024 );
220
220
BOOST_CHECK (addrman.Add (CAddress (addr1, NODE_NONE), source));
221
221
BOOST_CHECK_EQUAL (addrman.size (), 1U );
222
222
223
223
bool newOnly = true ;
224
224
CAddrInfo addr_ret1 = addrman.Select (newOnly);
225
- BOOST_CHECK_EQUAL (addr_ret1.ToString (), " 250.1.1.1:8333 " );
225
+ BOOST_CHECK_EQUAL (addr_ret1.ToString (), " 250.1.1.1:12024 " );
226
226
227
227
// Test: move addr to tried, select from new expected nothing returned.
228
228
addrman.Good (CAddress (addr1, NODE_NONE));
@@ -231,30 +231,30 @@ BOOST_AUTO_TEST_CASE(addrman_select)
231
231
BOOST_CHECK_EQUAL (addr_ret2.ToString (), " [::]:0" );
232
232
233
233
CAddrInfo addr_ret3 = addrman.Select ();
234
- BOOST_CHECK_EQUAL (addr_ret3.ToString (), " 250.1.1.1:8333 " );
234
+ BOOST_CHECK_EQUAL (addr_ret3.ToString (), " 250.1.1.1:12024 " );
235
235
236
236
BOOST_CHECK_EQUAL (addrman.size (), 1U );
237
237
238
238
239
239
// Add three addresses to new table.
240
- CService addr2 = ResolveService (" 250.3.1.1" , 8333 );
240
+ CService addr2 = ResolveService (" 250.3.1.1" , 12024 );
241
241
CService addr3 = ResolveService (" 250.3.2.2" , 9999 );
242
242
CService addr4 = ResolveService (" 250.3.3.3" , 9999 );
243
243
244
- BOOST_CHECK (addrman.Add (CAddress (addr2, NODE_NONE), ResolveService (" 250.3.1.1" , 8333 )));
245
- BOOST_CHECK (addrman.Add (CAddress (addr3, NODE_NONE), ResolveService (" 250.3.1.1" , 8333 )));
246
- BOOST_CHECK (addrman.Add (CAddress (addr4, NODE_NONE), ResolveService (" 250.4.1.1" , 8333 )));
244
+ BOOST_CHECK (addrman.Add (CAddress (addr2, NODE_NONE), ResolveService (" 250.3.1.1" , 12024 )));
245
+ BOOST_CHECK (addrman.Add (CAddress (addr3, NODE_NONE), ResolveService (" 250.3.1.1" , 12024 )));
246
+ BOOST_CHECK (addrman.Add (CAddress (addr4, NODE_NONE), ResolveService (" 250.4.1.1" , 12024 )));
247
247
248
248
// Add three addresses to tried table.
249
- CService addr5 = ResolveService (" 250.4.4.4" , 8333 );
249
+ CService addr5 = ResolveService (" 250.4.4.4" , 12024 );
250
250
CService addr6 = ResolveService (" 250.4.5.5" , 7777 );
251
- CService addr7 = ResolveService (" 250.4.6.6" , 8333 );
251
+ CService addr7 = ResolveService (" 250.4.6.6" , 12024 );
252
252
253
- BOOST_CHECK (addrman.Add (CAddress (addr5, NODE_NONE), ResolveService (" 250.3.1.1" , 8333 )));
253
+ BOOST_CHECK (addrman.Add (CAddress (addr5, NODE_NONE), ResolveService (" 250.3.1.1" , 12024 )));
254
254
addrman.Good (CAddress (addr5, NODE_NONE));
255
- BOOST_CHECK (addrman.Add (CAddress (addr6, NODE_NONE), ResolveService (" 250.3.1.1" , 8333 )));
255
+ BOOST_CHECK (addrman.Add (CAddress (addr6, NODE_NONE), ResolveService (" 250.3.1.1" , 12024 )));
256
256
addrman.Good (CAddress (addr6, NODE_NONE));
257
- BOOST_CHECK (addrman.Add (CAddress (addr7, NODE_NONE), ResolveService (" 250.1.1.3" , 8333 )));
257
+ BOOST_CHECK (addrman.Add (CAddress (addr7, NODE_NONE), ResolveService (" 250.1.1.3" , 12024 )));
258
258
addrman.Good (CAddress (addr7, NODE_NONE));
259
259
260
260
// Test: 6 addrs + 1 addr from last test = 7.
@@ -327,9 +327,9 @@ BOOST_AUTO_TEST_CASE(addrman_find)
327
327
328
328
BOOST_CHECK_EQUAL (addrman.size (), 0U );
329
329
330
- CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 8333 ), NODE_NONE);
330
+ CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 12024 ), NODE_NONE);
331
331
CAddress addr2 = CAddress (ResolveService (" 250.1.2.1" , 9999 ), NODE_NONE);
332
- CAddress addr3 = CAddress (ResolveService (" 251.255.2.1" , 8333 ), NODE_NONE);
332
+ CAddress addr3 = CAddress (ResolveService (" 251.255.2.1" , 12024 ), NODE_NONE);
333
333
334
334
CNetAddr source1 = ResolveIP (" 250.1.2.1" );
335
335
CNetAddr source2 = ResolveIP (" 250.1.2.2" );
@@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(addrman_find)
341
341
// Test: ensure Find returns an IP matching what we searched on.
342
342
CAddrInfo* info1 = addrman.Find (addr1);
343
343
BOOST_REQUIRE (info1);
344
- BOOST_CHECK_EQUAL (info1->ToString (), " 250.1.2.1:8333 " );
344
+ BOOST_CHECK_EQUAL (info1->ToString (), " 250.1.2.1:12024 " );
345
345
346
346
// Test 18; Find does not discriminate by port number.
347
347
CAddrInfo* info2 = addrman.Find (addr2);
@@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE(addrman_find)
351
351
// Test: Find returns another IP matching what we searched on.
352
352
CAddrInfo* info3 = addrman.Find (addr3);
353
353
BOOST_REQUIRE (info3);
354
- BOOST_CHECK_EQUAL (info3->ToString (), " 251.255.2.1:8333 " );
354
+ BOOST_CHECK_EQUAL (info3->ToString (), " 251.255.2.1:12024 " );
355
355
}
356
356
357
357
BOOST_AUTO_TEST_CASE (addrman_create)
@@ -360,17 +360,17 @@ BOOST_AUTO_TEST_CASE(addrman_create)
360
360
361
361
BOOST_CHECK_EQUAL (addrman.size (), 0U );
362
362
363
- CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 8333 ), NODE_NONE);
363
+ CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 12024 ), NODE_NONE);
364
364
CNetAddr source1 = ResolveIP (" 250.1.2.1" );
365
365
366
366
int nId;
367
367
CAddrInfo* pinfo = addrman.Create (addr1, source1, &nId);
368
368
369
369
// Test: The result should be the same as the input addr.
370
- BOOST_CHECK_EQUAL (pinfo->ToString (), " 250.1.2.1:8333 " );
370
+ BOOST_CHECK_EQUAL (pinfo->ToString (), " 250.1.2.1:12024 " );
371
371
372
372
CAddrInfo* info2 = addrman.Find (addr1);
373
- BOOST_CHECK_EQUAL (info2->ToString (), " 250.1.2.1:8333 " );
373
+ BOOST_CHECK_EQUAL (info2->ToString (), " 250.1.2.1:12024 " );
374
374
}
375
375
376
376
@@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE(addrman_delete)
380
380
381
381
BOOST_CHECK_EQUAL (addrman.size (), 0U );
382
382
383
- CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 8333 ), NODE_NONE);
383
+ CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 12024 ), NODE_NONE);
384
384
CNetAddr source1 = ResolveIP (" 250.1.2.1" );
385
385
386
386
int nId;
@@ -404,15 +404,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr)
404
404
std::vector<CAddress> vAddr1 = addrman.GetAddr (/* max_addresses */ 0 , /* max_pct */ 0 , /* network */ std::nullopt);
405
405
BOOST_CHECK_EQUAL (vAddr1.size (), 0U );
406
406
407
- CAddress addr1 = CAddress (ResolveService (" 250.250.2.1" , 8333 ), NODE_NONE);
407
+ CAddress addr1 = CAddress (ResolveService (" 250.250.2.1" , 12024 ), NODE_NONE);
408
408
addr1.nTime = GetAdjustedTime (); // Set time so isTerrible = false
409
409
CAddress addr2 = CAddress (ResolveService (" 250.251.2.2" , 9999 ), NODE_NONE);
410
410
addr2.nTime = GetAdjustedTime ();
411
- CAddress addr3 = CAddress (ResolveService (" 251.252.2.3" , 8333 ), NODE_NONE);
411
+ CAddress addr3 = CAddress (ResolveService (" 251.252.2.3" , 12024 ), NODE_NONE);
412
412
addr3.nTime = GetAdjustedTime ();
413
- CAddress addr4 = CAddress (ResolveService (" 252.253.3.4" , 8333 ), NODE_NONE);
413
+ CAddress addr4 = CAddress (ResolveService (" 252.253.3.4" , 12024 ), NODE_NONE);
414
414
addr4.nTime = GetAdjustedTime ();
415
- CAddress addr5 = CAddress (ResolveService (" 252.254.4.5" , 8333 ), NODE_NONE);
415
+ CAddress addr5 = CAddress (ResolveService (" 252.254.4.5" , 12024 ), NODE_NONE);
416
416
addr5.nTime = GetAdjustedTime ();
417
417
CNetAddr source1 = ResolveIP (" 250.1.2.1" );
418
418
CNetAddr source2 = ResolveIP (" 250.2.3.3" );
@@ -461,7 +461,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket_legacy)
461
461
{
462
462
CAddrManTest addrman;
463
463
464
- CAddress addr1 = CAddress (ResolveService (" 250.1.1.1" , 8333 ), NODE_NONE);
464
+ CAddress addr1 = CAddress (ResolveService (" 250.1.1.1" , 12024 ), NODE_NONE);
465
465
CAddress addr2 = CAddress (ResolveService (" 250.1.1.1" , 9999 ), NODE_NONE);
466
466
467
467
CNetAddr source1 = ResolveIP (" 250.1.1.1" );
@@ -516,7 +516,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket_legacy)
516
516
{
517
517
CAddrManTest addrman;
518
518
519
- CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 8333 ), NODE_NONE);
519
+ CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 12024 ), NODE_NONE);
520
520
CAddress addr2 = CAddress (ResolveService (" 250.1.2.1" , 9999 ), NODE_NONE);
521
521
522
522
CNetAddr source1 = ResolveIP (" 250.1.2.1" );
@@ -594,7 +594,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket)
594
594
{
595
595
CAddrManTest addrman;
596
596
597
- CAddress addr1 = CAddress (ResolveService (" 250.1.1.1" , 8333 ), NODE_NONE);
597
+ CAddress addr1 = CAddress (ResolveService (" 250.1.1.1" , 12024 ), NODE_NONE);
598
598
CAddress addr2 = CAddress (ResolveService (" 250.1.1.1" , 9999 ), NODE_NONE);
599
599
600
600
CNetAddr source1 = ResolveIP (" 250.1.1.1" );
@@ -649,7 +649,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket)
649
649
{
650
650
CAddrManTest addrman;
651
651
652
- CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 8333 ), NODE_NONE);
652
+ CAddress addr1 = CAddress (ResolveService (" 250.1.2.1" , 12024 ), NODE_NONE);
653
653
CAddress addr2 = CAddress (ResolveService (" 250.1.2.1" , 9999 ), NODE_NONE);
654
654
655
655
CNetAddr source1 = ResolveIP (" 250.1.2.1" );
0 commit comments