Fix rebase errors

kaspanet · Jan 29, 2023 · e3a3661 · e3a3661
1 parent a6cdcb5
commit e3a3661
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/consensus/src/consensus/mod.rs b/consensus/src/consensus/mod.rs
@@ -55,7 +55,7 @@ use consensus_core::{
         block::{Block, BlockTemplate},
         blockstatus::BlockStatus,
         coinbase::MinerData,
-    errors::{coinbase::CoinbaseResult, tx::TxResult},
+        errors::{coinbase::CoinbaseResult, tx::TxResult},
         tx::{MutableTransaction, Transaction},
         BlockHashSet,
     },

diff --git a/consensus/src/consensus/test_consensus.rs b/consensus/src/consensus/test_consensus.rs
@@ -66,7 +66,6 @@ impl TestConsensus {
         Self { consensus: Arc::new(Consensus::new(db, params, process_genesis)), params: params.clone(), temp_db_lifetime }
     }
 
-
     pub fn build_header_with_parents(&self, hash: Hash, parents: Vec<Hash>) -> Header {
         let mut header = header_from_precomputed_hash(hash, parents);
         let ghostdag_data = self.consensus.ghostdag_manager.ghostdag(header.direct_parents());

diff --git a/consensus/src/processes/ghostdag/mergeset.rs b/consensus/src/processes/ghostdag/mergeset.rs
@@ -19,7 +19,7 @@ impl<T: GhostdagStoreReader, S: RelationsStoreReader, U: ReachabilityService, V:
         while let Some(current) = queue.pop_front() {
             let current_parents = self.relations_store.get_parents(current).unwrap_or_else(|err| {
                 println!("WUT");
-                panic!("{:?}", err);
+                panic!("{err:?}");
             });
 
             // For each parent of the current block we check whether it is in the past of the selected parent. If not,

diff --git a/consensus/tests/integration_tests.rs b/consensus/tests/integration_tests.rs
@@ -880,7 +880,7 @@ async fn json_test(file_path: &str) {
             .consensus
             .validate_and_insert_block(block, !proof_exists)
             .await
-            .unwrap_or_else(|e| panic!("block {} {} failed: {}", i, hash, e));
+            .unwrap_or_else(|e| panic!("block {i} {hash} failed: {e}"));
         assert!(status.is_utxo_valid_or_pending());
     }