From bb8d06ae843eff5b5b9605bbec5d3436ee432d63 Mon Sep 17 00:00:00 2001 From: Konstantin Akimov Date: Mon, 4 Sep 2023 15:57:37 +0700 Subject: [PATCH] fix: conflict resolve due to new fuzz test (versionbits) and -Wno-reorder compile flag --- src/test/fuzz/versionbits.cpp | 1 + src/validation.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/fuzz/versionbits.cpp b/src/test/fuzz/versionbits.cpp index 9563908679..1841a7d301 100644 --- a/src/test/fuzz/versionbits.cpp +++ b/src/test/fuzz/versionbits.cpp @@ -42,6 +42,7 @@ public: bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override { return Condition(pindex->nVersion); } int64_t BeginTime(const Consensus::Params& params) const override { return m_begin; } + int MasternodeBeginHeight(const Consensus::Params& params) const override { return 0; } int64_t EndTime(const Consensus::Params& params) const override { return m_end; } int Period(const Consensus::Params& params) const override { return m_period; } int Threshold(const Consensus::Params& params, int nAttempt) const override { return m_threshold; } diff --git a/src/validation.cpp b/src/validation.cpp index 0e41cdbb80..73721905b4 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1268,11 +1268,11 @@ CChainState::CChainState(CTxMemPool* mempool, const std::unique_ptr& quorum_block_processor, std::optional from_snapshot_blockhash) : m_mempool(mempool), - m_mnhfManager(mnhfManager), m_params(::Params()), m_clhandler(clhandler), m_isman(isman), m_quorum_block_processor(quorum_block_processor), + m_mnhfManager(mnhfManager), m_evoDb(evoDb), m_blockman(blockman), m_from_snapshot_blockhash(from_snapshot_blockhash) {}