update

Author: Officeyutong

Cargo.lock

@@ -47,7 +47,6 @@ anyhow = "1.0.56"
 thiserror = "1.0.30"
 toml = "0.5.8"
 tokio = { version = "1.20" }
-ouroboros = "0.18.5"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 rocksdb = { package = "ckb-rocksdb", version = "=0.21.1", features = [

light-client-lib/Cargo.toml

@@ -26,48 +26,41 @@ const DEFAULT_MIN_FEE_RATE: FeeRate = FeeRate(1000);
 
 /// Used to verify if a transaction meets the lowest fee rate
 /// Use self reference here since `DaoCalculator` requires references to consensus and data_loader, but `ContextualTransactionVerifier` can only provide `Arc`s
-#[ouroboros::self_referencing]
-pub struct MinFeeVerifier<DL: 'static> {
+pub struct MinFeeVerifier<DL> {
     min_fee_rate: FeeRate,
     resolved_tx: Arc<ResolvedTransaction>,
     consensus: Arc<Consensus>,
     data_loader: Arc<DL>,
-    #[borrows(consensus, data_loader)]
-    #[covariant]
-    fee_calculator: DaoCalculator<'this, DL>,
 }
-impl<DL: CellDataProvider + HeaderProvider + 'static> MinFeeVerifier<DL> {
+impl<DL: CellDataProvider + HeaderProvider> MinFeeVerifier<DL> {
     /// Creates a new `MinFeeVerifier`.
     pub fn new_with_arc(
         min_fee_rate: FeeRate,
         resolved_tx: Arc<ResolvedTransaction>,
         consensus: Arc<Consensus>,
         data_loader: Arc<DL>,
     ) -> Self {
-        MinFeeVerifierBuilder {
+        Self {
             min_fee_rate,
             resolved_tx,
             consensus,
             data_loader,
-            fee_calculator_builder: |a: &Arc<Consensus>, b: &Arc<DL>| DaoCalculator::new(a, b),
         }
-        .build()
     }
     /// Verify if the transaction meets the lowest fee rate set by `min_fee_rate`
     pub fn verify(&self) -> Result<(), Error> {
-        let fee = self
-            .borrow_fee_calculator()
-            .transaction_fee(self.borrow_resolved_tx())?;
+        let fee = DaoCalculator::new(&*self.consensus, &*self.data_loader)
+            .transaction_fee(&self.resolved_tx)?;
         let tx_size = self
-            .borrow_resolved_tx()
+            .resolved_tx
             .transaction
             .data()
             .serialized_size_in_block();
-        let min_fee = self.borrow_min_fee_rate().fee(tx_size as u64);
+        let min_fee = self.min_fee_rate.fee(tx_size as u64);
         if fee < min_fee {
             return Err(OtherError::new(format!(
                 "Transaction rejected by low fee rate: min_fee_rate = {}, min_fee = {}, fee = {}, tx_size = {}",
-                self.borrow_min_fee_rate(), min_fee, fee, tx_size
+                self.min_fee_rate, min_fee, fee, tx_size
             ))
             .into());
         }