zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mapNullifiers -> mapNullifiersToNotes for clarity

This commit is contained in:
Jack Grigg 2016-08-31 15:11:35 +12:00
parent 4086e5ce98
commit ad20f2149a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/gtest/test_wallet.cpp
View File

@ -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) {

8
src/wallet/wallet.cpp
View File

@ -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();
}
}
}

2
src/wallet/wallet.h
View File

@ -650,7 +650,7 @@ public:
fBroadcastTransactions = false;
}
std::map<uint256, JSOutPoint> mapNullifiers;
std::map<uint256, JSOutPoint> mapNullifiersToNotes;
std::map<uint256, CWalletTx> mapWallet;
int64_t nOrderPosNext;