From 117d8bedce69cf1c132434a4fc8ee0f96e50ac5e Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Fri, 22 Mar 2024 13:22:23 -0400 Subject: [PATCH] fix: merge conflict error --- stackslib/src/net/tests/download/epoch2x.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stackslib/src/net/tests/download/epoch2x.rs b/stackslib/src/net/tests/download/epoch2x.rs index 200ec77219..5e9ea0daf2 100644 --- a/stackslib/src/net/tests/download/epoch2x.rs +++ b/stackslib/src/net/tests/download/epoch2x.rs @@ -701,6 +701,7 @@ pub fn test_get_blocks_and_microblocks_2_peers_download_plain_100_blocks() { // build up block data to replicate let mut block_data = vec![]; let spending_account = &mut peers[1].config.spending_account.clone(); + let burnchain = peers[1].config.burnchain.clone(); // function to make a tenure in which a the peer's miner stacks its STX let mut make_stacking_tenure = |miner: &mut TestMiner, @@ -792,6 +793,7 @@ pub fn test_get_blocks_and_microblocks_2_peers_download_plain_100_blocks() { ); let mut builder = StacksBlockBuilder::make_block_builder( + &burnchain, chainstate.mainnet, &parent_tip, vrfproof, @@ -1392,6 +1394,7 @@ pub fn test_get_blocks_and_microblocks_2_peers_download_multiple_microblock_desc .unwrap(); let chainstate_path = peers[1].chainstate_path.clone(); + let burnchain = peers[1].config.burnchain.clone(); let (mut burn_ops, stacks_block, _) = peers[1].make_tenure( |ref mut miner, @@ -1436,6 +1439,7 @@ pub fn test_get_blocks_and_microblocks_2_peers_download_multiple_microblock_desc &coinbase_tx, BlockBuilderSettings::max_value(), None, + &burnchain, ) .unwrap(); (anchored_block, vec![])