chore: refactor redundant interval creation (#694)

* chore: refactor redundant interval creation

* fix: imports

* fix: import

* fix: unhide error

* fix: handle err

* fix: pass up the err

* fix: inline requested

* fix: cleanup

* fix: inline

* fix: format

Author: shariqnaiyer

Cargo.lock

@@ -160,15 +160,19 @@ pub async fn run_lean_node(config: LeanNodeConfig, executor: ReamExecutor) {
 
     // Start the services concurrently.
     let chain_future = executor.spawn(async move {
-        chain_service.start().await;
+        if let Err(err) = chain_service.start().await {
+            panic!("Chain service exited with error: {err}");
+        }
     });
     let network_future = executor.spawn(async move {
         if let Err(err) = network_service.start().await {
             panic!("Network service exited with error: {err}");
         }
     });
     let validator_future = executor.spawn(async move {
-        validator_service.start().await;
+        if let Err(err) = validator_service.start().await {
+            panic!("Validator service exited with error: {err}");
+        }
     });
 
     tokio::select! {

bin/ream/src/main.rs

@@ -0,0 +1,23 @@
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+use anyhow::anyhow;
+use ream_consensus_misc::constants::lean::INTERVALS_PER_SLOT;
+use ream_network_spec::networks::lean_network_spec;
+use tokio::time::{Instant, Interval, MissedTickBehavior, interval_at};
+
+pub fn create_lean_clock_interval() -> anyhow::Result<Interval> {
+    let genesis_instant = UNIX_EPOCH + Duration::from_secs(lean_network_spec().genesis_time);
+
+    let interval_start = Instant::now()
+        + genesis_instant
+            .duration_since(SystemTime::now())
+            .map_err(|err| anyhow!("Genesis time is in the past: {err}"))?;
+
+    let mut interval = interval_at(
+        interval_start,
+        Duration::from_secs(lean_network_spec().seconds_per_slot / INTERVALS_PER_SLOT),
+    );
+    interval.set_missed_tick_behavior(MissedTickBehavior::Burst);
+
+    Ok(interval)
+}

crates/common/chain/lean/src/clock.rs

@@ -1,3 +1,4 @@
+pub mod clock;
 pub mod genesis;
 pub mod lean_chain;
 pub mod service;

crates/common/chain/lean/src/lib.rs

@@ -1,21 +1,14 @@
-use std::{
-    collections::HashMap,
-    sync::Arc,
-    time::{Duration, SystemTime, UNIX_EPOCH},
-};
+use std::{collections::HashMap, sync::Arc};
 
 use alloy_primitives::B256;
+use anyhow::anyhow;
 use ream_consensus_lean::{QueueItem, VoteItem, block::Block, process_block};
-use ream_consensus_misc::constants::lean::INTERVALS_PER_SLOT;
 use ream_network_spec::networks::lean_network_spec;
-use tokio::{
-    sync::{RwLock, mpsc},
-    time::{Instant, MissedTickBehavior, interval_at},
-};
+use tokio::sync::{RwLock, mpsc};
 use tracing::info;
 use tree_hash::TreeHash;
 
-use crate::{lean_chain::LeanChain, slot::get_current_slot};
+use crate::{clock::create_lean_clock_interval, lean_chain::LeanChain, slot::get_current_slot};
 
 #[derive(Debug, Clone)]
 pub struct LeanChainServiceMessage {
@@ -50,32 +43,16 @@ impl LeanChainService {
         }
     }
 
-    pub async fn start(mut self) {
-        // TODO: Duplicate clock logic from ValidatorService. May need to refactor later.
-
-        // Get the Lean network specification.
-        let network_spec = lean_network_spec();
-        let seconds_per_slot = network_spec.seconds_per_slot;
-        let genesis_time = network_spec.genesis_time;
-
-        info!("LeanChainService started with genesis_time={genesis_time}");
-
-        // Calculate the genesis instant from the genesis time (in seconds).
-        let genesis_instant = UNIX_EPOCH + Duration::from_secs(genesis_time);
-
-        // Assume genesis time is "always" in the future,
-        // as we don't support syncing features yet.
-        let interval_start = Instant::now()
-            + genesis_instant
-                .duration_since(SystemTime::now())
-                .expect("Genesis time is in the past");
+    pub async fn start(mut self) -> anyhow::Result<()> {
+        info!(
+            "LeanChainService started with genesis_time: {}",
+            lean_network_spec().genesis_time
+        );
 
         let mut tick_count = 0u64;
-        let mut interval = interval_at(
-            interval_start,
-            Duration::from_secs(seconds_per_slot / INTERVALS_PER_SLOT),
-        );
-        interval.set_missed_tick_behavior(MissedTickBehavior::Burst);
+
+        let mut interval = create_lean_clock_interval()
+            .map_err(|err| anyhow!("Failed to create clock interval: {err}"))?;
 
         loop {
             tokio::select! {

crates/common/chain/lean/src/service.rs

@@ -10,6 +10,7 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
+anyhow.workspace = true
 tokio.workspace = true
 tracing = { workspace = true, features = ["log"] }
 

crates/common/validator/lean/Cargo.toml

@@ -1,18 +1,13 @@
-use std::{
-    sync::Arc,
-    time::{Duration, SystemTime, UNIX_EPOCH},
-};
+use std::sync::Arc;
 
+use anyhow::anyhow;
 use ream_chain_lean::{
-    lean_chain::LeanChain, service::LeanChainServiceMessage, slot::get_current_slot,
+    clock::create_lean_clock_interval, lean_chain::LeanChain, service::LeanChainServiceMessage,
+    slot::get_current_slot,
 };
 use ream_consensus_lean::{QueueItem, VoteItem};
-use ream_consensus_misc::constants::lean::INTERVALS_PER_SLOT;
 use ream_network_spec::networks::lean_network_spec;
-use tokio::{
-    sync::{RwLock, mpsc},
-    time::{Instant, MissedTickBehavior, interval_at},
-};
+use tokio::sync::{RwLock, mpsc};
 use tracing::info;
 
 // TODO: We need to replace this after PQC integration.
@@ -60,35 +55,17 @@ impl ValidatorService {
         }
     }
 
-    pub async fn start(self) {
-        // TODO: Duplicate clock logic from LeanChainService. May need to refactor later.
-
-        // Get the Lean network specification.
-        let network_spec = lean_network_spec();
-        let seconds_per_slot = network_spec.seconds_per_slot;
-        let genesis_time = network_spec.genesis_time;
-
+    pub async fn start(self) -> anyhow::Result<()> {
         info!(
-            "ValidatorService started with {} validator(s), genesis_time={genesis_time}",
-            self.keystores.len()
+            "ValidatorService started with {} validator(s), genesis_time: {}",
+            self.keystores.len(),
+            lean_network_spec().genesis_time
         );
 
-        // Calculate the genesis instant from the genesis time (in seconds).
-        let genesis_instant = UNIX_EPOCH + Duration::from_secs(genesis_time);
-
-        // Assume genesis time is "always" in the future,
-        // as we don't support syncing features yet.
-        let interval_start = Instant::now()
-            + genesis_instant
-                .duration_since(SystemTime::now())
-                .expect("Genesis time is in the past");
-
         let mut tick_count = 0u64;
-        let mut interval = interval_at(
-            interval_start,
-            Duration::from_secs(seconds_per_slot / INTERVALS_PER_SLOT),
-        );
-        interval.set_missed_tick_behavior(MissedTickBehavior::Burst);
+
+        let mut interval = create_lean_clock_interval()
+            .map_err(|err| anyhow!("Failed to create clock interval: {err}"))?;
 
         loop {
             tokio::select! {