sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: conflict resolve due to new fuzz test (versionbits) and -Wno-reorder compile flag

Browse Source
This commit is contained in:
Konstantin Akimov 2023-09-04 15:57:37 +07:00 committed by PastaPastaPasta
parent 4e03666ec9
commit bb8d06ae84
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/fuzz/versionbits.cpp
View File

@ -42,6 +42,7 @@ public:
bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override { return Condition(pindex->nVersion); } 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; } 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; } int64_t EndTime(const Consensus::Params& params) const override { return m_end; }
int Period(const Consensus::Params& params) const override { return m_period; } int Period(const Consensus::Params& params) const override { return m_period; }
int Threshold(const Consensus::Params& params, int nAttempt) const override { return m_threshold; } int Threshold(const Consensus::Params& params, int nAttempt) const override { return m_threshold; }

2
src/validation.cpp
View File

@ -1268,11 +1268,11 @@ CChainState::CChainState(CTxMemPool* mempool,
const std::unique_ptr<llmq::CQuorumBlockProcessor>& quorum_block_processor, const std::unique_ptr<llmq::CQuorumBlockProcessor>& quorum_block_processor,
std::optional<uint256> from_snapshot_blockhash) std::optional<uint256> from_snapshot_blockhash)
: m_mempool(mempool), : m_mempool(mempool),
m_mnhfManager(mnhfManager),
m_params(::Params()), m_params(::Params()),
m_clhandler(clhandler), m_clhandler(clhandler),
m_isman(isman), m_isman(isman),
m_quorum_block_processor(quorum_block_processor), m_quorum_block_processor(quorum_block_processor),
m_mnhfManager(mnhfManager),
m_evoDb(evoDb), m_evoDb(evoDb),
m_blockman(blockman), m_blockman(blockman),
m_from_snapshot_blockhash(from_snapshot_blockhash) {} m_from_snapshot_blockhash(from_snapshot_blockhash) {}