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

Rename mapTxNullifiers to mapTxSproutNullifiers.

This commit is contained in:
Simon 2018-07-27 16:56:57 -07:00
parent d5e490d9f2
commit 3438e26cc3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/wallet.cpp
View File

@ -583,10 +583,10 @@ set<uint256> CWallet::GetConflicts(const uint256& txid) const
for (const JSDescription& jsdesc : wtx.vjoinsplit) { for (const JSDescription& jsdesc : wtx.vjoinsplit) {
for (const uint256& nullifier : jsdesc.nullifiers) { for (const uint256& nullifier : jsdesc.nullifiers) {
if (mapTxNullifiers.count(nullifier) <= 1) { if (mapTxSproutNullifiers.count(nullifier) <= 1) {
continue; // No conflict if zero or one spends continue; // No conflict if zero or one spends
} }
range_n = mapTxNullifiers.equal_range(nullifier); range_n = mapTxSproutNullifiers.equal_range(nullifier);
for (TxNullifiers::const_iterator it = range_n.first; it != range_n.second; ++it) { for (TxNullifiers::const_iterator it = range_n.first; it != range_n.second; ++it) {
result.insert(it->second); result.insert(it->second);
} }
@ -713,7 +713,7 @@ bool CWallet::IsSpent(const uint256& hash, unsigned int n) const
bool CWallet::IsSpent(const uint256& nullifier) const bool CWallet::IsSpent(const uint256& nullifier) const
{ {
pair<TxNullifiers::const_iterator, TxNullifiers::const_iterator> range; pair<TxNullifiers::const_iterator, TxNullifiers::const_iterator> range;
range = mapTxNullifiers.equal_range(nullifier); range = mapTxSproutNullifiers.equal_range(nullifier);
for (TxNullifiers::const_iterator it = range.first; it != range.second; ++it) { for (TxNullifiers::const_iterator it = range.first; it != range.second; ++it) {
const uint256& wtxid = it->second; const uint256& wtxid = it->second;
@ -736,10 +736,10 @@ void CWallet::AddToTransparentSpends(const COutPoint& outpoint, const uint256& w
void CWallet::AddToSproutSpends(const uint256& nullifier, const uint256& wtxid) void CWallet::AddToSproutSpends(const uint256& nullifier, const uint256& wtxid)
{ {
mapTxNullifiers.insert(make_pair(nullifier, wtxid)); mapTxSproutNullifiers.insert(make_pair(nullifier, wtxid));
pair<TxNullifiers::iterator, TxNullifiers::iterator> range; pair<TxNullifiers::iterator, TxNullifiers::iterator> range;
range = mapTxNullifiers.equal_range(nullifier); range = mapTxSproutNullifiers.equal_range(nullifier);
SyncMetaData<uint256>(range); SyncMetaData<uint256>(range);
} }

2
src/wallet/wallet.h
View File

@ -715,7 +715,7 @@ private:
* detect and report conflicts (double-spends). * detect and report conflicts (double-spends).
*/ */
typedef TxSpendMap<uint256> TxNullifiers; typedef TxSpendMap<uint256> TxNullifiers;
TxNullifiers mapTxNullifiers; TxNullifiers mapTxSproutNullifiers;
void AddToTransparentSpends(const COutPoint& outpoint, const uint256& wtxid); void AddToTransparentSpends(const COutPoint& outpoint, const uint256& wtxid);
void AddToSproutSpends(const uint256& nullifier, const uint256& wtxid); void AddToSproutSpends(const uint256& nullifier, const uint256& wtxid);