fix(rpc): Refactor getrawtransaction & RPC error handling

zebra-rpc/src/lib.rs

@@ -5,7 +5,6 @@
 #![doc(html_root_url = "https://docs.rs/zebra_rpc")]
 
 pub mod config;
-pub mod constants;
 pub mod methods;
 pub mod queue;
 pub mod server;

zebra-rpc/src/methods/get_block_template_rpcs.rs

@@ -32,35 +32,37 @@ use zebra_network::AddressBookPeers;
 use zebra_node_services::mempool;
 use zebra_state::{ReadRequest, ReadResponse};
 
-use crate::methods::{
-    best_chain_tip_height,
-    errors::MapServerError,
-    get_block_template_rpcs::{
-        constants::{
-            DEFAULT_SOLUTION_RATE_WINDOW_SIZE, GET_BLOCK_TEMPLATE_MEMPOOL_LONG_POLL_INTERVAL,
-            ZCASHD_FUNDING_STREAM_ORDER,
-        },
-        get_block_template::{
-            check_miner_address, check_synced_to_tip, fetch_mempool_transactions,
-            fetch_state_tip_and_local_time, validate_block_proposal,
-        },
-        // TODO: move the types/* modules directly under get_block_template_rpcs,
-        //       and combine any modules with the same names.
-        types::{
+use crate::{
+    methods::{
+        best_chain_tip_height,
+        get_block_template_rpcs::{
+            constants::{
+                DEFAULT_SOLUTION_RATE_WINDOW_SIZE, GET_BLOCK_TEMPLATE_MEMPOOL_LONG_POLL_INTERVAL,
+                ZCASHD_FUNDING_STREAM_ORDER,
+            },
             get_block_template::{
-                proposal::TimeSource, proposal_block_from_template, GetBlockTemplate,
+                check_miner_address, check_synced_to_tip, fetch_mempool_transactions,
+                fetch_state_tip_and_local_time, validate_block_proposal,
+            },
+            // TODO: move the types/* modules directly under get_block_template_rpcs,
+            //       and combine any modules with the same names.
+            types::{
+                get_block_template::{
+                    proposal::TimeSource, proposal_block_from_template, GetBlockTemplate,
+                },
+                get_mining_info,
+                long_poll::LongPollInput,
+                peer_info::PeerInfo,
+                submit_block,
+                subsidy::{BlockSubsidy, FundingStream},
+                unified_address, validate_address, z_validate_address,
             },
-            get_mining_info,
-            long_poll::LongPollInput,
-            peer_info::PeerInfo,
-            submit_block,
-            subsidy::{BlockSubsidy, FundingStream},
-            unified_address, validate_address, z_validate_address,
         },
+        height_from_signed_int,
+        hex_data::HexData,
+        GetBlockHash,
     },
-    height_from_signed_int,
-    hex_data::HexData,
-    GetBlockHash, MISSING_BLOCK_ERROR_CODE,
+    server::{self, error::MapError},
 };
 
 pub mod constants;
@@ -584,12 +586,12 @@ where
                 .ready()
                 .and_then(|service| service.call(request))
                 .await
-                .map_server_error()?;
+                .map_error(server::error::LegacyCode::default())?;
 
             match response {
                 zebra_state::ReadResponse::BlockHash(Some(hash)) => Ok(GetBlockHash(hash)),
                 zebra_state::ReadResponse::BlockHash(None) => Err(Error {
-                    code: MISSING_BLOCK_ERROR_CODE,
+                    code: server::error::LegacyCode::InvalidParameter.into(),
                     message: "Block not found".to_string(),
                     data: None,
                 }),
@@ -850,7 +852,7 @@ where
                                     Is Zebra shutting down?"
                                 );
 
-                                return Err(recv_error).map_server_error();
+                                return Err(recv_error).map_error(server::error::LegacyCode::default());
                             }
                         }
                     }
@@ -1042,7 +1044,7 @@ where
                     .ready()
                     .and_then(|service| service.call(request))
                     .await
