Skip to content

Commit 5596200

Browse files
furszyfurszy
committed
test: coinselector_tests refactor, use CoinsResult instead of plain std::vector
No functional changes. Only cosmetic changes to simplify the follow-up commit.
1 parent 34f54a0 commit 5596200

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎src/wallet/test/coinselector_tests.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ inline std::vector<OutputGroup>& GroupCoins(const std::vector<COutput>& availabl
139139
return static_groups;
140140
}
141141

142-
inline std::vector<OutputGroup>& KnapsackGroupOutputs(const std::vector<COutput>& available_coins, CWallet& wallet, const CoinEligibilityFilter& filter)
142+
inline std::vector<OutputGroup>& KnapsackGroupOutputs(const CoinsResult& available_coins, CWallet& wallet, const CoinEligibilityFilter& filter)
143143
{
144144
FastRandomContext rand{};
145145
CoinSelectionParams coin_selection_params{
@@ -154,7 +154,7 @@ inline std::vector<OutputGroup>& KnapsackGroupOutputs(const std::vector<COutput>
154154
/*avoid_partial=*/ false,
155155
};
156156
static std::vector<OutputGroup> static_groups;
157-
static_groups = GroupOutputs(wallet, available_coins, coin_selection_params, filter, /*positive_only=*/false);
157+
static_groups = GroupOutputs(wallet, available_coins.All(), coin_selection_params, filter, /*positive_only=*/false);
158158
return static_groups;
159159
}
160160

@@ -418,25 +418,25 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
418418
available_coins.Clear();
419419

420420
// with an empty wallet we can't even pay one cent
421-
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_standard), 1 * CENT, CENT));
421+
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard), 1 * CENT, CENT));
422422

423423
add_coin(available_coins, *wallet, 1*CENT, CFeeRate(0), 4); // add a new 1 cent coin
424424

425425
// with a new 1 cent coin, we still can't find a mature 1 cent
426-
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_standard), 1 * CENT, CENT));
426+
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard), 1 * CENT, CENT));
427427

428428
// but we can find a new 1 cent
429-
const auto result1 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 1 * CENT, CENT);
429+
const auto result1 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 1 * CENT, CENT);
430430
BOOST_CHECK(result1);
431431
BOOST_CHECK_EQUAL(result1->GetSelectedValue(), 1 * CENT);
432432

433433
add_coin(available_coins, *wallet, 2*CENT); // add a mature 2 cent coin
434434

435435
// we can't make 3 cents of mature coins
436-
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_standard), 3 * CENT, CENT));
436+
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard), 3 * CENT, CENT));
437437

438438
// we can make 3 cents of new coins
439-
const auto result2 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 3 * CENT, CENT);
439+
const auto result2 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 3 * CENT, CENT);
440440
BOOST_CHECK(result2);
441441
BOOST_CHECK_EQUAL(result2->GetSelectedValue(), 3 * CENT);
442442

@@ -447,38 +447,38 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
447447
// now we have new: 1+10=11 (of which 10 was self-sent), and mature: 2+5+20=27. total = 38
448448

449449
// we can't make 38 cents only if we disallow new coins:
450-
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_standard), 38 * CENT, CENT));
450+
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard), 38 * CENT, CENT));
451451
// we can't even make 37 cents if we don't allow new coins even if they're from us
452-
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_standard_extra), 38 * CENT, CENT));
452+
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard_extra), 38 * CENT, CENT));
453453
// but we can make 37 cents if we accept new coins from ourself
454-
const auto result3 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_standard), 37 * CENT, CENT);
454+
const auto result3 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard), 37 * CENT, CENT);
455455
BOOST_CHECK(result3);
456456
BOOST_CHECK_EQUAL(result3->GetSelectedValue(), 37 * CENT);
457457
// and we can make 38 cents if we accept all new coins
458-
const auto result4 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 38 * CENT, CENT);
458+
const auto result4 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 38 * CENT, CENT);
459459
BOOST_CHECK(result4);
460460
BOOST_CHECK_EQUAL(result4->GetSelectedValue(), 38 * CENT);
461461

