DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Consolidate for loops

Browse Source
This commit is contained in:
Eirik Ogilvie-Wigley
2018-07-12 15:35:41 -06:00
committed by Simon
parent 49695a97b5
commit 3c868d2b03
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/wallet.cpp
View File

@@ -891,12 +891,6 @@ void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
// height is one below it. // height is one below it.
nd->witnessHeight = pindex->nHeight - 1; nd->witnessHeight = pindex->nHeight - 1;
} }
}
}
nWitnessCacheSize -= 1;
for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) {
for (mapSproutNoteData_t::value_type& item : wtxItem.second.mapSproutNoteData) {
SproutNoteData* nd = &(item.second);
// Check the validity of the cache // Check the validity of the cache
// Technically if there are notes witnessed above the current // Technically if there are notes witnessed above the current
// height, their cache will now be invalid (relative to the new // height, their cache will now be invalid (relative to the new
@@ -908,10 +902,13 @@ void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
// reindex because the on-disk blocks had already resulted in a // reindex because the on-disk blocks had already resulted in a
// chain that didn't trigger the assertion below. // chain that didn't trigger the assertion below.
if (nd->witnessHeight < pindex->nHeight) { if (nd->witnessHeight < pindex->nHeight) {
assert(nWitnessCacheSize >= nd->witnesses.size()); // Subtract 1 to compare to what nWitnessCacheSize will be after
// decrementing.
assert((nWitnessCacheSize - 1) >= nd->witnesses.size());
} }
} }
} }
nWitnessCacheSize -= 1;
// TODO: If nWitnessCache is zero, we need to regenerate the caches (#1302) // TODO: If nWitnessCache is zero, we need to regenerate the caches (#1302)
assert(nWitnessCacheSize > 0); assert(nWitnessCacheSize > 0);