From fa422994116a7a053789304d56159760081479eb Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 25 Nov 2021 11:18:33 +0100 Subject: [PATCH] Remove nullptr check in GetBlockScriptFlags Commit d59b8d6aa1102ffac980c89e96105ddec9cfb579 removed the need for this check and it was never needed. --- src/validation.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/validation.cpp b/src/validation.cpp index 1959fa2c695..f21d6cdbf10 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1589,8 +1589,7 @@ static unsigned int GetBlockScriptFlags(const CBlockIndex& block_index, const Co // mainnet and testnet), so for simplicity, always leave P2SH // on except for the one violating block. if (consensusparams.BIP16Exception.IsNull() || // no bip16 exception on this chain - block_index.phashBlock == nullptr || // this is a new candidate block, eg from TestBlockValidity() - *block_index.phashBlock != consensusparams.BIP16Exception) // this block isn't the historical exception + *Assert(block_index.phashBlock) != consensusparams.BIP16Exception) // this block isn't the historical exception { // Enforce WITNESS rules whenever P2SH is in effect flags |= SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_WITNESS;