call correct .signers function, error fast rather than retry

Author: kantai

stacks-signer/src/client/mod.rs

@@ -605,7 +605,7 @@ pub(crate) mod tests {
     }
 
     pub fn build_get_last_set_cycle_response(cycle: u64) -> String {
-        let clarity_value = ClarityValue::UInt(cycle as u128);
+        let clarity_value = ClarityValue::okay(ClarityValue::UInt(cycle as u128)).unwrap();
         build_read_only_response(&clarity_value)
     }
 }

stacks-signer/src/client/stacks_client.rs

@@ -165,15 +165,15 @@ impl StacksClient {
     /// Get the last set reward cycle stored within the stackerdb contract
     pub fn get_last_set_cycle(&self) -> Result<u128, ClientError> {
         let signer_stackerdb_contract_id = boot_code_id(SIGNERS_NAME, self.mainnet);
-        let function_name_str = "stackerdb-get-last-set-cycle";
+        let function_name_str = "get-last-set-cycle";
         let function_name = ClarityName::from(function_name_str);
         let value = self.read_only_contract_call(
             &signer_stackerdb_contract_id.issuer.clone().into(),
             &signer_stackerdb_contract_id.name,
             &function_name,
             &[],
         )?;
-        Ok(value.expect_u128()?)
+        Ok(value.expect_result_ok()?.expect_u128()?)
     }
 
     /// Retrieve the signer slots stored within the stackerdb contract

stacks-signer/src/runloop.rs

@@ -297,31 +297,28 @@ impl<Signer: SignerTrait<T>, T: StacksMessageCodec + Clone + Send + Debug> RunLo
         };
 
         // Ensure that the stackerdb has been updated for the reward cycle before proceeding
-        retry_with_exponential_backoff(|| {
-            let last_calculated_reward_cycle = self
-                .stacks_client
-                .get_last_set_cycle()
-                .map_err(|e| backoff::Error::transient(e.into()))?;
-            if last_calculated_reward_cycle < reward_cycle as u128 {
+        let last_calculated_reward_cycle =
+            self.stacks_client.get_last_set_cycle().map_err(|e| {
                 warn!(
-                    "Stackerdb has not been updated for reward cycle {reward_cycle}. Last calculated reward cycle is {last_calculated_reward_cycle}."
+                    "Failed to fetch last calculated stackerdb cycle from stacks-node";
+                    "reward_cycle" => reward_cycle,
+                    "err" => ?e
                 );
-                Err(backoff::Error::transient(
-                    ConfigurationError::StackerDBNotUpdated,
-                ))
-            } else {
-                Ok(())
-            }
-        })?;
+                ConfigurationError::StackerDBNotUpdated
+            })?;
+        if last_calculated_reward_cycle < reward_cycle as u128 {
+            warn!(
+                "Stackerdb has not been updated for reward cycle {reward_cycle}. Last calculated reward cycle is {last_calculated_reward_cycle}."
+            );
+            return Err(ConfigurationError::StackerDBNotUpdated);
+        }
 
-        let signer_slot_ids = match self.get_parsed_signer_slots(&self.stacks_client, reward_cycle)
-        {
-            Ok(x) => x,
-            Err(e) => {
+        let signer_slot_ids = self
+            .get_parsed_signer_slots(&self.stacks_client, reward_cycle)
+            .map_err(|e| {
                 warn!("Error while fetching stackerdb slots {reward_cycle}: {e:?}");
-                return Err(e.into());
-            }
-        };
+                e
+            })?;
         let current_addr = self.stacks_client.get_signer_address();
 
         let Some(signer_slot_id) = signer_slot_ids.get(current_addr) else {