Implements From impl from SerializeError to MerkleizationError::Seria…

…lizationError.

ssz-rs/examples/container_with_some_types.rs

@@ -60,7 +60,7 @@ fn main() {
     let mut restored_foo = match Foo::<4>::deserialize(&encoding) {
         Ok(value) => value,
         Err(e) => {
-            eprintln!("some error decoding: {:?}", e);
+            eprintln!("some error decoding: {}", e);
             return;
         }
     };

ssz-rs/src/bitlist.rs

@@ -86,9 +86,7 @@ impl<const N: usize> Bitlist<N> {
 
     fn pack_bits(&self) -> Result<Vec<u8>, MerkleizationError> {
         let mut data = vec![];
-        let _ = self
-            .serialize_with_length(&mut data, false)
-            .map_err(|_| MerkleizationError::SerializationError);
+        let _ = self.serialize_with_length(&mut data, false);
         pack_bytes(&mut data);
         Ok(data)
     }
@@ -210,6 +208,7 @@ impl<const N: usize> FromIterator<bool> for Bitlist<N> {
 
 #[cfg(test)]
 mod tests {
+    use std::hash::Hash;
     use super::*;
     use crate::serialize;
 

ssz-rs/src/bitvector.rs

@@ -93,9 +93,7 @@ impl<const N: usize> Bitvector<N> {
 
     fn pack_bits(&self) -> Result<Vec<u8>, MerkleizationError> {
         let mut data = vec![];
-        let _ = self
-            .serialize(&mut data)
-            .map_err(|_| MerkleizationError::SerializationError);
+        let _ = self.serialize(&mut data);
         pack_bytes(&mut data);
         Ok(data)
     }

ssz-rs/src/merkleization/mod.rs

@@ -10,6 +10,7 @@ use sha2::{Digest, Sha256};
 pub use cache::Cache as MerkleCache;
 pub use node::Node;
 pub use proofs::is_valid_merkle_branch;
+use crate::SerializeError;
 
 pub(crate) const BYTES_PER_CHUNK: usize = 32;
 
@@ -25,6 +26,12 @@ pub enum MerkleizationError {
     InputExceedsLimit(usize),     // cannot merkleize data that exceeds the declared limit {0}
 }
 
+impl From<SerializeError> for MerkleizationError {
+    fn from(_: SerializeError) -> Self {
+        return MerkleizationError::SerializationError
+    }
+}
+
 impl Display for MerkleizationError {
     fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
         match self {
@@ -60,9 +67,7 @@ where
 {
     let mut buffer = vec![];
     for value in values {
-        value
-            .serialize(&mut buffer)
-            .map_err(|_| MerkleizationError::SerializationError)?;
+        value.serialize(&mut buffer);
     }
     pack_bytes(&mut buffer);
     Ok(buffer)

ssz-rs/src/uint.rs

@@ -44,9 +44,7 @@ macro_rules! define_uint {
         impl Merkleized for $uint {
             fn hash_tree_root(&mut self) -> Result<Node, MerkleizationError> {
                 let mut root = vec![];
-                let _ = self
-                    .serialize(&mut root)
-                    .map_err(|_| MerkleizationError::SerializationError);
+                let _ = self.serialize(&mut root)?;
                 pack_bytes(&mut root);
                 Ok(root.as_slice().try_into().expect("is valid root"))
             }