review remarks

ethexe/common/src/lib.rs

@@ -34,10 +34,3 @@ pub const fn u64_into_uint48_be_bytes_lossy(val: u64) -> [u8; 6] {
 
     [b1, b2, b3, b4, b5, b6]
 }
-
-pub fn option_call<S>(
-    svc: &mut Option<S>,
-    f: impl FnOnce(&mut S) -> anyhow::Result<()>,
-) -> anyhow::Result<()> {
-    svc.as_mut().map_or(Ok(()), f)
-}

ethexe/network/Cargo.toml

@@ -12,8 +12,6 @@ repository.workspace = true
 [dependencies]
 ethexe-common.workspace = true
 ethexe-signer.workspace = true
-ethexe-validator.workspace = true
-ethexe-sequencer.workspace = true
 ethexe-db.workspace = true
 
 gprimitives = { workspace = true, features = ["codec"] }

ethexe/sequencer/src/lib.rs

@@ -135,7 +135,7 @@ impl SequencerService {
 
             status: Default::default(),
 
-            collection_round: Timer::new("collection", config.block_time / 2),
+            collection_round: Timer::new("collection", config.block_time / 4),
             validation_round: Timer::new("validation", config.block_time / 4),
         })
     }

ethexe/service/common/src/lib.rs

@@ -18,6 +18,7 @@
 
 #![allow(async_fn_in_trait)]
 
+use anyhow::Result;
 use futures::{future, StreamExt};
 use std::future::Future;
 
@@ -26,12 +27,10 @@ pub use timer::Timer;
 mod timer;
 
 mod private {
-    use super::*;
-
     pub trait Sealed {}
 
-    impl<F: Future> Sealed for Option<F> {}
-    impl<S: StreamAlike> Sealed for &mut Option<S> {}
+    impl<T> Sealed for Option<T> {}
+    impl<T> Sealed for &mut Option<T> {}
 }
 
 pub trait OptionFuture<T>: private::Sealed {
@@ -72,6 +71,16 @@ impl<S: StreamAlike> OptionStreamNext<S::Item> for &mut Option<S> {
     }
 }
 
+pub trait OptionCall<T>: private::Sealed {
+    fn maybe_call(self, f: impl FnOnce(&mut T) -> Result<()>) -> Result<()>;
+}
+
+impl<T> OptionCall<T> for &mut Option<T> {
+    fn maybe_call(self, f: impl FnOnce(&mut T) -> Result<()>) -> Result<()> {
+        self.as_mut().map(f).unwrap_or(Ok(()))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use crate::OptionFuture;