From 591749d9f124c142ae9a14b2300883bd5dace396 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Fri, 1 Sep 2023 17:17:44 +0200 Subject: [PATCH] build: fix issues from ASAN in CI --- src/node/blockstorage.cpp | 2 +- src/validation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp index 2458be41e7..63ed09fc40 100644 --- a/src/node/blockstorage.cpp +++ b/src/node/blockstorage.cpp @@ -798,7 +798,7 @@ bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus } if (block.GetHash() != pindex->GetBlockHash()) { return error("ReadBlockFromDisk(CBlock&, CBlockIndex*): GetHash() doesn't match index for %s at %s", - pindex->ToString(), pindex->GetBlockPos().ToString()); + pindex->ToString(), block_pos.ToString()); } return true; } diff --git a/src/validation.cpp b/src/validation.cpp index 24de807282..1bd2e18ba3 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -569,7 +569,7 @@ private: // All the intermediate state that gets passed between the various levels // of checking a given transaction. struct Workspace { - explicit Workspace(const CTransactionRef& ptx) : m_ptx(ptx), m_hash(ptx->GetHash()) {} + // explicit Workspace(const CTransactionRef& ptx) : m_ptx(ptx), m_hash(ptx->GetHash()) {} // ELEMENTS: unused since we need the genesis block hash explicit Workspace(const CTransactionRef& ptx, const uint256& hash_genesis_block) : m_ptx(ptx), m_hash(ptx->GetHash()), m_precomputed_txdata(hash_genesis_block) {} // ELEMENTS /** Txids of mempool transactions that this transaction directly conflicts with. */ std::set m_conflicts;