test : updating wallet's last block processed manually.

furszy · furszy · commit f889dcb55b69 · 2021-03-10T16:24:18.000-03:00
diff --git a/src/test/librust/sapling_rpc_wallet_tests.cpp b/src/test/librust/sapling_rpc_wallet_tests.cpp
@@ -429,12 +429,13 @@ BOOST_AUTO_TEST_CASE(rpc_shieldsendmany_taddr_to_sapling)
     auto blockHash = block.GetHash();
     CBlockIndex fakeIndex {block};
     fakeIndex.nHeight = 1;
-    mapBlockIndex.insert(std::make_pair(blockHash, &fakeIndex));
+    BlockMap::iterator mi = mapBlockIndex.emplace(blockHash, &fakeIndex).first;
+    fakeIndex.phashBlock = &((*mi).first);
     chainActive.SetTip(&fakeIndex);
     BOOST_CHECK(chainActive.Contains(&fakeIndex));
     BOOST_CHECK_EQUAL(1, chainActive.Height());
-    wtx.m_confirm = CWalletTx::Confirmation(CWalletTx::Status::CONFIRMED, fakeIndex.nHeight, blockHash, 0);
-    pwalletMain->LoadToWallet(wtx);
+    std::vector<CTransactionRef> vtxConflicted;
+    pwalletMain->BlockConnected(std::make_shared<CBlock>(block), mi->second, vtxConflicted);
     BOOST_CHECK_MESSAGE(pwalletMain->GetAvailableBalance() > 0, "tx not confirmed");
 
     // Context that shieldsendmany requires
diff --git a/src/test/librust/sapling_wallet_tests.cpp b/src/test/librust/sapling_wallet_tests.cpp
@@ -351,8 +351,8 @@ BOOST_AUTO_TEST_CASE(SaplingNullifierIsSpent) {
     BOOST_CHECK(chainActive.Contains(&fakeIndex));
     BOOST_CHECK_EQUAL(0, chainActive.Height());
 
-    wtx.m_confirm = CWalletTx::Confirmation(CWalletTx::Status::CONFIRMED, 0, block.GetHash(), 0);
-    wallet.LoadToWallet(wtx);
+    std::vector<CTransactionRef> vtxConflicted;
+    wallet.BlockConnected(std::make_shared<CBlock>(block), mi->second, vtxConflicted);
 
     // Verify note has been spent
     BOOST_CHECK(wallet.GetSaplingScriptPubKeyMan()->IsSaplingSpent(nullifier));
@@ -421,6 +421,7 @@ BOOST_AUTO_TEST_CASE(NavigateFromSaplingNullifierToNote) {
     wallet.LoadToWallet(wtx);
 
     // Verify dummy note is now spent, as AddToWallet invokes AddToSpends()
+    wallet.SetLastBlockProcessed(mi->second);
     BOOST_CHECK(wallet.GetSaplingScriptPubKeyMan()->IsSaplingSpent(nullifier));
 
     // Test invariant: no witnesses means no nullifier.
@@ -520,6 +521,7 @@ BOOST_AUTO_TEST_CASE(SpentSaplingNoteIsFromMe) {
     // in the output descriptions of wtx.
     wallet.IncrementNoteWitnesses(&fakeIndex, &block, saplingTree);
     wallet.GetSaplingScriptPubKeyMan()->UpdateSaplingNullifierNoteMapForBlock(&block);
+    wallet.SetLastBlockProcessed(mi->second);
 
     // Retrieve the updated wtx from wallet
     wtx = wallet.mapWallet.at(wtx.GetHash());
@@ -590,6 +592,7 @@ BOOST_AUTO_TEST_CASE(SpentSaplingNoteIsFromMe) {
     wtx2.SetSaplingNoteData(saplingNoteData2);
     wtx2.m_confirm = CWalletTx::Confirmation(CWalletTx::Status::CONFIRMED, fakeIndex2.nHeight, block2.GetHash(), 0);
     wallet.LoadToWallet(wtx2);
+    wallet.SetLastBlockProcessed(mi2->second);
 
     // Verify note B is spent. AddToWallet invokes AddToSpends which updates mapTxSaplingNullifiers
     BOOST_CHECK(wallet.GetSaplingScriptPubKeyMan()->IsSaplingSpent(nullifier2));
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -420,6 +420,7 @@ BOOST_AUTO_TEST_CASE(cached_balances_tests)
     LOCK2(cs_main, wallet.cs_wallet);
     wallet.SetMinVersion(FEATURE_PRE_SPLIT_KEYPOOL);
     wallet.SetupSPKM(false);
+    wallet.SetLastBlockProcessed(chainActive.Tip());
 
     // Receive balance from an external source
     CTxDestination receivingAddr;
