Merge pull request #180 from Jongjan88/testwallet

Fix: wallet_tests.cpp
DigiByte-Core · Mar 14, 2024 · a5c305f · a5c305f
2 parents bdc295e + d450dd4
commit a5c305f
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -548,14 +548,10 @@ BOOST_FIXTURE_TEST_CASE(ListCoins, ListCoinsTestingSetup)
     }
     BOOST_CHECK_EQUAL(list.size(), 1U);
     BOOST_CHECK_EQUAL(std::get<PKHash>(list.begin()->first).ToString(), coinbaseAddress);
-    BOOST_CHECK_EQUAL(list.begin()->second.size(), COINBASE_MATURITY_2 - COINBASE_MATURITY + 1);
+    BOOST_CHECK_EQUAL(list.begin()->second.size(), 1U);
 
     // Check initial balance from one mature coinbase transaction.
-    CAmount expectedAmount = 0;
-    for (auto i = COINBASE_MATURITY; i < COINBASE_MATURITY_2 + 1; ++i) {
-        expectedAmount += GetBlockSubsidy(i, Params().GetConsensus());
-    }
-    BOOST_CHECK_EQUAL(expectedAmount, wallet->GetAvailableBalance());
+    BOOST_CHECK_EQUAL(72000 * COIN, wallet->GetAvailableBalance());
 
     // Add a transaction creating a change address, and confirm ListCoins still
     // returns the coin associated with the change address underneath the
@@ -568,14 +564,14 @@ BOOST_FIXTURE_TEST_CASE(ListCoins, ListCoinsTestingSetup)
     }
     BOOST_CHECK_EQUAL(list.size(), 1U);
     BOOST_CHECK_EQUAL(std::get<PKHash>(list.begin()->first).ToString(), coinbaseAddress);
-    BOOST_CHECK_EQUAL(list.begin()->second.size(), COINBASE_MATURITY_2 - COINBASE_MATURITY + 2);
+    BOOST_CHECK_EQUAL(list.begin()->second.size(), 2U);
 
     // Lock both coins. Confirm number of available coins drops to 0.
     {
         LOCK(wallet->cs_wallet);
         std::vector<COutput> available;
         wallet->AvailableCoins(available);
-        BOOST_CHECK_EQUAL(available.size(), COINBASE_MATURITY_2 - COINBASE_MATURITY + 2);
+        BOOST_CHECK_EQUAL(available.size(), 2U);
     }
     for (const auto& group : list) {
         for (const auto& coin : group.second) {
@@ -597,7 +593,7 @@ BOOST_FIXTURE_TEST_CASE(ListCoins, ListCoinsTestingSetup)
     }
     BOOST_CHECK_EQUAL(list.size(), 1U);
     BOOST_CHECK_EQUAL(std::get<PKHash>(list.begin()->first).ToString(), coinbaseAddress);
-    BOOST_CHECK_EQUAL(list.begin()->second.size(), COINBASE_MATURITY_2 - COINBASE_MATURITY + 2);
+    BOOST_CHECK_EQUAL(list.begin()->second.size(), 2U);
 }
 
 BOOST_FIXTURE_TEST_CASE(wallet_disableprivkeys, TestChain100Setup)