Skip to content

Commit 29c29ef

Browse files
committed
remove duplicate function
1 parent 1601123 commit 29c29ef

2 files changed

Lines changed: 4 additions & 18 deletions

File tree

packages/evm/bindings/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ impl EvmInner {
676676
tx_hash: B256,
677677
) -> std::result::Result<Option<TxReceipt>, EVMError<String>> {
678678
match self.persistent_db.get_receipt(block_number, tx_hash) {
679-
Ok(receipt) => Ok(receipt),
679+
Ok((_, receipt)) => Ok(receipt),
680680
Err(err) => Err(EVMError::Database(
681681
format!("failed reading receipt: {}", err).into(),
682682
)),
@@ -698,7 +698,7 @@ impl EvmInner {
698698

699699
let (committed, _) = self
700700
.persistent_db
701-
.get_committed_receipt(commit_key.0, tx_ctx.tx_hash)
701+
.get_receipt(commit_key.0, tx_ctx.tx_hash)
702702
.map_err(|err| EVMError::Database(format!("commit receipt lookup: {}", err).into()))?;
703703
assert!(!committed);
704704

packages/evm/core/src/db.rs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -595,20 +595,6 @@ impl PersistentDB {
595595
}
596596
}
597597

598-
pub fn get_receipt(
599-
&self,
600-
block_number: u64,
601-
tx_hash: B256,
602-
) -> Result<Option<TxReceipt>, Error> {
603-
let tx_env = self.env.read_txn()?;
604-
605-
let commits = self.inner.borrow().commits.get(&tx_env, &block_number)?;
606-
607-
Ok(match commits {
608-
Some(inner) => inner.tx_receipts.get(&tx_hash).cloned(),
609-
None => None,
610-
})
611-
}
612598

613599
pub fn get_historical_account_info(
614600
&mut self,
@@ -1113,13 +1099,13 @@ impl PersistentDB {
11131099
.is_ok_and(|v| v.is_some())
11141100
}
11151101

1116-
pub fn get_committed_receipt(
1102+
pub fn get_receipt(
11171103
&self,
11181104
block_number: u64,
11191105
tx_hash: B256,
11201106
) -> Result<(bool, Option<TxReceipt>), Error> {
11211107
let env = self.env.clone();
1122-
let rtxn = env.read_txn().expect("read");
1108+
let rtxn = env.read_txn()?;
11231109
let inner = self.inner.borrow();
11241110

11251111
match inner.commits.get(&rtxn, &block_number)? {

0 commit comments

Comments
 (0)