feat: update (most) pox4 scenario tests

Author: hstove

stackslib/src/burnchains/mod.rs

@@ -517,7 +517,7 @@ impl PoxConstants {
         }
     }
 
-    /// The first block of the prepare phase during `reward_cycle`. This is the prepare phase _for the next cycle_. 
+    /// The first block of the prepare phase during `reward_cycle`. This is the prepare phase _for the next cycle_.
     pub fn prepare_phase_start(&self, first_block_height: u64, reward_cycle: u64) -> u64 {
         let reward_cycle_start =
             self.reward_cycle_to_block_height(first_block_height, reward_cycle);

stackslib/src/chainstate/burn/db/sortdb.rs

@@ -3908,11 +3908,11 @@ impl<'a> SortitionDBConn<'a> {
         tip: &SortitionId,
         reward_cycle_id: u64,
     ) -> Result<SortitionId, db_error> {
-        let reward_cycle_of_prepare_phase = reward_cycle_id.checked_sub(1).ok_or_else(|| db_error::Other("No prepare phase exists for cycle 0".into()))?;
-        let prepare_phase_start = pox_constants.prepare_phase_start(
-            first_block_height,
-            reward_cycle_of_prepare_phase,
-        );
+        let reward_cycle_of_prepare_phase = reward_cycle_id
+            .checked_sub(1)
+            .ok_or_else(|| db_error::Other("No prepare phase exists for cycle 0".into()))?;
+        let prepare_phase_start =
+            pox_constants.prepare_phase_start(first_block_height, reward_cycle_of_prepare_phase);
 
         let first_sortition =
             get_ancestor_sort_id(self, prepare_phase_start, tip)?.ok_or_else(|| {

stackslib/src/chainstate/coordinator/mod.rs

@@ -299,7 +299,6 @@ pub trait RewardSetProvider {
         &self,
         chainstate: &mut StacksChainState,
         cycle: u64,
-        burnchain: &Burnchain,
         sortdb: &SortitionDB,
         block_id: &StacksBlockId,
     ) -> Result<RewardSet, Error>;
@@ -374,11 +373,10 @@ impl<'a, T: BlockEventDispatcher> RewardSetProvider for OnChainRewardSetProvider
         &self,
         chainstate: &mut StacksChainState,
         reward_cycle: u64,
-        burnchain: &Burnchain,
         sortdb: &SortitionDB,
         block_id: &StacksBlockId,
     ) -> Result<RewardSet, Error> {
-        self.read_reward_set_nakamoto(chainstate, reward_cycle, burnchain, sortdb, block_id, false)
+        self.read_reward_set_nakamoto(chainstate, reward_cycle, sortdb, block_id, false)
     }
 }
 

stackslib/src/chainstate/coordinator/tests.rs

@@ -522,7 +522,6 @@ impl RewardSetProvider for StubbedRewardSetProvider {
         &self,
         chainstate: &mut StacksChainState,
         cycle: u64,
-        burnchain: &Burnchain,
         sortdb: &SortitionDB,
         block_id: &StacksBlockId,
     ) -> Result<RewardSet, CoordError> {

stackslib/src/chainstate/nakamoto/coordinator/mod.rs

@@ -90,7 +90,6 @@ impl<'a, T: BlockEventDispatcher> OnChainRewardSetProvider<'a, T> {
         &self,
         chainstate: &mut StacksChainState,
         cycle: u64,
-        burnchain: &Burnchain,
         sortdb: &SortitionDB,
         block_id: &StacksBlockId,
         debug_log: bool,
@@ -547,13 +546,8 @@ pub fn load_nakamoto_reward_set<U: RewardSetProvider>(
            "cycle_start_height" => %cycle_start_height,
            "burnchain_height" => %anchor_block_sn.block_height);
 
-    let reward_set = provider.get_reward_set_nakamoto(
-        chain_state,
-        reward_cycle,
-        burnchain,
-        sort_db,
-        &block_id,
-    )?;
+    let reward_set =
+        provider.get_reward_set_nakamoto(chain_state, reward_cycle, sort_db, &block_id)?;
     debug!(
         "Stacks anchor block (ch {}) {} cycle {} is processed",
         &anchor_block_header.consensus_hash, &block_id, reward_cycle;