mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168)
This commit is contained in:
commit
66bc45020f
21 changed files with 68 additions and 94 deletions
|
|
@ -51,7 +51,7 @@ BlockAssembler MinerTestingSetup::AssemblerForTest(const CChainParams& params)
|
|||
|
||||
options.nBlockMaxWeight = MAX_BLOCK_WEIGHT;
|
||||
options.blockMinFeeRate = blockMinFeeRate;
|
||||
return BlockAssembler(m_node.chainman->ActiveChainstate(), *m_node.mempool, params, options);
|
||||
return BlockAssembler{m_node.chainman->ActiveChainstate(), *m_node.mempool, options};
|
||||
}
|
||||
|
||||
constexpr static struct {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue