cleanup

src/derive/stages/attributes.rs

@@ -29,7 +29,7 @@ impl Iterator for Attributes {
     fn next(&mut self) -> Option<Self::Item> {
         self.block_input_iter
             .next()
-            .map(|input| input.as_full_epoch(&self.state).unwrap())
+            .map(|input| input.with_full_epoch(&self.state).unwrap())
             .map(|batch| self.derive_attributes(batch))
     }
 }

src/derive/stages/block_input.rs

@@ -19,7 +19,7 @@ pub struct BlockInput<E: EpochType> {
 }
 
 impl BlockInput<u64> {
-    pub fn as_full_epoch(self, state: &Arc<RwLock<State>>) -> Result<BlockInput<Epoch>> {
+    pub fn with_full_epoch(self, state: &Arc<RwLock<State>>) -> Result<BlockInput<Epoch>> {
         let state = state.read().map_err(|_| eyre::eyre!("lock poisoned"))?;
         let epoch = state
             .epoch_by_number(self.epoch)

src/derive/stages/span_batch.rs

@@ -139,14 +139,9 @@ fn decode_transactions(
 
     let legacy_tx_count = tx_datas
         .iter()
-        .filter(|tx| {
-            if matches!(tx, TxData::Legacy { .. }) {
-                true
-            } else {
-                false
-            }
-        })
+        .filter(|tx| matches!(tx, TxData::Legacy { .. }))
         .count() as u64;
+
     let (protected_bits, data) = decode_bitlist(data, legacy_tx_count);
 
     let mut txs = Vec::new();