From ec1245ebf73f2a5e86d9942d5de3bbc9f36cd7df Mon Sep 17 00:00:00 2001 From: Cayle Sharrock Date: Wed, 21 Feb 2024 10:27:57 +0000 Subject: [PATCH] fix lints --- .../src/conversions/consensus_constants.rs | 1 + base_layer/core/src/consensus/consensus_constants.rs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/applications/minotari_app_grpc/src/conversions/consensus_constants.rs b/applications/minotari_app_grpc/src/conversions/consensus_constants.rs index 0195b1dd65..74818c8cb0 100644 --- a/applications/minotari_app_grpc/src/conversions/consensus_constants.rs +++ b/applications/minotari_app_grpc/src/conversions/consensus_constants.rs @@ -100,6 +100,7 @@ impl From for grpc::ConsensusConstants { let proof_of_work = HashMap::from_iter([(0u32, randomx_pow), (1u32, sha3x_pow)]); + #[allow(deprecated)] Self { coinbase_min_maturity: cc.coinbase_min_maturity(), blockchain_version: cc.blockchain_version().into(), diff --git a/base_layer/core/src/consensus/consensus_constants.rs b/base_layer/core/src/consensus/consensus_constants.rs index c5070e526e..92d65df621 100644 --- a/base_layer/core/src/consensus/consensus_constants.rs +++ b/base_layer/core/src/consensus/consensus_constants.rs @@ -885,6 +885,8 @@ impl ConsensusConstantsBuilder { #[cfg(test)] mod test { + use std::convert::TryFrom; + use crate::{ consensus::{ emission::{Emission, EmissionSchedule}, @@ -977,7 +979,9 @@ mod test { 7_935_818_494_624_306 * uT + esmeralda[0].faucet_value() ); // 21 billion - let mut rewards = schedule.iter().skip(3255552 + coinbase_offset as usize); + let mut rewards = schedule + .iter() + .skip(3255552 + usize::try_from(coinbase_offset).unwrap()); let (block_num, reward, supply) = rewards.next().unwrap(); assert_eq!(block_num, 3255553 + coinbase_offset); assert_eq!(reward, 800_000_415 * uT);