Appease Clippy

Author: elmattic

src/daemon/db_util.rs

@@ -325,12 +325,10 @@ where
         let state_output = state_manager
             .compute_tipset_state(Arc::new(ts), NO_CALLBACK, VMTrace::NotTraced)
             .await?;
-        for events_root in state_output.events_roots.iter() {
-            if let Some(cid) = events_root {
-                println!("Indexing events root @{}: {}", epoch, cid);
+        for events_root in state_output.events_roots.iter().flatten() {
+            println!("Indexing events root @{}: {}", epoch, events_root);
 
-                state_manager.chain_store().put_index(cid, &tsk)?;
-            }
+            state_manager.chain_store().put_index(events_root, &tsk)?;
         }
     }
 

src/rpc/methods/eth/filter/mod.rs

@@ -380,7 +380,7 @@ impl EthEventHandler {
             .roots
             .into_iter()
             .zip(state_events.events)
-            .filter(|(cid, _)| cid.as_ref() == Some(&events_root))
+            .filter(|(cid, _)| cid.as_ref() == Some(events_root))
             .map(|(_, v)| v);
 
         let mut chain_events = vec![];

src/state_manager/mod.rs

@@ -529,12 +529,10 @@ where
                 let state_output = self
                     .compute_tipset_state(Arc::clone(tipset), NO_CALLBACK, VMTrace::NotTraced)
                     .await?;
-                for events_root in state_output.events_roots.iter() {
-                    if let Some(cid) = events_root {
-                        trace!("Indexing events root @{}: {}", tipset.epoch(), cid);
+                for events_root in state_output.events_roots.iter().flatten() {
+                    trace!("Indexing events root @{}: {}", tipset.epoch(), events_root);
 
-                        self.chain_store().put_index(cid, key)?;
-                    }
+                    self.chain_store().put_index(events_root, key)?;
                 }
                 let ts_state = state_output.into();
                 trace!("Completed tipset state calculation {:?}", tipset.cids());

src/tool/subcommands/index_cmd.rs

@@ -96,12 +96,10 @@ impl IndexCommands {
                     let state_output = state_manager
                         .compute_tipset_state(Arc::new(ts), NO_CALLBACK, VMTrace::NotTraced)
                         .await?;
-                    for events_root in state_output.events_roots.iter() {
-                        if let Some(cid) = events_root {
-                            println!("Indexing events root @{}: {}", epoch, cid);
+                    for events_root in state_output.events_roots.iter().flatten() {
+                        println!("Indexing events root @{}: {}", epoch, events_root);
 
-                            chain_store.put_index(cid, &tsk)?;
-                        }
+                        chain_store.put_index(events_root, &tsk)?;
                     }
                 }