miner: Remove old CreateNewBlock w/o chainstate param
This commit is contained in:
1 parent
46b7f29340
commit
2afcf24408
2 files changed
-6
No files matched your search
@@ -99,11 +99,6 @@ void BlockAssembler::resetBlock()
|
|||||||
Optional<int64_t> BlockAssembler::m_last_block_num_txs{nullopt};
|
Optional<int64_t> BlockAssembler::m_last_block_num_txs{nullopt};
|
||||||
Optional<int64_t> BlockAssembler::m_last_block_weight{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)
|
std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn)
|
||||||
{
|
{
|
||||||
int64_t nTimeStart = GetTimeMicros();
|
int64_t nTimeStart = GetTimeMicros();
|
||||||
|
|||||||
@@ -158,7 +158,6 @@ public:
|
|||||||
explicit BlockAssembler(const CTxMemPool& mempool, const CChainParams& params, const Options& options);
|
explicit BlockAssembler(const CTxMemPool& mempool, const CChainParams& params, const Options& options);
|
||||||
|
|
||||||
/** Construct a new block template with coinbase to scriptPubKeyIn */
|
/** 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);
|
std::unique_ptr<CBlockTemplate> CreateNewBlock(CChainState& chainstate, const CScript& scriptPubKeyIn);
|
||||||
|
|
||||||
static Optional<int64_t> m_last_block_num_txs;
|
static Optional<int64_t> m_last_block_num_txs;
|
||||||
|
|||||||
Reference in new issue
Block a user