Fix some compilation warnings (#1776)

some unused vars and imports are removed consensus benchmarks;
A return is added to network service steam write code when the connection is to be dropped

Co-authored-by: Zhe Yang <[email protected]>

Author: yangzhe1990

core/benchmark/consensus/src/main.rs

@@ -50,7 +50,7 @@ use threadpool::ThreadPool;
 
 pub const CHECKER_SLEEP_PERIOD: u64 = 50;
 
-fn initialize_logger(log_file: &str, log_level: LevelFilter) {
+fn initialize_logger(_log_file: &str, log_level: LevelFilter) {
     let log_config = {
         let mut conf_builder = LogConfig::builder().appender(
             Appender::builder()
@@ -122,14 +122,14 @@ fn check_results(
         }
         let partial_invalid = partial_invalid_opt.unwrap();
         let valid = *valid_indices.get(&i).unwrap();
-        let invalid = (valid == 0);
+        let invalid = valid == 0;
         if valid != -1 {
             assert!(partial_invalid == invalid, "Block {} {} partial invalid status: Consensus graph {} != actual {}", i, hashes[i], partial_invalid, invalid);
         }
         let timer0 = consensus_read.is_timer_block(&hashes[i]).unwrap();
         let timer_v = *timer_indices.get(&i).unwrap();
         if !invalid && timer_v != -1 {
-            let timer1 = (timer_v == 1);
+            let timer1 = timer_v == 1;
             assert!(
                 timer0 == timer1,
                 "Block {} {} timer status: Consensus graph {} != actual {}",
@@ -142,7 +142,7 @@ fn check_results(
         let adaptive0 = consensus_read.is_adaptive(&hashes[i]).unwrap();
         let adaptive_v = *adaptive_indices.get(&i).unwrap();
         if !invalid && adaptive_v != -1 {
-            let adaptive1 = (adaptive_v == 1);
+            let adaptive1 = adaptive_v == 1;
             assert!(
                 adaptive0 == adaptive1,
                 "Block {} {} adaptive status: Consensus graph {} != actual {}",
@@ -218,7 +218,7 @@ fn main() {
     block_heights.push(0);
     let mut blocks = Vec::new();
     blocks.push((*genesis_block).clone());
-    let mut check_batch_size = era_epoch_count as usize;
+    let check_batch_size = era_epoch_count as usize;
     let mut last_checked = 1;
 
     for s in lines {
@@ -310,12 +310,9 @@ fn main() {
         }
 
         let n = hashes.len();
-        let mut last_checked_count = 0;
         if (n != 0) && (n % check_batch_size == 0) {
-            let last_hash = hashes[n - 1];
             let checked_count = consensus.get_processed_block_count();
-            if checked_count != n - 1 && last_checked_count != checked_count {
-                last_checked_count = checked_count;
+            if checked_count != n - 1 {
                 thread::sleep(time::Duration::from_millis(
                     CHECKER_SLEEP_PERIOD,
                 ));
@@ -334,7 +331,6 @@ fn main() {
     }
 
     let n = hashes.len();
-    let last_hash = hashes[n - 1];
     while sync.is_consensus_worker_busy() {
         if last_check_time.elapsed().unwrap().as_secs() >= 5 {
             let last_time_elapsed =
@@ -383,7 +379,7 @@ fn main() {
     data_man.initialize_instance_id();
 
     let pow = Arc::new(PowComputer::new(true));
-    let (sync_n, consensus_n) =
+    let (_sync_n, consensus_n) =
         initialize_synchronization_graph_with_data_manager(
             data_man,
             beta,
@@ -410,8 +406,7 @@ fn main() {
             continue;
         }
         if genesis_idx != i {
-            let mut b = blocks[i].clone();
-            let h = b.hash();
+            let h = blocks[i].hash();
             consensus_n.on_new_block(&h, true, false);
         }
     }

network/src/service.rs

@@ -1043,7 +1043,7 @@ impl NetworkServiceInner {
             // communications from any dropped peers
             let mut session_node_id = session.read().id().map(|id| *id);
             if let Some(node_id) = session_node_id {
-                let to_drop = { self.dropped_nodes.read().contains(&node_id) };
+                let to_drop = self.dropped_nodes.read().contains(&node_id);
                 self.drop_peers(io);
                 if to_drop {
                     return;
@@ -1169,10 +1169,10 @@ impl NetworkServiceInner {
                 // communications from any dropped peers
                 let sess_id = session.read().id().map(|id| *id);
                 if let Some(node_id) = sess_id {
-                    let to_drop =
-                        { self.dropped_nodes.read().contains(&node_id) };
+                    let to_drop = self.dropped_nodes.read().contains(&node_id);
+                    self.drop_peers(io);
                     if to_drop {
-                        self.drop_peers(io);
+                        return;
                     }
                 }
             }