462462
// try making 34 cents from 1,2,5,10,20 - we can't do it exactly
463-
const auto result5 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 34 * CENT, CENT);
463+
const auto result5 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 34 * CENT, CENT);
464464
BOOST_CHECK(result5);
465465
BOOST_CHECK_EQUAL(result5->GetSelectedValue(), 35 * CENT); // but 35 cents is closest
466466
BOOST_CHECK_EQUAL(result5->GetInputSet().size(), 3U); // the best should be 20+10+5. it's incredibly unlikely the 1 or 2 got included (but possible)
467467

468468
// when we try making 7 cents, the smaller coins (1,2,5) are enough. We should see just 2+5
469-
const auto result6 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 7 * CENT, CENT);
469+
const auto result6 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 7 * CENT, CENT);
470470
BOOST_CHECK(result6);
471471
BOOST_CHECK_EQUAL(result6->GetSelectedValue(), 7 * CENT);
472472
BOOST_CHECK_EQUAL(result6->GetInputSet().size(), 2U);
473473

474474
// when we try making 8 cents, the smaller coins (1,2,5) are exactly enough.
475-
const auto result7 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 8 * CENT, CENT);
475+
const auto result7 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 8 * CENT, CENT);
476476
BOOST_CHECK(result7);
477477
BOOST_CHECK(result7->GetSelectedValue() == 8 * CENT);
478478
BOOST_CHECK_EQUAL(result7->GetInputSet().size(), 3U);
479479

480480
// when we try making 9 cents, no subset of smaller coins is enough, and we get the next bigger coin (10)
481-
const auto result8 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 9 * CENT, CENT);
481+
const auto result8 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 9 * CENT, CENT);
482482
BOOST_CHECK(result8);
483483
BOOST_CHECK_EQUAL(result8->GetSelectedValue(), 10 * CENT);
484484
BOOST_CHECK_EQUAL(result8->GetInputSet().size(), 1U);
@@ -493,34 +493,34 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
493493
add_coin(available_coins, *wallet, 30*CENT); // now we have 6+7+8+20+30 = 71 cents total
494494

495495
// check that we have 71 and not 72
496-
const auto result9 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 71 * CENT, CENT);
496+
const auto result9 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 71 * CENT, CENT);
497497
BOOST_CHECK(result9);
498-
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 72 * CENT, CENT));
498+
BOOST_CHECK(!KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 72 * CENT, CENT));
499499

500500
// now try making 16 cents. the best smaller coins can do is 6+7+8 = 21; not as good at the next biggest coin, 20
501-
const auto result10 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 16 * CENT, CENT);
501+
const auto result10 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 16 * CENT, CENT);
502502
BOOST_CHECK(result10);
503503
BOOST_CHECK_EQUAL(result10->GetSelectedValue(), 20 * CENT); // we should get 20 in one coin
504504
BOOST_CHECK_EQUAL(result10->GetInputSet().size(), 1U);
505505

506506
add_coin(available_coins, *wallet, 5*CENT); // now we have 5+6+7+8+20+30 = 75 cents total
507507

508508
// now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, better than the next biggest coin, 20
509-
const auto result11 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 16 * CENT, CENT);
509+
const auto result11 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 16 * CENT, CENT);
510510
BOOST_CHECK(result11);
511511
BOOST_CHECK_EQUAL(result11->GetSelectedValue(), 18 * CENT); // we should get 18 in 3 coins
512512
BOOST_CHECK_EQUAL(result11->GetInputSet().size(), 3U);
513513

514514
add_coin(available_coins, *wallet, 18*CENT); // now we have 5+6+7+8+18+20+30
515515

