feat(error)!: Add Error::Model variant

Previously, each RPC method that called `.into_model()` produced
a distinct, version-specific error variant (`GetBlockVerboseOne`,
`GetBlockHeaderVerbose`, `GetBlockFilter`), requiring version-gated
imports and the potential of future API churn.

Remove those variants and consolidate all `.into_model()` errors into
a single `Error::Model` variant.

A `pub(crate) fn model<E>(e: E) -> Self` constructor is added to `Error`
to keep call sites clean.

Author: ValuedMammal

src/client.rs

@@ -183,7 +183,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::GetBlockFilter)
+        block_filter.into_model().map_err(Error::model)
     }
 
     /// Retrieves the `Header` for a `Block` given its `BlockHash`.
@@ -245,9 +245,7 @@ impl Client {
     ) -> Result<GetBlockHeaderVerbose, Error> {
         let header_info: v30::GetBlockHeaderVerbose =
             self.call("getblockheader", &[json!(block_hash)])?;
-        header_info
-            .into_model()
-            .map_err(Error::GetBlockHeaderVerbose)
+        header_info.into_model().map_err(Error::model)
     }
 
     /// Retrieves the verbose JSON representation of a block (verbosity 1).
@@ -262,7 +260,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::GetBlockVerboseOne)
+        block_info.into_model().map_err(Error::model)
     }
 }
 

src/client/v28.rs

@@ -27,9 +27,7 @@ impl Client {
     ) -> Result<GetBlockHeaderVerbose, Error> {
         let header_info: v28::GetBlockHeaderVerbose =
             self.call("getblockheader", &[json!(block_hash)])?;
-        header_info
-            .into_model()
-            .map_err(Error::GetBlockHeaderVerbose)
+        header_info.into_model().map_err(Error::model)
     }
 
     /// Retrieves the verbose JSON representation of a block (verbosity 1).
@@ -44,6 +42,6 @@ impl Client {
     pub fn get_block_verbose(&self, block_hash: &BlockHash) -> Result<GetBlockVerboseOne, Error> {
         let block_info: v28::GetBlockVerboseOne =
             self.call("getblock", &[json!(block_hash), json!(1)])?;
-        block_info.into_model().map_err(Error::GetBlockVerboseOne)
+        block_info.into_model().map_err(Error::model)
     }
 }

src/error.rs

@@ -7,30 +7,17 @@ use core::num::TryFromIntError;
 use std::io;
 
 use bitcoin::{consensus::encode::FromHexError, hex::HexToArrayError};
-#[cfg(feature = "28_0")]
-use corepc_types::v17::{GetBlockHeaderVerboseError, GetBlockVerboseOneError};
-#[cfg(not(feature = "28_0"))]
-use corepc_types::v30::{GetBlockHeaderVerboseError, GetBlockVerboseOneError};
-use corepc_types::{bitcoin, v30::GetBlockFilterError};
+use corepc_types::bitcoin;
 use jsonrpc::serde_json;
 
-/// Result type alias for the RPC client.
-pub type Result<T> = std::result::Result<T, Error>;
-
 /// Errors that can occur when using the Bitcoin RPC client.
 #[derive(Debug)]
 pub enum Error {
     /// Hex deserialization error
     DecodeHex(FromHexError),
 
-    /// Error converting `GetBlockVersboseOne` type into the model type
-    GetBlockVerboseOne(GetBlockVerboseOneError),
-
-    /// Error modeling [`GetBlockHeaderVerbose`](corepc_types::model::GetBlockHeaderVerbose).
-    GetBlockHeaderVerbose(GetBlockHeaderVerboseError),
-
-    /// Error modeling [`GetBlockFilter`](corepc_types::model::GetBlockFilter)
-    GetBlockFilter(GetBlockFilterError),
+    /// Error converting a version-specific RPC type into the model type.
+    Model(Box<dyn core::error::Error + Send + Sync + 'static>),
 
     /// Invalid or corrupted cookie file.
     InvalidCookieFile,
@@ -58,9 +45,7 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Error::DecodeHex(e) => write!(f, "hex deserialization error: {e}"),
-            Error::GetBlockVerboseOne(e) => write!(f, "block verbose error: {e}"),
-            Error::GetBlockHeaderVerbose(e) => write!(f, "block header verbose error: {e}"),
-            Error::GetBlockFilter(e) => write!(f, "block filter error: {e}"),
+            Error::Model(e) => write!(f, "model conversion error: {e}"),
             Error::InvalidCookieFile => write!(f, "invalid or missing cookie file"),
             Error::InvalidUrl(e) => write!(f, "invalid RPC URL: {e}"),
             Error::HexToArray(e) => write!(f, "hash parsing error: {e}"),
@@ -74,6 +59,16 @@ impl fmt::Display for Error {
 
 impl core::error::Error for Error {}
 
+impl Error {
+    /// Converts `e` to a [`Error::Model`] error.
+    pub(crate) fn model<E>(e: E) -> Self
+    where
+        E: core::error::Error + Send + Sync + 'static,
+    {
+        Self::Model(Box::new(e))
+    }
+}
+
 // Conversions from other error types
 impl From<jsonrpc::Error> for Error {
     fn from(e: jsonrpc::Error) -> Self {
@@ -105,12 +100,6 @@ impl From<TryFromIntError> for Error {
     }
 }
 
-impl From<GetBlockVerboseOneError> for Error {
-    fn from(e: GetBlockVerboseOneError) -> Self {
-        Error::GetBlockVerboseOne(e)
-    }
-}
-
 impl From<FromHexError> for Error {
     fn from(e: FromHexError) -> Self {
         Error::DecodeHex(e)

src/lib.rs

@@ -9,9 +9,8 @@
 mod client;
 mod error;
 
-pub use client::{Auth, Client};
-pub use error::{Error, Result};
+pub use client::*;
+pub use error::*;
 
-pub use jsonrpc;
-// Re-export corepc_types
 pub use corepc_types;
+pub use jsonrpc;