Add Hex error to Error

Author: yukibtc

negentropy/src/bytes.rs

@@ -5,7 +5,7 @@ use alloc::string::String;
 use alloc::vec::Vec;
 use core::ops::Deref;
 
-use crate::hex;
+use crate::{hex, Error};
 
 /// Bytes
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -33,7 +33,7 @@ impl Bytes {
     }
 
     /// Construct from hex
-    pub fn from_hex<T>(data: T) -> Result<Self, hex::Error>
+    pub fn from_hex<T>(data: T) -> Result<Self, Error>
     where
         T: AsRef<[u8]>,
     {

negentropy/src/lib.rs

@@ -28,7 +28,7 @@ use core::fmt;
 use std::collections::HashSet;
 
 mod bytes;
-pub mod hex;
+mod hex;
 mod sha256;
 
 pub use self::bytes::Bytes;
@@ -78,6 +78,8 @@ pub enum Error {
         /// Found output
         found: String,
     },
+    /// Hex error
+    Hex(hex::Error),
 }
 
 #[cfg(feature = "std")]
@@ -108,10 +110,17 @@ impl fmt::Display for Error {
                 "Unexpected output: expected={}, found={}",
                 expected, found
             ),
+            Self::Hex(e) => write!(f, "Hex: {}", e),
         }
     }
 }
 
+impl From<hex::Error> for Error {
+    fn from(e: hex::Error) -> Self {
+        Self::Hex(e)
+    }
+}
+
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
 struct Item {
     timestamp: u64,