aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2020-09-16 17:40:00 -0400
committerCarl Dong <contact@carldong.me>2021-02-18 14:49:10 -0500
commit71734c65dc491a4bb654ccbb7a1dd0e12131cee4 (patch)
tree96da01e7a131140c02a2085711ec8b17ec927493 /src/validation.cpp
parent120aaba9ac41af71a760aa0969dd090e96786fb3 (diff)
downloadbitcoin-71734c65dc491a4bb654ccbb7a1dd0e12131cee4.tar.xz
validation: Pass in chain to ::TestLockPointValidity
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index 0b4f0dbb4c..870f41a16f 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -237,7 +237,7 @@ bool CheckFinalTx(const CBlockIndex* active_chain_tip, const CTransaction &tx, i
return IsFinalTx(tx, nBlockHeight, nBlockTime);
}
-bool TestLockPointValidity(const LockPoints* lp)
+bool TestLockPointValidity(CChain& active_chain, const LockPoints* lp)
{
AssertLockHeld(cs_main);
assert(lp);
@@ -246,7 +246,8 @@ bool TestLockPointValidity(const LockPoints* lp)
if (lp->maxInputBlock) {
// Check whether ::ChainActive() is an extension of the block at which the LockPoints
// calculation was valid. If not LockPoints are no longer valid
- if (!::ChainActive().Contains(lp->maxInputBlock)) {
+ assert(std::addressof(::ChainActive()) == std::addressof(active_chain));
+ if (!active_chain.Contains(lp->maxInputBlock)) {
return false;
}
}