Merge pull request #1964 from mintlayer/fix_rust_1_89_warnings

Fix rust/clippy 1.89 warnings

Author: ImplOfAnImpl

api-server/api-server-common/src/storage/impls/postgres/mod.rs

@@ -116,7 +116,7 @@ impl TransactionalApiServerPostgresStorage {
 
     pub async fn begin_ro_transaction(
         &self,
-    ) -> Result<ApiServerPostgresTransactionalRo, ApiServerStorageError> {
+    ) -> Result<ApiServerPostgresTransactionalRo<'_>, ApiServerStorageError> {
         let conn = self
             .pool
             .get_owned()
@@ -132,7 +132,7 @@ impl TransactionalApiServerPostgresStorage {
 
     pub async fn begin_rw_transaction(
         &self,
-    ) -> Result<ApiServerPostgresTransactionalRw, ApiServerStorageError> {
+    ) -> Result<ApiServerPostgresTransactionalRw<'_>, ApiServerStorageError> {
         let conn = self
             .pool
             .get_owned()

api-server/stack-test-suite/tests/v2/nft.rs

@@ -100,8 +100,12 @@ async fn ok(#[case] seed: Seed) {
                     0,
                 );
 
-                let token_id =
-                    make_token_id(&chain_config, tf.next_block_height(), &[input.clone()]).unwrap();
+                let token_id = make_token_id(
+                    &chain_config,
+                    tf.next_block_height(),
+                    std::slice::from_ref(&input),
+                )
+                .unwrap();
 
                 // issue NFT
                 let issue_nft_tx = TransactionBuilder::new()

blockprod/src/detail/timestamp_searcher/tests.rs

@@ -483,7 +483,7 @@ mod collect_search_data {
         amount_to_delegate
     }
 
-    fn make_block_builder(tf: &mut TestFramework) -> PoSBlockBuilder {
+    fn make_block_builder(tf: &mut TestFramework) -> PoSBlockBuilder<'_> {
         tf.make_pos_block_builder().with_specific_staking_pool(&H256::zero().into())
     }
 }

chainstate/src/detail/mod.rs

@@ -140,7 +140,7 @@ impl<S: BlockchainStorage, V: TransactionVerificationStrategy> Chainstate<S, V>
     #[log_error]
     pub(crate) fn make_db_tx_ro(
         &self,
-    ) -> chainstate_storage::Result<ChainstateRef<TxRo<'_, S>, V>> {
+    ) -> chainstate_storage::Result<ChainstateRef<'_, TxRo<'_, S>, V>> {
         let db_tx = self.chainstate_storage.transaction_ro()?;
         Ok(chainstateref::ChainstateRef::new_ro(
             &self.chain_config,
@@ -152,7 +152,7 @@ impl<S: BlockchainStorage, V: TransactionVerificationStrategy> Chainstate<S, V>
     }
 
     #[log_error]
-    pub fn query(&self) -> Result<ChainstateQuery<TxRo<'_, S>, V>, PropertyQueryError> {
+    pub fn query(&self) -> Result<ChainstateQuery<'_, TxRo<'_, S>, V>, PropertyQueryError> {
         self.make_db_tx_ro().map(ChainstateQuery::new).map_err(PropertyQueryError::from)
     }
 

chainstate/storage/src/internal/store_tx/mod.rs

@@ -129,7 +129,7 @@ impl<'st, B: storage::Backend> StoreTxRw<'st, B> {
     // Get a key-value map
     fn get_map<DbMap, I>(
         &self,
-    ) -> crate::Result<storage::MapRef<storage::TransactionRw<'st, B, Schema>, DbMap>>
+    ) -> crate::Result<storage::MapRef<'_, storage::TransactionRw<'st, B, Schema>, DbMap>>
     where
         DbMap: schema::DbMap,
         Schema: schema::HasDbMap<DbMap, I>,

chainstate/test-framework/src/framework.rs

@@ -98,11 +98,11 @@ impl TestFramework {
     }
 
     /// Returns a block builder instance that can be used for block construction and processing.
-    pub fn make_block_builder(&mut self) -> BlockBuilder {
+    pub fn make_block_builder(&mut self) -> BlockBuilder<'_> {
         BlockBuilder::new(self)
     }
 
-    pub fn make_pos_block_builder(&mut self) -> PoSBlockBuilder {
+    pub fn make_pos_block_builder(&mut self) -> PoSBlockBuilder<'_> {
         PoSBlockBuilder::new(self)
     }
 

chainstate/test-suite/src/tests/fungible_tokens_v1.rs

@@ -2915,7 +2915,7 @@ fn issue_and_mint_same_tx(#[case] seed: Seed) {
         let token_id = make_token_id(
             tf.chain_config().as_ref(),
             tf.next_block_height(),
-            &[first_tx_input.clone()],
+            std::slice::from_ref(&first_tx_input),
         )
         .unwrap();
 

chainstate/test-suite/src/tests/orders_tests.rs

@@ -1786,7 +1786,7 @@ fn create_order_with_nft(#[case] seed: Seed, #[case] version: OrdersVersion) {
         let token_id = make_token_id(
             tf.chain_config(),
             tf.next_block_height(),
-            &[genesis_input.clone()],
+            std::slice::from_ref(&genesis_input),
         )
         .unwrap();
         let nft_issuance = random_nft_issuance(tf.chain_config(), &mut rng);
@@ -1949,7 +1949,7 @@ fn partially_fill_order_with_nft_v0(#[case] seed: Seed) {
         let token_id = make_token_id(
             tf.chain_config(),
             tf.next_block_height(),
-            &[genesis_input.clone()],
+            std::slice::from_ref(&genesis_input),
         )
         .unwrap();
         let nft_issuance = random_nft_issuance(tf.chain_config(), &mut rng);
@@ -2158,7 +2158,7 @@ fn partially_fill_order_with_nft_v1(#[case] seed: Seed) {
         let token_id = make_token_id(
             tf.chain_config(),
             tf.next_block_height(),
-            &[genesis_input.clone()],
+            std::slice::from_ref(&genesis_input),
         )
         .unwrap();
         let nft_issuance = random_nft_issuance(tf.chain_config(), &mut rng);

chainstate/tx-verifier/src/transaction_verifier/input_check/mod.rs

@@ -222,7 +222,7 @@ impl<'a> PerInputData<'a> {
 }
 
 impl mintscript::translate::InputInfoProvider for PerInputData<'_> {
-    fn input_info(&self) -> &InputInfo {
+    fn input_info(&self) -> &InputInfo<'_> {
         &self.input
     }
 
@@ -260,7 +260,7 @@ impl<'a, AV, TV, OV> TranslationContextFull<'a, AV, TV, OV> {
 impl<AV, TV, OV> mintscript::translate::InputInfoProvider
     for TranslationContextFull<'_, AV, TV, OV>
 {
-    fn input_info(&self) -> &InputInfo {
+    fn input_info(&self) -> &InputInfo<'_> {
         self.input.input_info()
     }
 
@@ -362,11 +362,11 @@ impl<'a> CoreContext<'a> {
         Ok(Self { inputs_and_sigs })
     }
 
-    fn input_data(&self, n: usize) -> &PerInputData {
+    fn input_data(&self, n: usize) -> &PerInputData<'_> {
         &self.inputs_and_sigs[n]
     }
 
-    fn inputs_iter(&self) -> impl ExactSizeIterator<Item = (usize, &PerInputData)> {
+    fn inputs_iter(&self) -> impl ExactSizeIterator<Item = (usize, &PerInputData<'_>)> {
         self.inputs_and_sigs.iter().enumerate()
     }
 }
@@ -479,7 +479,7 @@ impl<'a, S> InputVerifyContextTimelock<'a, S> {
         Self { ctx, input_num }
     }
 
-    fn info(&self) -> &InputInfo {
+    fn info(&self) -> &InputInfo<'_> {
         self.ctx.core_ctx.input_data(self.input_num).input_info()
     }
 }
@@ -612,7 +612,7 @@ impl<T: Transactable, S> SignatureContext for InputVerifyContextFull<'_, T, S> {
         self.ctx.transaction
     }
 
-    fn input_commitments(&self) -> &[SighashInputCommitment] {
+    fn input_commitments(&self) -> &[SighashInputCommitment<'_>] {
         &self.ctx.input_commitments
     }
 

chainstate/tx-verifier/src/transaction_verifier/input_check/signature_only_check.rs

@@ -50,7 +50,7 @@ impl<T: Transactable> SignatureContext for InputVerifyContextSignature<'_, T> {
         self.tx
     }
 
-    fn input_commitments(&self) -> &[SighashInputCommitment] {
+    fn input_commitments(&self) -> &[SighashInputCommitment<'_>] {
         self.input_commitments
     }
 
@@ -92,7 +92,7 @@ impl<T: Transactable> mintscript::translate::SignatureInfoProvider
 }
 
 impl<T: Transactable> InputInfoProvider for InputVerifyContextSignature<'_, T> {
-    fn input_info(&self) -> &InputInfo {
+    fn input_info(&self) -> &InputInfo<'_> {
         self.input_data.input_info()
     }