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: fix error types in recover_sender utility fn (#3042)

Browse Source
This commit is contained in:
Dan Cline
2023-06-06 18:34:47 -04:00
committed by GitHub
parent d4b9ab0d05
commit 8ffcb3124d
1 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
crates/stages/src/stages/sender_recovery.rs
View File

@ -106,29 +106,6 @@ impl<DB: Database> Stage<DB> for SenderRecoveryStage {
// Note: Unfortunate side-effect of how chunk is designed in itertools (it is not Send)
let chunk: Vec<_> = chunk.collect();
// closure that would recover signer. Used as utility to wrap result
let recover = |entry: Result<
(RawKey<TxNumber>, RawValue<TransactionSignedNoHash>),
DatabaseError,
>,
rlp_buf: &mut Vec<u8>|
-> Result<(u64, H160), Box<SenderRecoveryStageError>> {
let (tx_id, transaction) =
entry.map_err(|e| Box::new(SenderRecoveryStageError::StageError(e.into())))?;
let tx_id = tx_id.key().expect("key to be formated");
let tx = transaction.value().expect("value to be formated");
tx.transaction.encode_without_signature(rlp_buf);
let sender = tx.signature.recover_signer(keccak256(rlp_buf)).ok_or(
SenderRecoveryStageError::FailedRecovery(FailedSenderRecoveryError {
tx: tx_id,
}),
)?;
Ok((tx_id, sender))
};
// Spawn the sender recovery task onto the global rayon pool
// This task will send the results through the channel after it recovered the senders.
rayon::spawn(move || {
@ -203,8 +180,9 @@ impl<DB: Database> Stage<DB> for SenderRecoveryStage {
fn recover_sender(
entry: Result<(RawKey<TxNumber>, RawValue<TransactionSignedNoHash>), DatabaseError>,
rlp_buf: &mut Vec<u8>,
) -> Result<(u64, H160), Box<StageError>> {
let (tx_id, transaction) = entry.map_err(|e| Box::new(e.into()))?;
) -> Result<(u64, H160), Box<SenderRecoveryStageError>> {
let (tx_id, transaction) =
entry.map_err(|e| Box::new(SenderRecoveryStageError::StageError(e.into())))?;
let tx_id = tx_id.key().expect("key to be formated");
let tx = transaction.value().expect("value to be formated");
@ -213,7 +191,7 @@ fn recover_sender(
let sender = tx
.signature
.recover_signer(keccak256(rlp_buf))
.ok_or(StageError::from(SenderRecoveryStageError::SenderRecovery { tx: tx_id }))?;
.ok_or(SenderRecoveryStageError::FailedRecovery(FailedSenderRecoveryError { tx: tx_id }))?;
Ok((tx_id, sender))
}