LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #5135

Browse source 
a31e8ba Make CBlockIndex* returned by GetDepthInMainChain const. (Daniel Kraft)

Signed-off-by: Gavin Andresen <gavinandresen@gmail.com>
This commit is contained in:
Gavin Andresen 2014-10-27 13:40:24 -04:00
commit 35ece7dd07
No known key found for this signature in database
GPG key ID: 7588242FBE38D3A8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet.cpp
View file

@ -2298,7 +2298,7 @@ int CMerkleTx::SetMerkleBranch(const CBlock& block)
return chainActive.Height() - pindex->nHeight + 1; return chainActive.Height() - pindex->nHeight + 1;
} }
int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const int CMerkleTx::GetDepthInMainChainINTERNAL(const CBlockIndex* &pindexRet) const
{ {
if (hashBlock == 0 || nIndex == -1) if (hashBlock == 0 || nIndex == -1)
return 0; return 0;
@ -2324,7 +2324,7 @@ int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const
return chainActive.Height() - pindex->nHeight + 1; return chainActive.Height() - pindex->nHeight + 1;
} }
int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const
{ {
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
int nResult = GetDepthInMainChainINTERNAL(pindexRet); int nResult = GetDepthInMainChainINTERNAL(pindexRet);

8
src/wallet.h
View file

@ -474,7 +474,7 @@ struct COutputEntry
class CMerkleTx : public CTransaction class CMerkleTx : public CTransaction
{ {
private: private:
int GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const; int GetDepthInMainChainINTERNAL(const CBlockIndex* &pindexRet) const;
public: public:
uint256 hashBlock; uint256 hashBlock;
@ -519,9 +519,9 @@ public:
// -1 : not in blockchain, and not in memory pool (conflicted transaction) // -1 : not in blockchain, and not in memory pool (conflicted transaction)
// 0 : in memory pool, waiting to be included in a block // 0 : in memory pool, waiting to be included in a block
// >=1 : this many blocks deep in the main chain // >=1 : this many blocks deep in the main chain
int GetDepthInMainChain(CBlockIndex* &pindexRet) const; int GetDepthInMainChain(const CBlockIndex* &pindexRet) const;
int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); } int GetDepthInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
bool IsInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChainINTERNAL(pindexRet) > 0; } bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChainINTERNAL(pindexRet) > 0; }
int GetBlocksToMaturity() const; int GetBlocksToMaturity() const;
bool AcceptToMemoryPool(bool fLimitFree=true, bool fRejectInsaneFee=true); bool AcceptToMemoryPool(bool fLimitFree=true, bool fRejectInsaneFee=true);
}; };