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

Auto merge of #3236 - str4d:3192-jsoutpoint-constructor, r=str4d

Browse Source 
Change JSOutPoint constructor to have js argument be uint64_t

Closes #3192.
This commit is contained in:
Homu
2018-05-08 02:50:04 -07:00
parent 333b9a0d0b e935beb810
commit 0a98b97524
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/wallet.cpp
View File

@@ -3448,13 +3448,13 @@ void CWallet::ListLockedCoins(std::vector<COutPoint>& vOutpts)
// Note Locking Operations
void CWallet::LockNote(JSOutPoint& output)
void CWallet::LockNote(const JSOutPoint& output)
{
AssertLockHeld(cs_wallet); // setLockedNotes
setLockedNotes.insert(output);
}
void CWallet::UnlockNote(JSOutPoint& output)
void CWallet::UnlockNote(const JSOutPoint& output)
{
AssertLockHeld(cs_wallet); // setLockedNotes
setLockedNotes.erase(output);
@@ -3466,10 +3466,9 @@ void CWallet::UnlockAllNotes()
setLockedNotes.clear();
}
bool CWallet::IsLockedNote(uint256 hash, size_t js, uint8_t n) const
bool CWallet::IsLockedNote(const JSOutPoint& outpt) const
{
AssertLockHeld(cs_wallet); // setLockedNotes
JSOutPoint outpt(hash, js, n);
return (setLockedNotes.count(outpt) > 0);
}
@@ -3771,7 +3770,7 @@ void CWallet::GetFilteredNotes(
}
// skip locked notes
if (IsLockedNote(jsop.hash, jsop.js, jsop.n)) {
if (IsLockedNote(jsop)) {
continue;
}