cargo fmt

solana-labs · Jan 10, 2020 · 6361fcf · 6361fcf
1 parent f2f57ab
commit 6361fcf
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 91 deletions.
diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs
@@ -1043,7 +1043,8 @@ mod tests {
         let ledger_path = get_tmp_ledger_path!();
         {
             let blockstore = Arc::new(
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger"),
+                Blockstore::open(&ledger_path)
+                    .expect("Expected to be able to open database ledger"),
             );
             let (exit, poh_recorder, poh_service, _entry_receiever) =
                 create_test_recorder(&bank, &blockstore, None);
@@ -1080,7 +1081,8 @@ mod tests {
         let ledger_path = get_tmp_ledger_path!();
         {
             let blockstore = Arc::new(
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger"),
+                Blockstore::open(&ledger_path)
+                    .expect("Expected to be able to open database ledger"),
             );
             let mut poh_config = PohConfig::default();
             poh_config.target_tick_count = Some(bank.max_tick_height() + num_extra_ticks);
@@ -1141,7 +1143,8 @@ mod tests {
         let ledger_path = get_tmp_ledger_path!();
         {
             let blockstore = Arc::new(
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger"),
+                Blockstore::open(&ledger_path)
+                    .expect("Expected to be able to open database ledger"),
             );
             let mut poh_config = PohConfig::default();
             // limit tick count to avoid clearing working_bank at PohRecord then PohRecorderError(MaxHeightReached) at BankingStage
@@ -1348,8 +1351,8 @@ mod tests {
         };
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (poh_recorder, entry_receiver) = PohRecorder::new(
                 bank.tick_height(),
                 bank.last_blockhash(),
@@ -1684,8 +1687,8 @@ mod tests {
         };
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (poh_recorder, entry_receiver) = PohRecorder::new(
                 bank.tick_height(),
                 bank.last_blockhash(),
@@ -1777,8 +1780,8 @@ mod tests {
         };
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (poh_recorder, _entry_receiver) = PohRecorder::new(
                 bank.tick_height(),
                 bank.last_blockhash(),
@@ -1865,8 +1868,8 @@ mod tests {
 
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (poh_recorder, _entry_receiver) = PohRecorder::new(
                 bank.tick_height(),
                 bank.last_blockhash(),
@@ -1932,8 +1935,8 @@ mod tests {
         };
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let blockstore = Arc::new(blockstore);
             let (poh_recorder, _entry_receiver) = PohRecorder::new(
                 bank.tick_height(),

diff --git a/core/src/broadcast_stage.rs b/core/src/broadcast_stage.rs
@@ -133,7 +133,8 @@ impl BroadcastStage {
         mut broadcast_stage_run: impl BroadcastRun,
     ) -> BroadcastStageReturnType {
         loop {
-            let res = broadcast_stage_run.run(blockstore, receiver, socket_sender, blockstore_sender);
+            let res =
+                broadcast_stage_run.run(blockstore, receiver, socket_sender, blockstore_sender);
             let res = Self::handle_error(res);
             if let Some(res) = res {
                 return res;
@@ -192,7 +193,13 @@ impl BroadcastStage {
             .name("solana-broadcaster".to_string())
             .spawn(move || {
                 let _finalizer = Finalizer::new(exit);
-                Self::run(&btree, &receiver, &socket_sender, &blockstore_sender, bs_run)
+                Self::run(
+                    &btree,
+                    &receiver,
+                    &socket_sender,
+                    &blockstore_sender,
+                    bs_run,
+                )
             })
             .unwrap();
         let mut thread_hdls = vec![thread_hdl];

diff --git a/core/src/broadcast_stage/standard_broadcast_run.rs b/core/src/broadcast_stage/standard_broadcast_run.rs
@@ -323,7 +323,12 @@ impl BroadcastRun for StandardBroadcastRun {
         blockstore_sender: &Sender<Arc<Vec<Shred>>>,
     ) -> Result<()> {
         let receive_results = broadcast_utils::recv_slot_entries(receiver)?;
-        self.process_receive_results(blockstore, socket_sender, blockstore_sender, receive_results)
+        self.process_receive_results(
+            blockstore,
+            socket_sender,
+            blockstore_sender,
+            receive_results,
+        )
     }
     fn transmit(
         &self,

diff --git a/core/src/chacha.rs b/core/src/chacha.rs
@@ -157,8 +157,14 @@ mod tests {
             "abcd1234abcd1234abcd1234abcd1234 abcd1234abcd1234abcd1234abcd1234
                             abcd1234abcd1234abcd1234abcd1234 abcd1234abcd1234abcd1234abcd1234"
         );
-        chacha_cbc_encrypt_ledger(&blockstore, 0, slots_per_segment as u64, &out_path, &mut key)
-            .unwrap();
+        chacha_cbc_encrypt_ledger(
+            &blockstore,
+            0,
+            slots_per_segment as u64,
+            &out_path,
+            &mut key,
+        )
+        .unwrap();
         let mut out_file = File::open(&out_path).unwrap();
         let mut buf = vec![];
         let size = out_file.read_to_end(&mut buf).unwrap();

diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs
@@ -1330,7 +1330,8 @@ impl ClusterInfo {
                         );
                     }
                     _ => {
-                        let rsp = Self::handle_repair(me, recycler, &from_addr, blockstore, request);
+                        let rsp =
+                            Self::handle_repair(me, recycler, &from_addr, blockstore, request);
                         if let Some(rsp) = rsp {
                             let _ignore_disconnect = response_sender.send(rsp);
                         }
@@ -2187,7 +2188,8 @@ mod tests {
         let ledger_path = get_tmp_ledger_path!();
         {
             let blockstore = Arc::new(Blockstore::open(&ledger_path).unwrap());
-            let rv = ClusterInfo::run_orphan(&recycler, &socketaddr_any!(), Some(&blockstore), 2, 0);
+            let rv =
+                ClusterInfo::run_orphan(&recycler, &socketaddr_any!(), Some(&blockstore), 2, 0);
             assert!(rv.is_none());
 
             // Create slots 1, 2, 3 with 5 shreds apiece
@@ -2198,7 +2200,8 @@ mod tests {
                 .expect("Expect successful ledger write");
 
             // We don't have slot 4, so we don't know how to service this requeset
-            let rv = ClusterInfo::run_orphan(&recycler, &socketaddr_any!(), Some(&blockstore), 4, 5);
+            let rv =
+                ClusterInfo::run_orphan(&recycler, &socketaddr_any!(), Some(&blockstore), 4, 5);
             assert!(rv.is_none());
 
             // For slot 3, we should return the highest shreds from slots 3, 2, 1 respectively

diff --git a/core/src/poh_recorder.rs b/core/src/poh_recorder.rs
@@ -486,8 +486,8 @@ mod tests {
         let prev_hash = Hash::default();
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
 
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
                 0,
@@ -513,8 +513,8 @@ mod tests {
         let prev_hash = Hash::default();
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
 
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
                 0,
@@ -540,8 +540,8 @@ mod tests {
     fn test_poh_recorder_reset_clears_cache() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
                 0,
                 Hash::default(),
@@ -565,8 +565,8 @@ mod tests {
     fn test_poh_recorder_clear() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -599,8 +599,8 @@ mod tests {
     fn test_poh_recorder_tick_sent_after_min() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -648,8 +648,8 @@ mod tests {
     fn test_poh_recorder_tick_sent_upto_and_including_max() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -695,8 +695,8 @@ mod tests {
     fn test_poh_recorder_record_to_early() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -733,8 +733,8 @@ mod tests {
     fn test_poh_recorder_record_bad_slot() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -773,8 +773,8 @@ mod tests {
     fn test_poh_recorder_record_at_min_passes() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -819,8 +819,8 @@ mod tests {
     fn test_poh_recorder_record_at_max_fails() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -863,8 +863,8 @@ mod tests {
     fn test_poh_cache_on_disconnect() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -901,8 +901,8 @@ mod tests {
     fn test_reset_current() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
                 0,
                 Hash::default(),
@@ -928,8 +928,8 @@ mod tests {
     fn test_reset_with_cached() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
                 0,
                 Hash::default(),
@@ -956,8 +956,8 @@ mod tests {
 
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
                 0,
                 Hash::default(),
@@ -987,8 +987,8 @@ mod tests {
     fn test_reset_clear_bank() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let (mut poh_recorder, _entry_receiver) = PohRecorder::new(
@@ -1018,8 +1018,8 @@ mod tests {
     pub fn test_clear_signal() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let (sender, receiver) = sync_channel(1);
@@ -1047,8 +1047,8 @@ mod tests {
         solana_logger::setup();
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let ticks_per_slot = 5;
             let GenesisConfigInfo {
                 mut genesis_config, ..
@@ -1100,8 +1100,8 @@ mod tests {
 
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -1220,8 +1220,8 @@ mod tests {
     fn test_would_be_leader_soon() {
         let ledger_path = get_tmp_ledger_path!();
         {
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let prev_hash = bank.last_blockhash();
@@ -1287,8 +1287,8 @@ mod tests {
         let ledger_path = get_tmp_ledger_path!();
         {
             // test that virtual ticks are flushed into a newly set bank asap
-            let blockstore =
-                Blockstore::open(&ledger_path).expect("Expected to be able to open database ledger");
+            let blockstore = Blockstore::open(&ledger_path)
+                .expect("Expected to be able to open database ledger");
             let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(2);
             let bank = Arc::new(Bank::new(&genesis_config));
             let genesis_hash = bank.last_blockhash();