diff options
| author | Carl Dong <contact@carldong.me> | 2020-12-18 15:46:16 -0500 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2021-03-08 15:54:31 -0500 |
| commit | 2afcf24408b4453e4418ebfb326b141f6ea8647c (patch) | |
| tree | 5806ddfdacae5b9764c2859d35386122a77e5f17 | |
| parent | 46b7f29340acb399fbd2378508a204d8d8ee8fca (diff) | |
| download | bitcoin-2afcf24408b4453e4418ebfb326b141f6ea8647c.tar.xz | |
miner: Remove old CreateNewBlock w/o chainstate param
| -rw-r--r-- | src/miner.cpp | 5 | ||||
| -rw-r--r-- | src/miner.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index e0e5ad41fe..444edb6976 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -99,11 +99,6 @@ void BlockAssembler::resetBlock() Optional<int64_t> BlockAssembler::m_last_block_num_txs{nullopt}; Optional<int64_t> BlockAssembler::m_last_block_weight{nullopt}; -std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn) -{ - return CreateNewBlock(::ChainstateActive(), scriptPubKeyIn); -} - std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn) { int64_t nTimeStart = GetTimeMicros(); diff --git a/src/miner.h b/src/miner.h index 95f267e491..9cbec35cc5 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<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn); std::unique_ptr<CBlockTemplate> CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn); static Optional<int64_t> m_last_block_num_txs; |