Remove GenerateBlockError in v21-24

This only has one field and the error can be returned directly.

From v25 onwards there are 2 distinct types and the error enum has been
left.

Author: jamillambert

integration_test/tests/generating.rs

@@ -29,15 +29,17 @@ fn generating__generate_block__modelled() {
     {
         // No `submit` argument
         json = node.client.generate_block(&mining_addr.to_string(), &transactions).expect("generateblock");
+        let model: Result<mtype::GenerateBlock, _> = json.into_model();
+        model.unwrap();
     }
 
     #[cfg(not(feature = "v24_and_below"))]
     {
         // Check with `submit = false` so that `hex` is returned. v25 and later only.
         json = node.client.generate_block(&mining_addr.to_string(), &transactions, false).expect("generateblock");
+        let model: Result<mtype::GenerateBlock, GenerateBlockError> = json.into_model();
+        model.unwrap();
     }
-    let model: Result<mtype::GenerateBlock, GenerateBlockError> = json.into_model();
-    model.unwrap();
 }
 
 #[test]

types/src/v21/generating/error.rs

@@ -4,17 +4,15 @@
 //!
 //! Types for methods found under the `== Generating ==` section of the API docs.
 
-use bitcoin::BlockHash;
+use bitcoin::{hex, BlockHash};
 
-use super::{GenerateBlock, GenerateBlockError};
+use super::GenerateBlock;
 use crate::model;
 
 impl GenerateBlock {
     /// Converts version specific type to a version nonspecific, more strongly typed type.
-    pub fn into_model(self) -> Result<model::GenerateBlock, GenerateBlockError> {
-        use GenerateBlockError as E;
-
-        let hash = self.hash.parse::<BlockHash>().map_err(E::Hash)?;
+    pub fn into_model(self) -> Result<model::GenerateBlock, hex::HexToArrayError> {
+        let hash = self.hash.parse::<BlockHash>()?;
         Ok(model::GenerateBlock {
             hash,
             hex: None, // v25 and later only.

types/src/v21/generating/into.rs

@@ -4,13 +4,10 @@
 //!
 //! Types for methods found under the `== Generating ==` section of the API docs.
 
-mod error;
 mod into;
 
 use serde::{Deserialize, Serialize};
 
-pub use self::error::GenerateBlockError;
-
 /// Result of JSON-RPC method `generateblock`.
 ///
 /// > Mine a block with a set of ordered transactions immediately to a specified address or descriptor (before the RPC call returns)

types/src/v21/generating/mod.rs

@@ -244,7 +244,7 @@ pub use self::{
         Bip9SoftforkInfo, GetBlockchainInfo, GetMempoolEntry, GetMempoolInfo, Softfork,
         SoftforkType,
     },
-    generating::{GenerateBlock, GenerateBlockError},
+    generating::GenerateBlock,
     network::{GetNetworkInfo, GetPeerInfo},
     util::{GetIndexInfo, GetIndexInfoName},
     wallet::{

types/src/v21/mod.rs

@@ -306,10 +306,9 @@ pub use crate::{
     },
     v20::{CreateMultisig, GenerateToDescriptor, GetTransaction, GetTransactionDetail},
     v21::{
-        Bip9SoftforkInfo, GenerateBlock, GenerateBlockError, GetBlockchainInfo, GetIndexInfo,
-        GetIndexInfoName, GetMempoolEntry, GetNetworkInfo, ImportDescriptors,
-        ImportDescriptorsResult, PsbtBumpFee, PsbtBumpFeeError, Send, SendError, Softfork,
-        SoftforkType, UnloadWallet, UpgradeWallet,
+        Bip9SoftforkInfo, GenerateBlock, GetBlockchainInfo, GetIndexInfo, GetIndexInfoName,
+        GetMempoolEntry, GetNetworkInfo, ImportDescriptors, ImportDescriptorsResult, PsbtBumpFee,
+        PsbtBumpFeeError, Send, SendError, Softfork, SoftforkType, UnloadWallet, UpgradeWallet,
     },
     ScriptPubkey,
 };

types/src/v22/mod.rs

@@ -306,9 +306,9 @@ pub use crate::{
     },
     v20::{GenerateToDescriptor, GetTransactionDetail},
     v21::{
-        GenerateBlock, GenerateBlockError, GetIndexInfo, GetIndexInfoName, GetNetworkInfo,
-        ImportDescriptors, ImportDescriptorsResult, PsbtBumpFee, PsbtBumpFeeError, Send, SendError,
-        UnloadWallet, UpgradeWallet,
+        GenerateBlock, GetIndexInfo, GetIndexInfoName, GetNetworkInfo, ImportDescriptors,
+        ImportDescriptorsResult, PsbtBumpFee, PsbtBumpFeeError, Send, SendError, UnloadWallet,
+        UpgradeWallet,
     },
     v22::{Banned, GetMempoolInfo, ListBanned, ScriptPubkey},
 };

types/src/v23/mod.rs

@@ -307,9 +307,9 @@ pub use crate::{
     },
     v20::GenerateToDescriptor,
     v21::{
-        GenerateBlock, GenerateBlockError, GetIndexInfo, GetIndexInfoName, GetNetworkInfo,
-        ImportDescriptors, ImportDescriptorsResult, PsbtBumpFee, PsbtBumpFeeError, Send, SendError,
-        UnloadWallet, UpgradeWallet,
+        GenerateBlock, GetIndexInfo, GetIndexInfoName, GetNetworkInfo, ImportDescriptors,
+        ImportDescriptorsResult, PsbtBumpFee, PsbtBumpFeeError, Send, SendError, UnloadWallet,
+        UpgradeWallet,
     },
     v22::{Banned, ListBanned, ScriptPubkey},
     v23::{