-                    .map_server_error()?;
+                    .map_error(server::error::LegacyCode::default())?;
                 current_block_size = match response {
                     zebra_state::ReadResponse::TipBlockSize(Some(block_size)) => Some(block_size),
                     _ => None,
@@ -1231,13 +1233,14 @@ where
             // Always zero for post-halving blocks
             let founders = Amount::zero();
 
-            let total_block_subsidy = block_subsidy(height, &network).map_server_error()?;
-            let miner_subsidy =
-                miner_subsidy(height, &network, total_block_subsidy).map_server_error()?;
+            let total_block_subsidy =
+                block_subsidy(height, &network).map_error(server::error::LegacyCode::default())?;
+            let miner_subsidy = miner_subsidy(height, &network, total_block_subsidy)
+                .map_error(server::error::LegacyCode::default())?;
 
             let (lockbox_streams, mut funding_streams): (Vec<_>, Vec<_>) =
                 funding_stream_values(height, &network, total_block_subsidy)
-                    .map_server_error()?
+                    .map_error(server::error::LegacyCode::default())?
                     .into_iter()
                     // Separate the funding streams into deferred and non-deferred streams
                     .partition(|(receiver, _)| matches!(receiver, FundingStreamReceiver::Deferred));
@@ -1274,8 +1277,12 @@ where
                 founders: founders.into(),
                 funding_streams,
                 lockbox_streams,
-                funding_streams_total: funding_streams_total.map_server_error()?.into(),
-                lockbox_total: lockbox_total.map_server_error()?.into(),
+                funding_streams_total: funding_streams_total
+                    .map_error(server::error::LegacyCode::default())?
+                    .into(),
+                lockbox_total: lockbox_total
+                    .map_error(server::error::LegacyCode::default())?
+                    .into(),
                 total_block_subsidy: total_block_subsidy.into(),
             })
         }
@@ -1436,7 +1443,10 @@ where
 
             let mut block_hashes = Vec::new();
             for _ in 0..num_blocks {
-                let block_template = rpc.get_block_template(None).await.map_server_error()?;
+                let block_template = rpc
+                    .get_block_template(None)
+                    .await
+                    .map_error(server::error::LegacyCode::default())?;
 
                 let get_block_template::Response::TemplateMode(block_template) = block_template
                 else {
@@ -1452,14 +1462,17 @@ where
                     TimeSource::CurTime,
                     NetworkUpgrade::current(&network, Height(block_template.height)),
                 )
-                .map_server_error()?;
-                let hex_proposal_block =
-                    HexData(proposal_block.zcash_serialize_to_vec().map_server_error()?);
+                .map_error(server::error::LegacyCode::default())?;
+                let hex_proposal_block = HexData(
+                    proposal_block
+                        .zcash_serialize_to_vec()
+                        .map_error(server::error::LegacyCode::default())?,
+                );
 
                 let _submit = rpc
                     .submit_block(hex_proposal_block, None)
                     .await
-                    .map_server_error()?;
+                    .map_error(server::error::LegacyCode::default())?;
 
                 block_hashes.push(GetBlockHash(proposal_block.hash()));
             }

zebra-rpc/src/methods/get_block_template_rpcs/get_block_template.rs

@@ -25,12 +25,12 @@ use zebra_consensus::{
 use zebra_node_services::mempool::{self, TransactionDependencies};
 use zebra_state::GetBlockTemplateChainInfo;
 
-use crate::methods::{
-    errors::OkOrServerError,
-    get_block_template_rpcs::{
+use crate::{
+    methods::get_block_template_rpcs::{
         constants::{MAX_ESTIMATED_DISTANCE_TO_NETWORK_CHAIN_TIP, NOT_SYNCED_ERROR_CODE},
         types::{default_roots::DefaultRoots, transaction::TransactionTemplate},
     },
+    server::{self, error::OkOrError},
 };
 
 pub use crate::methods::get_block_template_rpcs::types::get_block_template::*;
@@ -181,7 +181,10 @@ where
     // but this is ok for an estimate
     let (estimated_distance_to_chain_tip, local_tip_height) = latest_chain_tip
         .estimate_distance_to_network_chain_tip(network)
-        .ok_or_server_error("no chain tip available yet")?;
+        .ok_or_error(
+            server::error::LegacyCode::default(),
+            "no chain tip available yet",
+        )?;
 
     if !sync_status.is_close_to_tip()
         || estimated_distance_to_chain_tip > MAX_ESTIMATED_DISTANCE_TO_NETWORK_CHAIN_TIP