remove unwraps

Author: m30m

apps/fortuna/src/api.rs

@@ -270,7 +270,7 @@ mod test {
         let api_state = ApiState::new(
             Arc::new(RwLock::new(chains)),
             metrics_registry,
-            Arc::new(History::new().await),
+            Arc::new(History::new().await.unwrap()),
         )
         .await;
 

apps/fortuna/src/api/explorer.rs

@@ -44,22 +44,30 @@ pub async fn explorer(
     }
     if let Some(query) = query_params.query {
         if let Ok(tx_hash) = TxHash::from_str(&query) {
-            return Ok(Json(state.history.get_requests_by_tx_hash(tx_hash).await));
+            return Ok(Json(
+                state
+                    .history
+                    .get_requests_by_tx_hash(tx_hash)
+                    .await
+                    .map_err(|_| RestError::TemporarilyUnavailable)?,
+            ));
         }
         if let Ok(sender) = Address::from_str(&query) {
             return Ok(Json(
                 state
                     .history
                     .get_requests_by_sender(sender, query_params.chain_id)
-                    .await,
+                    .await
+                    .map_err(|_| RestError::TemporarilyUnavailable)?,
             ));
         }
         if let Ok(sequence_number) = u64::from_str(&query) {
             return Ok(Json(
                 state
                     .history
                     .get_requests_by_sequence(sequence_number, query_params.chain_id)
-                    .await,
+                    .await
+                    .map_err(|_| RestError::TemporarilyUnavailable)?,
             ));
         }
         return Err(RestError::InvalidQueryString);
@@ -73,6 +81,7 @@ pub async fn explorer(
                 query_params.min_timestamp,
                 query_params.max_timestamp,
             )
-            .await,
+            .await
+            .map_err(|_| RestError::TemporarilyUnavailable)?,
     ))
 }

apps/fortuna/src/command/run.rs

@@ -102,7 +102,7 @@ pub async fn run(opts: &RunOptions) -> Result<()> {
             .map(|chain_id| (chain_id.clone(), ApiBlockChainState::Uninitialized))
             .collect(),
     ));
-    let history = Arc::new(History::new().await);
+    let history = Arc::new(History::new().await?);
     for (chain_id, chain_config) in config.chains.clone() {
         let keeper_metrics = keeper_metrics.clone();
         let keeper_private_key_option = keeper_private_key_option.clone();