chore: fix typo + cleanup some if statements

Author: Adrian Nagy

mina-p2p-messages/src/v2/manual.rs

@@ -726,7 +726,7 @@ pub type NonZeroCurvePoint = Base58CheckOfBinProt<
 >;
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite)]
-pub enum ArchiveTransitionFronntierDiff {
+pub enum ArchiveTransitionFrontierDiff {
     BreadcrumbAdded {
         block: (MinaBlockBlockStableV2, (Option<StateBodyHash>, StateHash)),
         accounts_accessed: List<(crate::number::UInt64, MinaBaseAccountBinableArgStableV2)>,
@@ -740,11 +740,11 @@ pub enum ArchiveTransitionFronntierDiff {
     BoostrapOf(()),
 }
 
-impl ArchiveTransitionFronntierDiff {
+impl ArchiveTransitionFrontierDiff {
     pub fn block(&self) -> Option<MinaBlockBlockStableV2> {
         match self {
             // TODO(adonagy): maybe we should use Arc here instead of cloning
-            ArchiveTransitionFronntierDiff::BreadcrumbAdded { block, .. } => Some(block.0.clone()),
+            ArchiveTransitionFrontierDiff::BreadcrumbAdded { block, .. } => Some(block.0.clone()),
             _ => None,
         }
     }
@@ -753,7 +753,7 @@ impl ArchiveTransitionFronntierDiff {
         &self,
     ) -> List<(crate::number::UInt64, MinaBaseAccountBinableArgStableV2)> {
         match self {
-            ArchiveTransitionFronntierDiff::BreadcrumbAdded {
+            ArchiveTransitionFrontierDiff::BreadcrumbAdded {
                 accounts_accessed, ..
             } => accounts_accessed.clone(),
             _ => List::new(),
@@ -762,7 +762,7 @@ impl ArchiveTransitionFronntierDiff {
 
     pub fn accounts_created(&self) -> List<(MinaBaseAccountIdStableV2, CurrencyFeeStableV1)> {
         match self {
-            ArchiveTransitionFronntierDiff::BreadcrumbAdded {
+            ArchiveTransitionFrontierDiff::BreadcrumbAdded {
                 accounts_created, ..
             } => accounts_created.clone(),
             _ => List::new(),
@@ -773,7 +773,7 @@ impl ArchiveTransitionFronntierDiff {
         &self,
     ) -> List<(MinaBaseTokenIdStableV2, Option<MinaBaseAccountIdStableV2>)> {
         match self {
-            ArchiveTransitionFronntierDiff::BreadcrumbAdded { tokens_used, .. } => {
+            ArchiveTransitionFrontierDiff::BreadcrumbAdded { tokens_used, .. } => {
                 tokens_used.clone()
             }
             _ => List::new(),
@@ -783,7 +783,7 @@ impl ArchiveTransitionFronntierDiff {
 
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite)]
 pub enum ArchiveRpc {
-    SendDiff(ArchiveTransitionFronntierDiff),
+    SendDiff(ArchiveTransitionFrontierDiff),
 }
 
 #[derive(Clone, Debug, PartialEq, BinProtRead, BinProtWrite)]
@@ -1889,7 +1889,7 @@ mod test {
     fn test_archive_breadcrumb_deserialization() {
         let breadcrumb_bytes = include_bytes!("../../../tests/files/archive-breadcrumb/3NK56ZbCS31qb8SvCtCCYza4beRDtKgXA2JL6s3evKouG2KkKtiy.bin");
         let result =
-            v2::ArchiveTransitionFronntierDiff::binprot_read(&mut breadcrumb_bytes.as_slice());
+            v2::ArchiveTransitionFrontierDiff::binprot_read(&mut breadcrumb_bytes.as_slice());
 
         assert!(result.is_ok());
     }

node/common/src/service/archive/mod.rs

@@ -111,16 +111,24 @@ impl ArchiveServiceClients {
                 key = key.clone()
             );
 
-            let precomputed_block: PrecomputedBlock = if let Ok(precomputed_block) =
-                breadcrumb.try_into()
-            {
-                precomputed_block
-            } else {
-                node::core::warn!(summary = "Failed to convert breadcrumb to precomputed block");
-                return;
+            let precomputed_block: PrecomputedBlock = match breadcrumb.try_into() {
+                Ok(block) => block,
+                Err(_) => {
+                    node::core::warn!(summary = "Failed to convert breadcrumb to precomputed block");
+                    return;
+                }
             };
 
-            let data = serde_json::to_vec(&precomputed_block).unwrap();
+            let data = match serde_json::to_vec(&precomputed_block) {
+                Ok(data) => data,
+                Err(e) => {
+                    node::core::warn!(
+                        summary = "Failed to serialize precomputed block",
+                        error = e.to_string()
+                    );
+                    return;
+                }
+            };
 
             if options.uses_local_precomputed_storage() {
                 // TODO(adonagy): Cleanup the unwraps (fn that returns a Result + log the error)
@@ -163,37 +171,32 @@ impl ArchiveServiceClients {
     async fn handle_archiver_process(breadcrumb: &BlockApplyResult, socket_addr: &SocketAddr) {
         let mut retries = ARCHIVE_SEND_RETRIES;
 
-        let archive_transition_frontier_diff: v2::ArchiveTransitionFronntierDiff =
+        let archive_transition_frontier_diff: v2::ArchiveTransitionFrontierDiff =
             breadcrumb.clone().try_into().unwrap();
 
-        while retries > 0 {
+        for _ in 0..ARCHIVE_SEND_RETRIES {
             match rpc::send_diff(
                 *socket_addr,
                 v2::ArchiveRpc::SendDiff(archive_transition_frontier_diff.clone()),
             ) {
-                Ok(result) => {
-                    if result.should_retry() {
-                        node::core::warn!(
-                            summary = "Archive suddenly closed connection, retrying..."
-                        );
-                        retries -= 1;
-                        tokio::time::sleep(std::time::Duration::from_millis(RETRY_INTERVAL_MS))
-                            .await;
-                    } else {
-                        node::core::warn!(summary = "Successfully sent diff to archive");
-                        break;
-                    }
+                Ok(result) if result.should_retry() => {
+                    node::core::warn!(summary = "Archive closed connection, retrying...");
+                    tokio::time::sleep(tokio::time::Duration::from_millis(RETRY_INTERVAL_MS)).await;
+                }
+                Ok(_) => {
+                    node::core::info!(summary = "Successfully sent diff to archive");
+                    return;
                 }
                 Err(e) => {
                     node::core::warn!(
                         summary = "Failed sending diff to archive",
                         error = e.to_string(),
                         retries = retries
                     );
-                    retries -= 1;
-                    tokio::time::sleep(std::time::Duration::from_millis(RETRY_INTERVAL_MS)).await;
+                    tokio::time::sleep(tokio::time::Duration::from_millis(RETRY_INTERVAL_MS)).await;
                 }
             }
+            retries -= 1;
         }
     }
 }
@@ -209,11 +212,15 @@ impl ArchiveService {
         options: ArchiveStorageOptions,
         work_dir: String,
     ) {
-        let clients = if let Ok(clients) = ArchiveServiceClients::new(&options, work_dir).await {
-            clients
-        } else {
-            node::core::error!(summary = "Failed to initialize archive service clients");
-            return;
+        let clients = match ArchiveServiceClients::new(&options, work_dir).await {
+            Ok(clients) => clients,
+            Err(e) => {
+                node::core::error!(
+                    summary = "Failed to initialize archive service clients",
+                    error = e.to_string()
+                );
+                return;
+            }
         };
 
         while let Some(breadcrumb) = archive_receiver.recv().await {

node/src/ledger/write/mod.rs

@@ -98,15 +98,15 @@ pub struct BlockApplyResultArchive {
     pub sender_receipt_chains_from_parent_ledger: Vec<(AccountId, v2::ReceiptChainHash)>,
 }
 
-impl TryFrom<BlockApplyResult> for v2::ArchiveTransitionFronntierDiff {
+impl TryFrom<BlockApplyResult> for v2::ArchiveTransitionFrontierDiff {
     type Error = String;
 
     fn try_from(value: BlockApplyResult) -> Result<Self, Self::Error> {
         (&value).try_into()
     }
 }
 
-impl TryFrom<&BlockApplyResult> for v2::ArchiveTransitionFronntierDiff {
+impl TryFrom<&BlockApplyResult> for v2::ArchiveTransitionFrontierDiff {
     type Error = String;
 
     fn try_from(value: &BlockApplyResult) -> Result<Self, Self::Error> {
@@ -174,7 +174,7 @@ impl TryFrom<&BlockApplyResult> for v2::PrecomputedBlock {
     type Error = String;
 
     fn try_from(value: &BlockApplyResult) -> Result<Self, Self::Error> {
-        let archive_transition_frontier_diff: v2::ArchiveTransitionFronntierDiff =
+        let archive_transition_frontier_diff: v2::ArchiveTransitionFrontierDiff =
             value.try_into()?;
 
         let res = Self {

tools/archive-breadcrumb-compare/src/main.rs

@@ -1,4 +1,4 @@
-use mina_p2p_messages::v2::ArchiveTransitionFronntierDiff;
+use mina_p2p_messages::v2::ArchiveTransitionFrontierDiff;
 use std::{collections::HashSet, path::PathBuf};
 
 use anyhow::Result;
@@ -289,26 +289,26 @@ async fn compare_binary_diffs(
     }
 }
 
-fn load_and_deserialize(path: &PathBuf) -> Result<ArchiveTransitionFronntierDiff> {
+fn load_and_deserialize(path: &PathBuf) -> Result<ArchiveTransitionFrontierDiff> {
     let data = std::fs::read(path)?;
     let diff = binprot::BinProtRead::binprot_read(&mut data.as_slice())?;
     Ok(diff)
 }
 
 fn compare_diffs(
-    ocaml: &ArchiveTransitionFronntierDiff,
-    openmina: &ArchiveTransitionFronntierDiff,
+    ocaml: &ArchiveTransitionFrontierDiff,
+    openmina: &ArchiveTransitionFrontierDiff,
 ) -> Option<String> {
     match (ocaml, openmina) {
         (
-            ArchiveTransitionFronntierDiff::BreadcrumbAdded {
+            ArchiveTransitionFrontierDiff::BreadcrumbAdded {
                 block: (b1, (body_hash1, state_hash1)),
                 accounts_accessed: a1,
                 accounts_created: c1,
                 tokens_used: t1,
                 sender_receipt_chains_from_parent_ledger: s1,
             },
-            ArchiveTransitionFronntierDiff::BreadcrumbAdded {
+            ArchiveTransitionFrontierDiff::BreadcrumbAdded {
                 block: (b2, (body_hash2, state_hash2)),
                 accounts_accessed: a2,
                 accounts_created: c2,