feat: Re-export corepc-types

- update the error enum

Author: tvpeter

src/client.rs

@@ -148,7 +148,7 @@ impl Client {
     /// The deserialized `Block` struct.
     pub fn get_block(&self, block_hash: &BlockHash) -> Result<Block, Error> {
         self.call::<String>("getblock", &[json!(block_hash), json!(0)])
-            .and_then(|block_hex| deserialize_hex(&block_hex).map_err(Error::DecodeHex))
+            .and_then(|blockhash_hex| deserialize_hex(&blockhash_hex).map_err(Error::DecodeHex))
     }
 
     /// Retrieves the hash of the tip of the best block chain.
@@ -158,7 +158,7 @@ impl Client {
     /// The `BlockHash` of the chain tip.
     pub fn get_best_block_hash(&self) -> Result<BlockHash, Error> {
         self.call::<String>("getbestblockhash", &[])
-            .and_then(|block_hex| block_hex.parse().map_err(Error::from))
+            .and_then(|blockhash_hex| blockhash_hex.parse().map_err(Error::HexToArray))
     }
 
     /// Retrieves the number of blocks in the longest chain
@@ -170,7 +170,7 @@ impl Client {
         self.call::<GetBlockCount>("getblockcount", &[])?
             .0
             .try_into()
-            .map_err(Error::Overflow)
+            .map_err(Error::TryFromInt)
     }
 
     /// Retrieves the block hash at a given height
@@ -184,7 +184,7 @@ impl Client {
     /// The `BlockHash` for the given height
     pub fn get_block_hash(&self, height: u32) -> Result<BlockHash, Error> {
         self.call::<String>("getblockhash", &[json!(height)])
-            .and_then(|block_hex| block_hex.parse().map_err(Error::from))
+            .and_then(|blockhash_hex| blockhash_hex.parse().map_err(Error::HexToArray))
     }
 
     /// Retrieve the `basic` BIP 157 content filter for a particular block
@@ -199,9 +199,7 @@ impl Client {
     pub fn get_block_filter(&self, block_hash: &BlockHash) -> Result<GetBlockFilter, Error> {
         let block_filter: v30::GetBlockFilter =
             self.call("getblockfilter", &[json!(block_hash)])?;
-        block_filter
-            .into_model()
-            .map_err(Error::GetBlockFilterError)
+        block_filter.into_model().map_err(Error::GetBlockFilter)
     }
 
     /// Retrieves the raw block header for a given block hash.
@@ -265,7 +263,7 @@ impl Client {
             self.call("getblockheader", &[json!(block_hash)])?;
         header_info
             .into_model()
-            .map_err(Error::GetBlockHeaderVerboseError)
+            .map_err(Error::GetBlockHeaderVerbose)
     }
 
     /// Retrieves the verbose JSON representation of a block (verbosity 1).
@@ -280,9 +278,7 @@ impl Client {
     pub fn get_block_verbose(&self, block_hash: &BlockHash) -> Result<GetBlockVerboseOne, Error> {
         let block_info: v30::GetBlockVerboseOne =
             self.call("getblock", &[json!(block_hash), json!(1)])?;
-        block_info
-            .into_model()
-            .map_err(Error::GetBlockVerboseOneError)
+        block_info.into_model().map_err(Error::GetBlockVerboseOne)
     }
 }
 

src/client/v28.rs

@@ -27,7 +27,7 @@ impl Client {
             self.call("getblockheader", &[json!(block_hash)])?;
         header_info
             .into_model()
-            .map_err(Error::GetBlockHeaderVerboseError)
+            .map_err(Error::GetBlockHeaderVerbose)
     }
 
     /// Retrieves the verbose JSON representation of a block (verbosity 1).
@@ -44,6 +44,6 @@ impl Client {
             self.call("getblock", &[json!(block_hash), json!(1)])?;
         block_info
             .into_model()
-            .map_err(Error::GetBlockVerboseOneError)
+            .map_err(Error::GetBlockVerboseOne)
     }
 }

src/error.rs

@@ -1,9 +1,6 @@
 //! Error types for the Bitcoin RPC client.
 
-use bitcoin::{
-    consensus::encode::FromHexError,
-    hex::{HexToArrayError, HexToBytesError},
-};
+use bitcoin::{consensus::encode::FromHexError, hex::HexToArrayError};
 #[cfg(feature = "28_0")]
 use corepc_types::v17::{GetBlockHeaderVerboseError, GetBlockVerboseOneError};
 #[cfg(not(feature = "28_0"))]
@@ -22,13 +19,13 @@ pub enum Error {
     DecodeHex(FromHexError),
 
     /// Error converting `GetBlockVersboseOne` type into the model type
-    GetBlockVerboseOneError(GetBlockVerboseOneError),
+    GetBlockVerboseOne(GetBlockVerboseOneError),
 
     /// Error modeling [`GetBlockHeaderVerbose`](corepc_types::model::GetBlockHeaderVerbose).
-    GetBlockHeaderVerboseError(GetBlockHeaderVerboseError),
+    GetBlockHeaderVerbose(GetBlockHeaderVerboseError),
 
     /// Error modeling [`GetBlockFilter`](corepc_types::model::GetBlockFilter)
-    GetBlockFilterError(GetBlockFilterError),
+    GetBlockFilter(GetBlockFilterError),
 
     /// Missing authentication credentials.
     MissingAuthentication,
@@ -42,9 +39,6 @@ pub enum Error {
     /// JSON-RPC error from the server.
     JsonRpc(jsonrpc::Error),
 
-    /// Hex decoding error for byte vectors (used in get_block, etc.)
-    HexToBytes(HexToBytesError),
-
     /// Hash parsing error.
     HexToArray(HexToArrayError),
 
@@ -55,7 +49,7 @@ pub enum Error {
     Io(io::Error),
 
     /// Error when converting an integer type to a smaller type due to overflow.
-    Overflow(TryFromIntError),
+    TryFromInt(TryFromIntError),
 }
 
 impl fmt::Display for Error {
@@ -66,33 +60,15 @@ impl fmt::Display for Error {
             }
             Error::InvalidCookieFile => write!(f, "invalid cookie file"),
             Error::InvalidResponse(e) => write!(f, "invalid response: {e}"),
-            Error::HexToBytes(e) => write!(f, "Hex to bytes error: {e}"),
             Error::HexToArray(e) => write!(f, "Hash parsing eror: {e}"),
             Error::JsonRpc(e) => write!(f, "JSON-RPC error: {e}"),
             Error::Json(e) => write!(f, "JSON error: {e}"),
             Error::Io(e) => write!(f, "I/O error: {e}"),
             Error::DecodeHex(e) => write!(f, "Hex deserialization error: {e}"),
-            Error::GetBlockHeaderVerboseError(e) => write!(f, "{e}"),
-            Error::GetBlockVerboseOneError(e) => write!(f, "{e}"),
-            Error::Overflow(e) => write!(f, "Integer conversion overflow error: {e}"),
-            Error::GetBlockFilterError(e) => write!(f, "{e}"),
-        }
-    }
-}
-
-impl std::error::Error for Error {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        match self {
-            Error::JsonRpc(e) => Some(e),
-            Error::Json(e) => Some(e),
-            Error::Io(e) => Some(e),
-            Error::HexToBytes(e) => Some(e),
-            Error::HexToArray(e) => Some(e),
-            Error::DecodeHex(e) => Some(e),
-            Error::GetBlockVerboseOneError(e) => Some(e),
-            Error::Overflow(e) => Some(e),
-            Error::GetBlockFilterError(e) => Some(e),
-            _ => None,
+            Error::GetBlockHeaderVerbose(e) => write!(f, "{e}"),
+            Error::GetBlockVerboseOne(e) => write!(f, "{e}"),
+            Error::TryFromInt(e) => write!(f, "Integer conversion overflow error: {e}"),
+            Error::GetBlockFilter(e) => write!(f, "{e}"),
         }
     }
 }
@@ -124,13 +100,13 @@ impl From<io::Error> for Error {
 
 impl From<TryFromIntError> for Error {
     fn from(e: TryFromIntError) -> Self {
-        Error::Overflow(e)
+        Error::TryFromInt(e)
     }
 }
 
 impl From<GetBlockVerboseOneError> for Error {
     fn from(e: GetBlockVerboseOneError) -> Self {
-        Error::GetBlockVerboseOneError(e)
+        Error::GetBlockVerboseOne(e)
     }
 }
 

src/lib.rs

@@ -11,3 +11,5 @@ pub use client::{Auth, Client};
 pub use error::{Error, Result};
 
 pub use jsonrpc;
+// Re-export corepc_types
+pub use corepc_types;