516516
// and now if we try making 16 cents again, the smaller coins can make 5+6+7 = 18 cents, the same as the next biggest coin, 18
517-
const auto result12 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 16 * CENT, CENT);
517+
const auto result12 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 16 * CENT, CENT);
518518
BOOST_CHECK(result12);
519519
BOOST_CHECK_EQUAL(result12->GetSelectedValue(), 18 * CENT); // we should get 18 in 1 coin
520520
BOOST_CHECK_EQUAL(result12->GetInputSet().size(), 1U); // because in the event of a tie, the biggest coin wins
521521

522522
// now try making 11 cents. we should get 5+6
523-
const auto result13 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 11 * CENT, CENT);
523+
const auto result13 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 11 * CENT, CENT);
524524
BOOST_CHECK(result13);
525525
BOOST_CHECK_EQUAL(result13->GetSelectedValue(), 11 * CENT);
526526
BOOST_CHECK_EQUAL(result13->GetInputSet().size(), 2U);
@@ -530,12 +530,12 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
530530
add_coin(available_coins, *wallet, 2*COIN);
531531
add_coin(available_coins, *wallet, 3*COIN);
532532
add_coin(available_coins, *wallet, 4*COIN); // now we have 5+6+7+8+18+20+30+100+200+300+400 = 1094 cents
533-
const auto result14 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 95 * CENT, CENT);
533+
const auto result14 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 95 * CENT, CENT);
534534
BOOST_CHECK(result14);
535535
BOOST_CHECK_EQUAL(result14->GetSelectedValue(), 1 * COIN); // we should get 1 BTC in 1 coin
536536
BOOST_CHECK_EQUAL(result14->GetInputSet().size(), 1U);
537537

538-
const auto result15 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 195 * CENT, CENT);
538+
const auto result15 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 195 * CENT, CENT);
539539
BOOST_CHECK(result15);
540540
BOOST_CHECK_EQUAL(result15->GetSelectedValue(), 2 * COIN); // we should get 2 BTC in 1 coin
541541
BOOST_CHECK_EQUAL(result15->GetInputSet().size(), 1U);
@@ -551,15 +551,15 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
551551

552552
// try making 1 * CENT from the 1.5 * CENT
553553
// we'll get change smaller than CENT whatever happens, so can expect CENT exactly
554-
const auto result16 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), CENT, CENT);
554+
const auto result16 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), CENT, CENT);
555555
BOOST_CHECK(result16);
556556
BOOST_CHECK_EQUAL(result16->GetSelectedValue(), CENT);
557557

558558
// but if we add a bigger coin, small change is avoided
559559
add_coin(available_coins, *wallet, 1111*CENT);
560560

561561
// try making 1 from 0.1 + 0.2 + 0.3 + 0.4 + 0.5 + 1111 = 1112.5
562-
const auto result17 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 1 * CENT, CENT);
562+
const auto result17 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 1 * CENT, CENT);
563563
BOOST_CHECK(result17);
564564
BOOST_CHECK_EQUAL(result17->GetSelectedValue(), 1 * CENT); // we should get the exact amount
565565

@@ -568,7 +568,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
568568
add_coin(available_coins, *wallet, CENT * 7 / 10);
569569

570570
// and try again to make 1.0 * CENT
571-
const auto result18 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 1 * CENT, CENT);
571+
const auto result18 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 1 * CENT, CENT);
572572
BOOST_CHECK(result18);
573573
BOOST_CHECK_EQUAL(result18->GetSelectedValue(), 1 * CENT); // we should get the exact amount
574574

@@ -578,7 +578,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
578578
for (int j = 0; j < 20; j++)
579579
add_coin(available_coins, *wallet, 50000 * COIN);
580580

