aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorBen Woosley <ben.woosley@gmail.com>2018-07-11 00:22:10 -0400
committerBen Woosley <ben.woosley@gmail.com>2018-07-11 00:22:10 -0400
commitd6f39b6c6429fa3f8b496940cf001aaa648e9a21 (patch)
treee8472649a4ba973e8ae06a0f1c781033316febc7 /src/wallet
parentfad42e8c4a9d625146f82bab9a038d945d40ac4f (diff)
Drop unused pindexRet arg to CMerkleTx::GetDepthInMainChain
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet.cpp3
-rw-r--r--src/wallet/wallet.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index adc48a8650..506c4ee341 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -4416,7 +4416,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;
@@ -4428,7 +4428,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 b829394847..663538dc01 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); }