@@ -175,7 +175,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
175175 BOOST_ASSERT (deterministicMNManager->GetListAtChainTip ().HasMN (tx.GetHash ()));
176176 BOOST_CHECK (::ChainActive ().Height () < Params ().GetConsensus ().BRRHeight );
177177 // Creating blocks by different ways
178- const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx -> quorum_block_processor , *m_node. llmq_ctx -> clhandler , *m_node. llmq_ctx -> isman , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
178+ const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
179179 }
180180 for ([[maybe_unused]] auto _ : irange::range (1999 )) {
181181 CreateAndProcessBlock ({}, coinbaseKey);
@@ -202,7 +202,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
202202 deterministicMNManager->UpdatedBlockTip (::ChainActive ().Tip ());
203203 BOOST_ASSERT (deterministicMNManager->GetListAtChainTip ().HasMN (tx.GetHash ()));
204204 auto masternode_payment = GetMasternodePayment (::ChainActive ().Height (), GetBlockSubsidy (::ChainActive ().Tip ()->nBits , ::ChainActive ().Height (), consensus_params), 2500 );
205- const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx -> quorum_block_processor , *m_node. llmq_ctx -> clhandler , *m_node. llmq_ctx -> isman , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
205+ const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
206206 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , masternode_payment);
207207 }
208208
@@ -213,7 +213,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
213213 {
214214 LOCK (cs_main);
215215 auto masternode_payment = GetMasternodePayment (::ChainActive ().Height (), GetBlockSubsidy (::ChainActive ().Tip ()->nBits , ::ChainActive ().Height (), consensus_params), 2500 );
216- const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx -> quorum_block_processor , *m_node. llmq_ctx -> clhandler , *m_node. llmq_ctx -> isman , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
216+ const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
217217 BOOST_CHECK_EQUAL (pblocktemplate->block .vtx [0 ]->GetValueOut (), 13748571607 );
218218 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , masternode_payment);
219219 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , 6874285801 ); // 0.4999999998
@@ -228,7 +228,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
228228 }
229229 LOCK (cs_main);
230230 auto masternode_payment = GetMasternodePayment (::ChainActive ().Height (), GetBlockSubsidy (::ChainActive ().Tip ()->nBits , ::ChainActive ().Height (), consensus_params), 2500 );
231- const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx -> quorum_block_processor , *m_node. llmq_ctx -> clhandler , *m_node. llmq_ctx -> isman , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
231+ const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
232232 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , masternode_payment);
233233 }
234234 }
@@ -237,7 +237,7 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
237237 // Reward split should reach ~60/40 after reallocation is done
238238 LOCK (cs_main);
239239 auto masternode_payment = GetMasternodePayment (::ChainActive ().Height (), GetBlockSubsidy (::ChainActive ().Tip ()->nBits , ::ChainActive ().Height (), consensus_params), 2500 );
240- const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx -> quorum_block_processor , *m_node. llmq_ctx -> clhandler , *m_node. llmq_ctx -> isman , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
240+ const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
241241 BOOST_CHECK_EQUAL (pblocktemplate->block .vtx [0 ]->GetValueOut (), 10221599170 );
242242 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , masternode_payment);
243243 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , 6132959502 ); // 0.6
@@ -251,15 +251,15 @@ BOOST_FIXTURE_TEST_CASE(block_reward_reallocation, TestChainBRRBeforeActivationS
251251 }
252252 LOCK (cs_main);
253253 auto masternode_payment = GetMasternodePayment (::ChainActive ().Height (), GetBlockSubsidy (::ChainActive ().Tip ()->nBits , ::ChainActive ().Height (), consensus_params), 2500 );
254- const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx -> quorum_block_processor , *m_node. llmq_ctx -> clhandler , *m_node. llmq_ctx -> isman , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
254+ const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
255255 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , masternode_payment);
256256 }
257257
258258 {
259259 // Reward split should reach ~60/40 after reallocation is done
260260 LOCK (cs_main);
261261 auto masternode_payment = GetMasternodePayment (::ChainActive ().Height (), GetBlockSubsidy (::ChainActive ().Tip ()->nBits , ::ChainActive ().Height (), consensus_params), 2500 );
262- const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx -> quorum_block_processor , *m_node. llmq_ctx -> clhandler , *m_node. llmq_ctx -> isman , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
262+ const auto pblocktemplate = BlockAssembler (*sporkManager, *governance, *m_node.llmq_ctx , *m_node.evodb , ::ChainstateActive (), *m_node.mempool , Params ()).CreateNewBlock (coinbasePubKey);
263263 BOOST_CHECK_EQUAL (pblocktemplate->block .vtx [0 ]->GetValueOut (), 9491484944 );
264264 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , masternode_payment);
265265 BOOST_CHECK_EQUAL (pblocktemplate->voutMasternodePayments [0 ].nValue , 5694890966 ); // 0.6
0 commit comments