581-
const auto result19 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 500000 * COIN, CENT);
581+
const auto result19 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 500000 * COIN, CENT);
582582
BOOST_CHECK(result19);
583583
BOOST_CHECK_EQUAL(result19->GetSelectedValue(), 500000 * COIN); // we should get the exact amount
584584
BOOST_CHECK_EQUAL(result19->GetInputSet().size(), 10U); // in ten coins
@@ -592,7 +592,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
592592
add_coin(available_coins, *wallet, CENT * 6 / 10);
593593
add_coin(available_coins, *wallet, CENT * 7 / 10);
594594
add_coin(available_coins, *wallet, 1111 * CENT);
595-
const auto result20 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 1 * CENT, CENT);
595+
const auto result20 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 1 * CENT, CENT);
596596
BOOST_CHECK(result20);
597597
BOOST_CHECK_EQUAL(result20->GetSelectedValue(), 1111 * CENT); // we get the bigger coin
598598
BOOST_CHECK_EQUAL(result20->GetInputSet().size(), 1U);
@@ -603,7 +603,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
603603
add_coin(available_coins, *wallet, CENT * 6 / 10);
604604
add_coin(available_coins, *wallet, CENT * 8 / 10);
605605
add_coin(available_coins, *wallet, 1111 * CENT);
606-
const auto result21 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), CENT, CENT);
606+
const auto result21 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), CENT, CENT);
607607
BOOST_CHECK(result21);
608608
BOOST_CHECK_EQUAL(result21->GetSelectedValue(), CENT); // we should get the exact amount
609609
BOOST_CHECK_EQUAL(result21->GetInputSet().size(), 2U); // in two coins 0.4+0.6
@@ -615,13 +615,13 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
615615
add_coin(available_coins, *wallet, CENT * 100);
616616

617617
// trying to make 100.01 from these three coins
618-
const auto result22 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), CENT * 10001 / 100, CENT);
618+
const auto result22 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), CENT * 10001 / 100, CENT);
619619
BOOST_CHECK(result22);
620620
BOOST_CHECK_EQUAL(result22->GetSelectedValue(), CENT * 10105 / 100); // we should get all coins
621621
BOOST_CHECK_EQUAL(result22->GetInputSet().size(), 3U);
622622

623623
// but if we try to make 99.9, we should take the bigger of the two small coins to avoid small change
624-
const auto result23 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), CENT * 9990 / 100, CENT);
624+
const auto result23 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), CENT * 9990 / 100, CENT);
625625
BOOST_CHECK(result23);
626626
BOOST_CHECK_EQUAL(result23->GetSelectedValue(), 101 * CENT);
627627
BOOST_CHECK_EQUAL(result23->GetInputSet().size(), 2U);
@@ -636,7 +636,7 @@ BOOST_AUTO_TEST_CASE(knapsack_solver_test)
636636

637637
// We only create the wallet once to save time, but we still run the coin selection RUN_TESTS times.
638638
for (int i = 0; i < RUN_TESTS; i++) {
639-
const auto result24 = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_confirmed), 2000, CENT);
639+
const auto result24 = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_confirmed), 2000, CENT);
640640
BOOST_CHECK(result24);
641641

642642
if (amt - 2000 < CENT) {
@@ -727,7 +727,7 @@ BOOST_AUTO_TEST_CASE(ApproximateBestSubset)
727727
add_coin(available_coins, *wallet, 1000 * COIN);
728728
add_coin(available_coins, *wallet, 3 * COIN);
729729

730-
const auto result = KnapsackSolver(KnapsackGroupOutputs(available_coins.All(), *wallet, filter_standard), 1003 * COIN, CENT, rand);
730+
const auto result = KnapsackSolver(KnapsackGroupOutputs(available_coins, *wallet, filter_standard), 1003 * COIN, CENT, rand);
731731
BOOST_CHECK(result);
732732
BOOST_CHECK_EQUAL(result->GetSelectedValue(), 1003 * COIN);
733733
BOOST_CHECK_EQUAL(result->GetInputSet().size(), 2U);

0 commit comments

Comments
 (0)