zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SetMerkleBranch: remove unused code, remove cs_main lock requirement

This commit is contained in:
Jonas Schnelli 2016-12-30 10:35:43 +01:00
parent bebe3697fd
commit 9e351c9586
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
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

@ -3736,21 +3736,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) const int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const

2
src/wallet/wallet.h
View File

@ -218,7 +218,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: