fix: clippies on latest rust 1.75

tari-project · Jan 2, 2024 · 82815a9 · 82815a9
1 parent cd0f704
commit 82815a9
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 47 deletions.
diff --git a/applications/tari_dan_wallet_cli/src/command/account.rs b/applications/tari_dan_wallet_cli/src/command/account.rs
@@ -285,7 +285,7 @@ pub async fn handle_claim_burn(args: ClaimBurnArgs, client: &mut WalletDaemonCli
     let req = ClaimBurnRequest {
         account,
         claim_proof,
-        max_fee: fee.map(|f| f.try_into()).transpose()?,
+        max_fee: fee.map(Into::into),
     };
 
     let resp = client
@@ -370,7 +370,7 @@ pub async fn handle_reveal_funds(args: RevealFundsArgs, client: &mut WalletDaemo
         .accounts_reveal_funds(RevealFundsRequest {
             account,
             amount_to_reveal: Amount::try_from(reveal_amount).expect("Reveal amount too large"),
-            max_fee: max_fee.map(|f| f.try_into()).transpose()?,
+            max_fee: max_fee.map(Into::into),
             pay_fee_from_reveal: pay_from_reveal,
         })
         .await?;

diff --git a/dan_layer/consensus_tests/src/support/mod.rs b/dan_layer/consensus_tests/src/support/mod.rs
@@ -19,11 +19,9 @@ mod transaction;
 mod validator;
 
 pub use address::*;
-pub use epoch_manager::*;
 pub use harness::*;
 pub use leader_strategy::*;
 pub use network::*;
-pub use signing_service::*;
 pub use spec::*;
 pub use state_manager::*;
 pub use transaction::*;

diff --git a/dan_layer/engine/src/wasm/process.rs b/dan_layer/engine/src/wasm/process.rs
@@ -259,7 +259,7 @@ impl Invokable for WasmProcess {
             },
         };
         let ptr = val
-            .get(0)
+            .first()
             .and_then(|v| v.i32())
             .ok_or(WasmExecutionError::ExpectedPointerReturn { function: main_name })?;
 

diff --git a/dan_layer/state_store_sqlite/src/sql_models/locked_output.rs b/dan_layer/state_store_sqlite/src/sql_models/locked_output.rs
diff --git a/dan_layer/state_store_sqlite/src/sql_models/mod.rs b/dan_layer/state_store_sqlite/src/sql_models/mod.rs
@@ -4,7 +4,6 @@
 mod block;
 mod bookkeeping;
 mod leaf_block;
-mod locked_output;
 mod quorum_certificate;
 mod substate;
 mod transaction;
@@ -14,7 +13,6 @@ mod vote;
 pub use block::*;
 pub use bookkeeping::*;
 pub use leaf_block::*;
-pub use locked_output::*;
 pub use quorum_certificate::*;
 pub use substate::*;
 pub use transaction::*;

diff --git a/dan_layer/tari_bor/src/json_encoding.rs b/dan_layer/tari_bor/src/json_encoding.rs
@@ -13,7 +13,7 @@ impl serde::Serialize for CborValueJsonSerializeWrapper<'_> {
     where S: serde::Serializer {
         match self.0 {
             Value::Integer(ref __field0) => {
-                let value = i128::try_from(*__field0).map_err(serde::ser::Error::custom)?;
+                let value = i128::from(*__field0);
                 serializer.serialize_newtype_variant("Value", 1u32, "Integer", &value)
             },
             Value::Bytes(ref __field0) => {

diff --git a/integration_tests/tests/steps/wallet_daemon.rs b/integration_tests/tests/steps/wallet_daemon.rs
@@ -180,14 +180,8 @@ async fn when_i_create_account_via_wallet_daemon_with_free_coins(
     wallet_daemon_name: String,
     amount: i64,
 ) {
-    wallet_daemon_cli::create_account_with_free_coins(
-        world,
-        account_name,
-        wallet_daemon_name,
-        amount.try_into().unwrap(),
-        None,
-    )
-    .await;
+    wallet_daemon_cli::create_account_with_free_coins(world, account_name, wallet_daemon_name, amount.into(), None)
+        .await;
 }
 
 #[when(expr = "I create a key named {word} for {word}")]
@@ -209,7 +203,7 @@ async fn when_i_create_account_via_wallet_daemon_with_free_coins_using_key(
         world,
         account_name,
         wallet_daemon_name,
-        amount.try_into().unwrap(),
+        amount.into(),
         Some(key_name),
     )
     .await;

diff --git a/utilities/transaction_generator/src/transaction_reader.rs b/utilities/transaction_generator/src/transaction_reader.rs
@@ -21,7 +21,7 @@ pub fn read_transactions<R: Read + Seek + Send + 'static>(
         while remaining > 0 {
             let mut len_bytes = [0u8; 2];
             reader.read_exact(&mut len_bytes).unwrap();
-            let len = u64::try_from(u16::from_le_bytes(len_bytes)).unwrap();
+            let len = u64::from(u16::from_le_bytes(len_bytes));
 
             if skip_remaining > 0 {
                 skip_remaining -= 1;