fmt

tari-project · Oct 10, 2022 · 3329462 · 3329462
1 parent 3e342b4
commit 3329462
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 49 deletions.
diff --git a/applications/tari_miner/src/difficulty.rs b/applications/tari_miner/src/difficulty.rs
@@ -21,9 +21,9 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 use std::convert::TryInto;
-use tari_core::proof_of_work::sha3_difficulty;
+
 use tari_app_grpc::tari_rpc::BlockHeader as grpc_header;
-use tari_core::{blocks::BlockHeader, large_ints::U256};
+use tari_core::{blocks::BlockHeader, large_ints::U256, proof_of_work::sha3_difficulty};
 use tari_utilities::epoch_time::EpochTime;
 
 use crate::errors::MinerError;
@@ -41,10 +41,7 @@ impl BlockHeaderSha3 {
     #[allow(clippy::cast_sign_loss)]
     pub fn new(header: grpc_header) -> Result<Self, MinerError> {
         let header: BlockHeader = header.try_into().map_err(MinerError::BlockHeader)?;
-        Ok(Self {
-            header,
-            hashes: 0,
-        })
+        Ok(Self { header, hashes: 0 })
     }
 
     /// This function will update the timestamp of the header, but only if the new timestamp is greater than the current

diff --git a/base_layer/core/src/consensus/consensus_constants.rs b/base_layer/core/src/consensus/consensus_constants.rs
@@ -505,49 +505,52 @@ impl ConsensusConstants {
             target_time: 200,
         });
         let (input_version_range, output_version_range, kernel_version_range) = version_zero();
-        vec![ConsensusConstants {
-            effective_from_height: 0,
-            coinbase_lock_height: 6,
-            blockchain_version: 0,
-            valid_blockchain_version_range: 0..=0,
-            future_time_limit: 540,
-            difficulty_block_window: 90,
-            max_block_transaction_weight: 127_795,
-            median_timestamp_count: 11,
-            emission_initial: 18_462_816_327 * uT,
-            emission_decay: &ESMERALDA_DECAY_PARAMS,
-            emission_tail: 800 * T,
-            max_randomx_seed_height: 3000,
-            proof_of_work: algos.clone(),
-            faucet_value: (10 * 4000) * T,
-            transaction_weight: TransactionWeight::v1(),
-            max_script_byte_size: 2048,
-            input_version_range: input_version_range.clone(),
-            output_version_range: output_version_range.clone(),
-            kernel_version_range: kernel_version_range.clone(),
-            permitted_output_types: Self::current_permitted_output_types(),
-        },ConsensusConstants {
-            effective_from_height: 19000,
-            coinbase_lock_height: 6,
-            blockchain_version: 1,
-            valid_blockchain_version_range: 0..=1,
-            future_time_limit: 540,
-            difficulty_block_window: 90,
-            max_block_transaction_weight: 127_795,
-            median_timestamp_count: 11,
-            emission_initial: 18_462_816_327 * uT,
-            emission_decay: &ESMERALDA_DECAY_PARAMS,
-            emission_tail: 800 * T,
-            max_randomx_seed_height: 3000,
-            proof_of_work: algos,
-            faucet_value: (10 * 4000) * T,
-            transaction_weight: TransactionWeight::v1(),
-            max_script_byte_size: 2048,
-            input_version_range,
-            output_version_range,
-            kernel_version_range,
-            permitted_output_types: Self::current_permitted_output_types(),
-        }]
+        vec![
+            ConsensusConstants {
+                effective_from_height: 0,
+                coinbase_lock_height: 6,
+                blockchain_version: 0,
+                valid_blockchain_version_range: 0..=0,
+                future_time_limit: 540,
+                difficulty_block_window: 90,
+                max_block_transaction_weight: 127_795,
+                median_timestamp_count: 11,
+                emission_initial: 18_462_816_327 * uT,
+                emission_decay: &ESMERALDA_DECAY_PARAMS,
+                emission_tail: 800 * T,
+                max_randomx_seed_height: 3000,
+                proof_of_work: algos.clone(),
+                faucet_value: (10 * 4000) * T,
+                transaction_weight: TransactionWeight::v1(),
+                max_script_byte_size: 2048,
+                input_version_range: input_version_range.clone(),
+                output_version_range: output_version_range.clone(),
+                kernel_version_range: kernel_version_range.clone(),
+                permitted_output_types: Self::current_permitted_output_types(),
+            },
+            ConsensusConstants {
+                effective_from_height: 19000,
+                coinbase_lock_height: 6,
+                blockchain_version: 1,
+                valid_blockchain_version_range: 0..=1,
+                future_time_limit: 540,
+                difficulty_block_window: 90,
+                max_block_transaction_weight: 127_795,
+                median_timestamp_count: 11,
+                emission_initial: 18_462_816_327 * uT,
+                emission_decay: &ESMERALDA_DECAY_PARAMS,
+                emission_tail: 800 * T,
+                max_randomx_seed_height: 3000,
+                proof_of_work: algos,
+                faucet_value: (10 * 4000) * T,
+                transaction_weight: TransactionWeight::v1(),
+                max_script_byte_size: 2048,
+                input_version_range,
+                output_version_range,
+                kernel_version_range,
+                permitted_output_types: Self::current_permitted_output_types(),
+            },
+        ]
     }
 
     pub fn mainnet() -> Vec<Self> {