refactor(interfaces): Result -> RethResult, Error -> RethError (#4695)

This commit is contained in:
Alexey Shekhirin
2023-09-20 22:13:16 +01:00
committed by GitHub
parent 6016da7a12
commit 0874767cd9
59 changed files with 874 additions and 723 deletions

View File

@ -5,6 +5,7 @@ use reth_db::{
tables,
transaction::{DbTx, DbTxMut},
};
use reth_interfaces::{db::DatabaseError, RethError};
use reth_primitives::{stage::StageId, Account, Bytecode, ChainSpec, StorageEntry, H256, U256};
use reth_provider::{
bundle_state::{BundleStateInit, RevertsInit},
@ -32,11 +33,11 @@ pub enum InitDatabaseError {
/// Low-level database error.
#[error(transparent)]
DBError(#[from] reth_db::DatabaseError),
DBError(#[from] DatabaseError),
/// Internal error.
#[error(transparent)]
InternalError(#[from] reth_interfaces::Error),
InternalError(#[from] RethError),
}
/// Write the genesis block if it has not already been written

View File

@ -46,6 +46,7 @@ use reth_interfaces::{
either::EitherDownloader,
headers::{client::HeadersClient, downloader::HeaderDownloader},
},
RethResult,
};
use reth_network::{error::NetworkError, NetworkConfig, NetworkHandle, NetworkManager};
use reth_network_api::NetworkInfo;
@ -664,7 +665,7 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
Ok(handle)
}
fn lookup_head(&self, db: Arc<DatabaseEnv>) -> Result<Head, reth_interfaces::Error> {
fn lookup_head(&self, db: Arc<DatabaseEnv>) -> RethResult<Head> {
let factory = ProviderFactory::new(db, self.chain.clone());
let provider = factory.provider()?;
@ -700,7 +701,7 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
db: DB,
client: Client,
tip: H256,
) -> Result<u64, reth_interfaces::Error>
) -> RethResult<u64>
where
DB: Database,
Client: HeadersClient,
@ -716,7 +717,7 @@ impl<Ext: RethCliExt> NodeCommand<Ext> {
db: DB,
client: Client,
tip: BlockHashOrNumber,
) -> Result<SealedHeader, reth_interfaces::Error>
) -> RethResult<SealedHeader>
where
DB: Database,
Client: HeadersClient,