fix(cardano-chain-follower): fix type

Author: bkioshn

rust/cardano-chain-follower/src/chain_sync.rs

@@ -189,8 +189,8 @@ async fn process_rollback(
 ) -> anyhow::Result<Point> {
     let rollback_slot = point.slot_or_default();
     let head_slot = previous_point.slot_or_default();
-    debug!("Head slot: {}", head_slot);
-    debug!("Rollback slot: {}", rollback_slot);
+    debug!("Head slot: {head_slot:?}");
+    debug!("Rollback slot: {rollback_slot:?}");
     let slot_rollback_size = if head_slot > rollback_slot {
         head_slot - rollback_slot
     } else {
@@ -444,7 +444,7 @@ async fn live_sync_backfill_and_purge(
     stats::new_mithril_update(
         cfg.chain,
         update.tip.slot_or_default(),
-        live_chain_length(cfg.chain) as u64,
+        live_chain_length(cfg.chain),
         live_chain_head.slot_or_default(),
     );
 

rust/cardano-chain-follower/src/chain_sync_config.rs

@@ -22,7 +22,7 @@ use crate::{
 /// Default Follower block buffer size.
 const DEFAULT_CHAIN_UPDATE_BUFFER_SIZE: usize = 32;
 
-/// How many window (in slot) back from TIP is considered Immutable in the 
+/// How many window (in slot) back from TIP is considered Immutable in the
 /// absence of a mithril snapshot.
 const DEFAULT_IMMUTABLE_SLOT_WINDOW: u64 = 12 * 60 * 60;
 

rust/cardano-chain-follower/src/chain_sync_live_chains.rs

@@ -21,9 +21,9 @@ use crate::{
 /// Type we use to manage the Sync Task handle map.
 type LiveChainBlockList = SkipMap<Point, MultiEraBlock>;
 
-/// Because we have multi-entry relationships in the live-chain, it need to protect it with a
-/// `read/write lock`. The underlying `SkipMap` is still capable of multiple simultaneous
-/// reads from multiple threads which is the most common access.
+/// Because we have multi-entry relationships in the live-chain, it need to protect it
+/// with a `read/write lock`. The underlying `SkipMap` is still capable of multiple
+/// simultaneous reads from multiple threads which is the most common access.
 #[derive(Clone)]
 struct ProtectedLiveChainBlockList(Arc<RwLock<LiveChainBlockList>>);
 

rust/cardano-chain-follower/src/chain_update.rs

@@ -43,7 +43,7 @@ impl ChainUpdate {
     /// Is the chain update immutable?
     #[must_use]
     pub fn immutable(&self) -> bool {
-        self.data.immutable()
+        self.data.is_immutable()
     }
 }
 

rust/cardano-chain-follower/src/lib.rs

@@ -19,7 +19,6 @@ mod snapshot_id;
 mod stats;
 pub mod turbo_downloader;
 mod utils;
-mod witness;
 
 pub use chain_sync_config::ChainSyncConfig;
 pub use chain_update::{ChainUpdate, Kind};

rust/cardano-chain-follower/src/mithril_snapshot.rs

@@ -33,7 +33,7 @@ impl MithrilSnapshot {
     /// Checks if the snapshot contains a given point.
     ///
     /// # Arguments
-    /// 
+    ///
     /// * `point`: The point to be checked for existence within the specified Mithril
     ///   snapshot.
     ///

rust/cardano-chain-follower/src/mithril_snapshot_iterator.rs

@@ -6,7 +6,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use cardano_blockchain_types::{MultiEraBlock, Network, Point};
+use cardano_blockchain_types::{MultiEraBlock, Network, Point, Slot};
 use logcall::logcall;
 use tokio::task;
 use tracing::{debug, error};
@@ -54,10 +54,10 @@ pub(crate) struct MithrilSnapshotIterator {
 pub(crate) fn probe_point(point: &Point, distance: u64) -> Point {
     // Now that we have the tip, step back about 4 block intervals from tip, and do a fuzzy
     // iteration to find the exact two blocks at the end of the immutable chain.
-    let step_back_search = point.slot_or_default().saturating_sub(distance);
+    let step_back_search = Slot::from_saturating(point.slot_or_default().into() - distance);
 
     // We stepped back to the origin, so just return Origin
-    if step_back_search == 0 {
+    if step_back_search == 0.into() {
         return Point::ORIGIN;
     }
 

rust/cardano-chain-follower/src/stats.rs

@@ -2,7 +2,7 @@
 
 use std::sync::{Arc, LazyLock, RwLock};
 
-use cardano_blockchain_types::Network;
+use cardano_blockchain_types::{Network, Slot};
 use chrono::{DateTime, Utc};
 use dashmap::DashMap;
 use serde::Serialize;
@@ -142,9 +142,9 @@ pub struct Live {
     /// Current Number of Live Blocks
     pub blocks: u64,
     /// The current head of the live chain slot#
-    pub head_slot: u64,
+    pub head_slot: Slot,
     /// The current live tip slot# as reported by the peer.
-    pub tip: u64,
+    pub tip: Slot,
     /// Number of times we connected/re-connected to the Node.
     pub reconnects: u64,
     /// Last reconnect time,
@@ -312,7 +312,7 @@ pub(crate) fn stats_invalid_block(chain: Network, immutable: bool) {
 
 /// Count the validly deserialized blocks
 pub(crate) fn new_live_block(
-    chain: Network, total_live_blocks: u64, head_slot: u64, tip_slot: u64,
+    chain: Network, total_live_blocks: u64, head_slot: Slot, tip_slot: Slot,
 ) {
     // This will actually always succeed.
     let Some(stats) = lookup_stats(chain) else {