chore: improve delegation error messages

magicblock-chainlink/src/chainlink/fetch_cloner/mod.rs

@@ -464,15 +464,15 @@ where
                     Ok(Err(err)) => {
                         error!(
                             pubkey = %pubkey,
-                            error = %err,
+                            error = ?err,
                             "Failed to fetch delegation record"
                         );
                         (None, None)
                     }
                     Err(err) => {
                         error!(
                             pubkey = %pubkey,
-                            error = %err,
+                            error = ?err,
                             "Failed to fetch delegation record"
                         );
                         (None, None)

magicblock-chainlink/src/remote_account_provider/errors.rs

@@ -62,11 +62,11 @@ pub enum RemoteAccountProviderError {
     #[error("Failed to resolve account ({0}) to track slots")]
     ClockAccountCouldNotBeResolved(String),
 
-    #[error("Failed to resolve accounts to same slot ({0}) to track slots")]
-    SlotsDidNotMatch(String, Vec<u64>),
+    #[error("Failed to resolve accounts to same slot ({0}) to track slots hit limit: {2}")]
+    SlotsDidNotMatch(String, Vec<u64>, String),
 
-    #[error("Accounts matched same slot ({0}), but it's less than min required context slot {2} ")]
-    MatchingSlotsNotSatisfyingMinContextSlot(String, Vec<u64>, u64),
+    #[error("Accounts matched same slot ({0}), but it's less than min required context slot {2} hit limit: {3}")]
+    MatchingSlotsNotSatisfyingMinContextSlot(String, Vec<u64>, u64, String),
 
     #[error("LRU capacity must be greater than 0")]
     InvalidLruCapacity,

magicblock-chainlink/src/remote_account_provider/mod.rs

@@ -632,20 +632,19 @@ impl<T: ChainRpcClient, U: ChainPubsubClient> RemoteAccountProvider<T, U> {
                 return Ok(remote_accounts);
             }
 
-            if start.elapsed() > MAX_TOTAL_TIME {
-                return Err(RemoteAccountProviderError::SlotsDidNotMatch(
-                    format!(
-                        "Timeout after {}s waiting for slots to match",
-                        MAX_TOTAL_TIME.as_secs_f64()
-                    ),
-                    vec![],
-                ));
-            }
-
             retries += 1;
-            if retries == config.max_retries {
+            let hit_max_retry_limit = retries == config.max_retries;
+            if hit_max_retry_limit || start.elapsed() > MAX_TOTAL_TIME {
                 let remote_accounts =
                     remote_accounts.into_iter().map(|a| a.slot()).collect();
+                let limit = if hit_max_retry_limit {
+                    format!("max retries {}", config.max_retries)
+                } else {
+                    format!(
+                        "max total time of {} seconds",
+                        MAX_TOTAL_TIME.as_secs()
+                    )
+                };
                 match slots_match_result {
                     // SAFETY: Match case is already handled and returns
                     Match => unreachable!("we would have returned above"),
@@ -654,15 +653,18 @@ impl<T: ChainRpcClient, U: ChainPubsubClient> RemoteAccountProvider<T, U> {
                             RemoteAccountProviderError::SlotsDidNotMatch(
                                 pubkeys_str(pubkeys),
                                 remote_accounts,
+                                limit,
                             ),
                         );
                     }
                     MatchButBelowMinContextSlot(slot) => {
                         return Err(
                             RemoteAccountProviderError::MatchingSlotsNotSatisfyingMinContextSlot(
-                            pubkeys_str(pubkeys),
-                            remote_accounts,
-                            slot)
+                                pubkeys_str(pubkeys),
+                                remote_accounts,
+                                slot,
+                                limit
+                            )
                         );
                     }
                 }
@@ -1552,7 +1554,8 @@ mod test {
             RemoteAccountProviderError::MatchingSlotsNotSatisfyingMinContextSlot(
                 _pubkeys,
                 _slots,
-                slot
+                slot,
+                _
             ) if slot == CURRENT_SLOT + 1
         ));
     }