fix(eigen_bundler): add tests and fix edge case during bundling

Author: rymnc

Cargo.lock

@@ -54,6 +54,7 @@ base64 = { version = "0.22.1", default-features = false }
 bitvec = { version = "1.0", default-features = false }
 bytesize = { version = "1.3", default-features = false }
 alloy = { version = "0.3.6", default-features = false }
+derive_more = { version = "2.0.1", default-features = false }
 xdg = { version = "2.5", default-features = false }
 proptest = { version = "1.0", default-features = false }
 rayon = { version = "1.10", default-features = false }

Cargo.toml

@@ -11,6 +11,10 @@ pub enum Error {
     Network(String),
     #[error("Storage error: {0}")]
     Storage(String),
+    #[error("Block validation error: {0}")]
+    BlockValidation(String),
+    #[error("Bundler error: {0}")]
+    Bundler(String),
 }
 
 pub trait WithContext<T> {
@@ -43,7 +47,9 @@ impl From<services::Error> for Error {
         match error {
             services::Error::Network(e) => Self::Network(e),
             services::Error::Storage(e) => Self::Storage(e),
-            services::Error::BlockValidation(e) | services::Error::Other(e) => Self::Other(e),
+            services::Error::BlockValidation(e) => Self::BlockValidation(e),
+            services::Error::Bundler(e) => Self::Bundler(e),
+            services::Error::Other(e) => Self::Other(e.to_string()),
         }
     }
 }
@@ -69,6 +75,10 @@ impl<T> WithContext<T> for Result<T> {
                 Error::Other(e) => Error::Other(format!("{}: {}", context(), e)),
                 Error::Network(e) => Error::Network(format!("{}: {}", context(), e)),
                 Error::Storage(e) => Error::Storage(format!("{}: {}", context(), e)),
+                Error::BlockValidation(e) => {
+                    Error::BlockValidation(format!("{}: {}", context(), e))
+                }
+                Error::Bundler(e) => Error::Bundler(format!("{}: {}", context(), e)),
             };
             Err(new_err)
         } else {

committer/src/errors.rs

@@ -41,7 +41,7 @@ impl Decoder {
 
 #[cfg(test)]
 mod tests {
-    use crate::bundle::{Bundle, BundleV1, Encoder};
+    use crate::bundle::{Bundle, BundleEncoder, BundleV1, Encoder};
 
     #[test]
     fn complains_about_unsupported_version() {

packages/encoding/src/bundle/decoder.rs

@@ -16,6 +16,16 @@ impl Default for Encoder {
     }
 }
 
+/// Trait for encoding a bundle into a compressed byte vector.
+pub trait BundleEncoder {
+    type Error: ToString + Send + Sync + 'static;
+
+    /// Encodes the given bundle into a compressed byte vector.
+    fn encode(&self, bundle: Bundle) -> Result<Vec<u8>, Self::Error>;
+    /// Compresses the given data using the configured compression level.
+    fn compress(&self, data: &[u8]) -> Result<Vec<u8>, Self::Error>;
+}
+
 impl Encoder {
     pub fn new(level: CompressionLevel) -> Self {
         let level = match level {
@@ -36,8 +46,12 @@ impl Encoder {
             compression_level: level.map(Compression::new),
         }
     }
+}
+
+impl BundleEncoder for Encoder {
+    type Error = anyhow::Error;
 
-    pub fn encode(&self, bundle: Bundle) -> anyhow::Result<Vec<u8>> {
+    fn encode(&self, bundle: Bundle) -> anyhow::Result<Vec<u8>> {
         const VERSION_SIZE: usize = std::mem::size_of::<u16>();
 
         let Bundle::V1(v1) = bundle;
@@ -150,7 +164,7 @@ impl CompressionLevel {
 
 #[cfg(test)]
 mod tests {
-    use crate::bundle::{CompressionLevel, Encoder};
+    use crate::bundle::{BundleEncoder, CompressionLevel, Encoder};
 
     #[test]
     fn can_disable_compression() {

packages/encoding/src/bundle/encoder.rs

@@ -4,7 +4,7 @@ mod tests {
     use bitvec::{order::Msb0, vec::BitVec};
     use fuel_block_committer_encoding::{
         blob::{self, generate_sidecar},
-        bundle::{self, BundleV1},
+        bundle::{self, BundleEncoder, BundleV1},
     };
     use itertools::Itertools;
     use proptest::prelude::*;

packages/encoding/tests/public_api.rs

@@ -33,6 +33,7 @@ tracing = { workspace = true }
 trait-variant = { workspace = true }
 
 [dev-dependencies]
+derive_more = { workspace = true, features = ["error", "display"] }
 test-case = { workspace = true }
 clock = { workspace = true, features = ["test-helpers"] }
 eth = { workspace = true, features = ["test-helpers"] }

packages/services/Cargo.toml

@@ -1,6 +1,6 @@
 use std::{cmp::min, collections::VecDeque, num::NonZeroUsize};
 
-use fuel_block_committer_encoding::bundle::{self, BundleV1};
+use fuel_block_committer_encoding::bundle::{self, BundleEncoder, BundleV1};
 use itertools::Itertools;
 use rayon::prelude::*;