diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2018-07-13 19:27:59 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2018-07-13 19:33:41 -0700 |
| commit | d6b2235ca45e072961e25a35e6a159e97c9e556b (patch) | |
| tree | 63451b78ade943300df38f24b96cc1c26a6018dd /src/wallet | |
| parent | 8f1106da584955839dee62d643731e228cf1dca2 (diff) | |
| parent | d6f39b6c6429fa3f8b496940cf001aaa648e9a21 (diff) | |
| download | bitcoin-d6b2235ca45e072961e25a35e6a159e97c9e556b.tar.xz | |
Merge #13630: Drop unused pindexRet arg to CMerkleTx::GetDepthInMainChain
d6f39b6c64 Drop unused pindexRet arg to CMerkleTx::GetDepthInMainChain (Ben Woosley)
Pull request description:
Tree-SHA512: 5f064a47e71113f90f296ab36dae92173ff3fc632ab4e1e85dc71d556cb9239d15939b1e542f4292dab93d336795b7f2e4ae64f6984303c852df8d24f54ccebe
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 3 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 244d5d65e9..3de0c0ad08 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -4377,7 +4377,7 @@ void CMerkleTx::SetMerkleBranch(const CBlockIndex* pindex, int posInBlock) nIndex = posInBlock; } -int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const +int CMerkleTx::GetDepthInMainChain() const { if (hashUnset()) return 0; @@ -4389,7 +4389,6 @@ int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const if (!pindex || !chainActive.Contains(pindex)) return 0; - pindexRet = pindex; return ((nIndex == -1) ? (-1) : 1) * (chainActive.Height() - pindex->nHeight + 1); } diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 0118ced687..d3c9b692ac 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -267,9 +267,8 @@ public: * 0 : in memory pool, waiting to be included in a block * >=1 : this many blocks deep in the main chain */ - int GetDepthInMainChain(const CBlockIndex* &pindexRet) const; - int GetDepthInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); } - bool IsInMainChain() const { const CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet) > 0; } + int GetDepthInMainChain() const; + bool IsInMainChain() const { return GetDepthInMainChain() > 0; } int GetBlocksToMaturity() const; bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); } bool isAbandoned() const { return (hashBlock == ABANDON_HASH); } |