From 2afcf24408b4453e4418ebfb326b141f6ea8647c Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Fri, 18 Dec 2020 15:46:16 -0500 Subject: [PATCH] miner: Remove old CreateNewBlock w/o chainstate param --- src/miner.cpp | 5 ----- src/miner.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index e0e5ad41fee..444edb69763 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -99,11 +99,6 @@ void BlockAssembler::resetBlock() Optional BlockAssembler::m_last_block_num_txs{nullopt}; Optional BlockAssembler::m_last_block_weight{nullopt}; -std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn) -{ - return CreateNewBlock(::ChainstateActive(), scriptPubKeyIn); -} - std::unique_ptr BlockAssembler::CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn) { int64_t nTimeStart = GetTimeMicros(); diff --git a/src/miner.h b/src/miner.h index 95f267e491a..9cbec35cc5e 100644 --- a/src/miner.h +++ b/src/miner.h @@ -158,7 +158,6 @@ public: explicit BlockAssembler(const CTxMemPool& mempool, const CChainParams& params, const Options& options); /** Construct a new block template with coinbase to scriptPubKeyIn */ - std::unique_ptr CreateNewBlock(const CScript& scriptPubKeyIn); std::unique_ptr CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn); static Optional m_last_block_num_txs;