Unit tests for UTXO hasher in wallet.

Extend the unit tests in wallet_coinmanagement_tests.cpp to include
also explicit checks for situations in which the wallet is supposed
to the UTXO hasher rather than e.g. a plain transaction hash.

Author: domob1812

divi/src/test/FakeWallet.cpp

@@ -120,10 +120,8 @@ void FakeWallet::AddConfirmations(const unsigned numConf, const int64_t minAge)
   fakeChain.addBlocks(numConf, version, fakeChain.activeChain->Tip()->nTime + minAge);
 }
 
-const CWalletTx& FakeWallet::AddDefaultTx(const CScript& scriptToPayTo, unsigned& outputIndex,
-                                          const CAmount amount)
+const CWalletTx& FakeWallet::Add(const CTransaction& tx)
 {
-  const CMutableTransaction tx = createDefaultTransaction(scriptToPayTo, outputIndex, amount);
   const CMerkleTx merkleTx(tx, *fakeChain.activeChain, *fakeChain.blockIndexByHash);
   const CWalletTx wtx(merkleTx);
   AddToWallet(wtx);
@@ -132,6 +130,12 @@ const CWalletTx& FakeWallet::AddDefaultTx(const CScript& scriptToPayTo, unsigned
   return *txPtr;
 }
 
+const CWalletTx& FakeWallet::AddDefaultTx(const CScript& scriptToPayTo, unsigned& outputIndex,
+                                          const CAmount amount)
+{
+  return Add(createDefaultTransaction(scriptToPayTo, outputIndex, amount));
+}
+
 void FakeWallet::FakeAddToChain(const CWalletTx& tx)
 {
   auto* txPtr = const_cast<CWalletTx*>(&tx);

divi/src/test/FakeWallet.h

@@ -45,6 +45,9 @@ class FakeWallet : public CWallet
    *  and number of confirmations.  */
   void AddConfirmations(unsigned numConf, int64_t minAge = 0);
 
+  /** Adds a given transaction to the wallet.  */
+  const CWalletTx& Add(const CTransaction& tx);
+
   /** Adds a new ordinary transaction to the wallet, paying a given amount
    *  to a given script.  The transaction is returned, and the output index
    *  with the output to the requested script is set.  */

divi/src/test/wallet_coinmanagement_tests.cpp

@@ -15,18 +15,24 @@
 #include <chain.h>
 #include <blockmap.h>
 #include <test/FakeWallet.h>
+#include <test/MockUtxoHasher.h>
 #include <StakableCoin.h>
 
 class WalletCoinManagementTestFixture
 {
 public:
     FakeBlockIndexWithHashes fakeChain;
     FakeWallet wallet;
+    MockUtxoHasher* utxoHasher;
 
     WalletCoinManagementTestFixture()
       : fakeChain(1, 1600000000, 1), wallet(fakeChain)
     {
         ENTER_CRITICAL_SECTION(wallet.cs_wallet);
+
+        std::unique_ptr<MockUtxoHasher> hasher(new MockUtxoHasher());
+        utxoHasher = hasher.get();
+        wallet.SetUtxoHasherForTesting(std::move(hasher));
     }
     ~WalletCoinManagementTestFixture()
     {
@@ -400,4 +406,63 @@ BOOST_AUTO_TEST_CASE(willEnsureStakingBalanceAndTotalBalanceAgreeEvenIfTxsBelong
     BOOST_CHECK_EQUAL_MESSAGE(stakableCoins.size(),2,"Missing coins in the stakable set");
 }
 
+BOOST_AUTO_TEST_CASE(willUseUtxoHasherForCoinLock)
+{
+    CScript defaultScript = GetScriptForDestination(wallet.getNewKey().GetID());
+    unsigned outputIndex=0;
+    const CWalletTx& wtx = wallet.AddDefaultTx(defaultScript,outputIndex, COIN);
+    const auto id = utxoHasher->Add(wtx);
+
+    wallet.LockCoin(COutPoint(id, outputIndex));
+
+    bool fIsSpendable;
+    BOOST_CHECK(!wallet.IsAvailableForSpending(&wtx,outputIndex,false,fIsSpendable,ALL_SPENDABLE_COINS));
+
+    BOOST_CHECK_EQUAL(wallet.ComputeCredit(wtx, ISMINE_SPENDABLE, REQUIRE_UNLOCKED), 0);
+    BOOST_CHECK_EQUAL(wallet.ComputeCredit(wtx, ISMINE_SPENDABLE, REQUIRE_LOCKED), COIN);
+}
+
+BOOST_AUTO_TEST_CASE(willMarkOutputsSpentBasedOnUtxoHasher)
+{
+    CScript defaultScript = GetScriptForDestination(wallet.getNewKey().GetID());
+    unsigned outputIndex=0;
+    const CWalletTx& wtx = wallet.AddDefaultTx(defaultScript,outputIndex, COIN);
+    const auto id = utxoHasher->Add(wtx);
+
+    CMutableTransaction mtx;
+    mtx.vin.emplace_back(id, outputIndex);
+    const auto& spendTx = wallet.Add(mtx);
+
+    /* The wallet's IsSpent check verifies also the spending tx' number
+       of confirmations, which requires it to be either in the chain or
+       in the mempool at least.  */
+    wallet.FakeAddToChain(wtx);
+    wallet.FakeAddToChain(spendTx);
+
+    BOOST_CHECK(wallet.IsSpent(wtx, outputIndex));
+    bool fIsSpendable;
+    BOOST_CHECK(!wallet.IsAvailableForSpending(&wtx,outputIndex,false,fIsSpendable,ALL_SPENDABLE_COINS));
+}
+
+BOOST_AUTO_TEST_CASE(willUseUtxoHashForSpendingCoins)
+{
+    CScript defaultScript = GetScriptForDestination(wallet.getNewKey().GetID());
+    unsigned outputIndex=0;
+    const CWalletTx& wtx = wallet.AddDefaultTx(defaultScript,outputIndex, COIN);
+    const auto id = utxoHasher->Add(wtx);
+    wallet.FakeAddToChain(wtx);
+
+    const CScript sendTo = CScript() << OP_TRUE;
+    std::string strError;
+    CReserveKey reserveKey(wallet);
+    CAmount nFeeRequired;
+    CWalletTx wtxNew;
+    BOOST_CHECK(wallet.CreateTransaction({{sendTo, COIN / 10}}, wtxNew, reserveKey, ALL_SPENDABLE_COINS, nullptr).second);
+
+    BOOST_CHECK_EQUAL(wtxNew.vin.size(), 1);
+    const auto& prevout = wtxNew.vin[0].prevout;
+    BOOST_CHECK(prevout.hash == id);
+    BOOST_CHECK_EQUAL(prevout.n, outputIndex);
+}
+
 BOOST_AUTO_TEST_SUITE_END()