jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: revert header error message change (#10866)

Browse Source
This commit is contained in:
Oliver
2024-09-12 18:53:12 +02:00
committed by GitHub
parent 74c733d22d
commit 29e11d31b5
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/rpc/rpc-eth-types/src/error.rs
View File

@ -169,12 +169,18 @@ impl From<EthApiError> for jsonrpsee_types::error::ErrorObject<'static> {
EthApiError::UnknownBlockOrTxIndex => {
rpc_error_with_code(EthRpcErrorCode::ResourceNotFound.code(), error.to_string())
}
EthApiError::HeaderNotFound(id) | EthApiError::ReceiptsNotFound(id) => {
rpc_error_with_code(
EthRpcErrorCode::ResourceNotFound.code(),
format!("{error}: {}", block_id_to_str(id)),
)
}
// TODO(onbjerg): We rewrite the error message here because op-node does string matching
// on the error message.
//
// Until https://github.com/ethereum-optimism/optimism/pull/11759 is released, this must be kept around.
EthApiError::HeaderNotFound(id) => rpc_error_with_code(
EthRpcErrorCode::ResourceNotFound.code(),
format!("block not found: {}", block_id_to_str(id)),
),
EthApiError::ReceiptsNotFound(id) => rpc_error_with_code(
EthRpcErrorCode::ResourceNotFound.code(),
format!("{error}: {}", block_id_to_str(id)),
),
EthApiError::HeaderRangeNotFound(start_id, end_id) => rpc_error_with_code(
EthRpcErrorCode::ResourceNotFound.code(),
format!(
@ -738,24 +744,24 @@ mod tests {
"1a15e3c30cf094a99826869517b16d185d45831d3a494f01030b0001a9d3ebb9"
)))
.into();
assert_eq!(err.message(), "header not found: hash 0x1a15e3c30cf094a99826869517b16d185d45831d3a494f01030b0001a9d3ebb9");
assert_eq!(err.message(), "block not found: hash 0x1a15e3c30cf094a99826869517b16d185d45831d3a494f01030b0001a9d3ebb9");
let err: jsonrpsee_types::error::ErrorObject<'static> =
EthApiError::HeaderNotFound(BlockId::hash_canonical(b256!(
"1a15e3c30cf094a99826869517b16d185d45831d3a494f01030b0001a9d3ebb9"
)))
.into();
assert_eq!(err.message(), "header not found: canonical hash 0x1a15e3c30cf094a99826869517b16d185d45831d3a494f01030b0001a9d3ebb9");
assert_eq!(err.message(), "block not found: canonical hash 0x1a15e3c30cf094a99826869517b16d185d45831d3a494f01030b0001a9d3ebb9");
let err: jsonrpsee_types::error::ErrorObject<'static> =
EthApiError::HeaderNotFound(BlockId::number(100000)).into();
assert_eq!(err.message(), "header not found: number 0x186a0");
assert_eq!(err.message(), "block not found: number 0x186a0");
let err: jsonrpsee_types::error::ErrorObject<'static> =
EthApiError::HeaderNotFound(BlockId::latest()).into();
assert_eq!(err.message(), "header not found: latest");
assert_eq!(err.message(), "block not found: latest");
let err: jsonrpsee_types::error::ErrorObject<'static> =
EthApiError::HeaderNotFound(BlockId::safe()).into();
assert_eq!(err.message(), "header not found: safe");
assert_eq!(err.message(), "block not found: safe");
let err: jsonrpsee_types::error::ErrorObject<'static> =
EthApiError::HeaderNotFound(BlockId::finalized()).into();
assert_eq!(err.message(), "header not found: finalized");
assert_eq!(err.message(), "block not found: finalized");
}
}