sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #9446: SetMerkleBranch: remove unused code, remove cs_main lock requirement

Browse Source 
9e351c9 SetMerkleBranch: remove unused code, remove cs_main lock requirement (Jonas Schnelli)
This commit is contained in:
Jonas Schnelli 2017-01-03 09:31:45 +01:00 committed by Alexander Block
parent a590da317c
commit 7b7ce8997a
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/wallet.cpp
View File

@ -5167,21 +5167,13 @@ CWalletKey::CWalletKey(int64_t nExpires)
nTimeExpires = nExpires; nTimeExpires = nExpires;
} }
int CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock) void CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock)
{ {
AssertLockHeld(cs_main);
// Update the tx's hashBlock // Update the tx's hashBlock
hashBlock = pindex->GetBlockHash(); hashBlock = pindex->GetBlockHash();
// set the position of the transaction in the block // set the position of the transaction in the block
nIndex = posInBlock; nIndex = posInBlock;
// Is the tx in a block that's in the main chain
if (!chainActive.Contains(pindex))
return 0;
return chainActive.Height() - pindex->nHeight + 1;
} }
int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet, bool enableIX) const int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet, bool enableIX) const

2
src/wallet/wallet.h
View File

@ -257,7 +257,7 @@ public:
READWRITE(nIndex); READWRITE(nIndex);
} }
int SetMerkleBranch(const CBlockIndex* pIndex, int posInBlock); void SetMerkleBranch(const CBlockIndex* pIndex, int posInBlock);
/** /**
* Return depth of transaction in blockchain: * Return depth of transaction in blockchain: