touchups

paradigmxyz · Jul 8, 2024 · 366c1b1 · 366c1b1
1 parent 7dcc4dc
commit 366c1b1
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/crates/rpc/rpc/src/otterscan.rs b/crates/rpc/rpc/src/otterscan.rs
@@ -1,9 +1,10 @@
 use alloy_primitives::Bytes;
 use async_trait::async_trait;
-use jsonrpsee::{core::RpcResult, types::ErrorObjectOwned};
+use jsonrpsee::core::RpcResult;
 use reth_primitives::{Address, BlockId, BlockNumberOrTag, TxHash, B256};
 use reth_rpc_api::{EthApiServer, OtterscanServer};
 use reth_rpc_eth_api::helpers::TraceExt;
+use reth_rpc_eth_types::EthApiError;
 use reth_rpc_server_types::result::internal_rpc_err;
 use reth_rpc_types::{
     trace::{
@@ -227,8 +228,7 @@ where
 
         while low <= high {
             let mid = (low + high) / 2;
-            let block_number = Some(BlockId::Number(BlockNumberOrTag::Number(mid)));
-            if self.eth.get_code(address, block_number).await?.is_empty() {
+            if self.eth.get_code(address, Some(mid.into())).await?.is_empty() {
                 low = mid + 1; // not found in current block, need to search in the later blocks
             } else {
                 high = mid - 1; // found in current block, try to find a lower block
@@ -260,16 +260,16 @@ where
                                 })),
                                 None,
                             ) if contract == address => Some(ContractCreator {
-                                hash: tx_trace.transaction_hash.ok_or_else(|| {
-                                    internal_rpc_err("transaction hash is missing")
-                                })?,
+                                hash: tx_trace
+                                    .transaction_hash
+                                    .ok_or_else(|| EthApiError::TransactionNotFound)?,
                                 creator,
                             }),
                             _ => None,
                         })
                     })
                     .filter_map(Result::transpose)
-                    .collect::<Result<Vec<_>, ErrorObjectOwned>>()
+                    .collect::<Result<Vec<_>, EthApiError>>()
             })
             .transpose()?;