diff --git a/src/wallet/gtest/test_wallet.cpp b/src/wallet/gtest/test_wallet.cpp index 9c6092683..d06406e27 100644 --- a/src/wallet/gtest/test_wallet.cpp +++ b/src/wallet/gtest/test_wallet.cpp @@ -282,13 +282,13 @@ TEST(wallet_tests, navigate_from_nullifier_to_note) { wtx.SetNoteData(noteData); - EXPECT_EQ(0, wallet.mapNullifiers.count(nullifier)); + EXPECT_EQ(0, wallet.mapNullifiersToNotes.count(nullifier)); wallet.AddToWallet(wtx, true, NULL); - EXPECT_EQ(1, wallet.mapNullifiers.count(nullifier)); - EXPECT_EQ(wtx.GetTxid(), wallet.mapNullifiers[nullifier].hash); - EXPECT_EQ(0, wallet.mapNullifiers[nullifier].js); - EXPECT_EQ(1, wallet.mapNullifiers[nullifier].n); + EXPECT_EQ(1, wallet.mapNullifiersToNotes.count(nullifier)); + EXPECT_EQ(wtx.GetTxid(), wallet.mapNullifiersToNotes[nullifier].hash); + EXPECT_EQ(0, wallet.mapNullifiersToNotes[nullifier].js); + EXPECT_EQ(1, wallet.mapNullifiersToNotes[nullifier].n); } TEST(wallet_tests, cached_witnesses_empty_chain) { diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 9a1c86abd..7f6177337 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -823,7 +823,7 @@ void CWallet::UpdateNullifierNoteMap(const CWalletTx& wtx) { LOCK(cs_wallet); for (const mapNoteData_t::value_type& item : wtx.mapNoteData) { - mapNullifiers[item.second.nullifier] = item.first; + mapNullifiersToNotes[item.second.nullifier] = item.first; } } } @@ -1005,9 +1005,9 @@ void CWallet::SyncTransaction(const CTransaction& tx, const CBlock* pblock) } for (const JSDescription& jsdesc : tx.vjoinsplit) { for (const uint256& nullifier : jsdesc.nullifiers) { - if (mapNullifiers.count(nullifier) && - mapWallet.count(mapNullifiers[nullifier].hash)) { - mapWallet[mapNullifiers[nullifier].hash].MarkDirty(); + if (mapNullifiersToNotes.count(nullifier) && + mapWallet.count(mapNullifiersToNotes[nullifier].hash)) { + mapWallet[mapNullifiersToNotes[nullifier].hash].MarkDirty(); } } } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index ae2d3edc6..46d285010 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -650,7 +650,7 @@ public: fBroadcastTransactions = false; } - std::map mapNullifiers; + std::map mapNullifiersToNotes; std::map mapWallet; int64_t nOrderPosNext;