Merge pull request #187 from ElrondNetwork/clippy-check

Clippy check github action

Author: andrei-marinica

.github/workflows/actions.yml

@@ -43,3 +43,17 @@ jobs:
           toolchain: nightly
       - name: Run rust tests
         run: cargo test
+  clippy_check:
+    name: Clippy linter check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly
+            components: clippy
+            default: true
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args:

contracts/examples/crypto-kitties/common/kitty/src/color.rs

@@ -13,21 +13,16 @@ impl Color {
 	// ratios are integers, 0 < ratio < 100, ratioFirst + ratioSecond = 100
 	// checks should be done in the caller
 	pub fn mix_with(&self, other_color: &Color, ratio_first: u8, ratio_second: u8) -> Color {
-		let mut result = Color::default();
-
-		result.r = ((self.r as u16 * ratio_first as u16
-			+ other_color.r as u16 * ratio_second as u16)
+		let r = ((self.r as u16 * ratio_first as u16 + other_color.r as u16 * ratio_second as u16)
 			/ 100) as u8;
 
-		result.g = ((self.g as u16 * ratio_first as u16
-			+ other_color.g as u16 * ratio_second as u16)
+		let g = ((self.g as u16 * ratio_first as u16 + other_color.g as u16 * ratio_second as u16)
 			/ 100) as u8;
 
-		result.b = ((self.b as u16 * ratio_first as u16
-			+ other_color.b as u16 * ratio_second as u16)
+		let b = ((self.b as u16 * ratio_first as u16 + other_color.b as u16 * ratio_second as u16)
 			/ 100) as u8;
 
-		result
+		Color { r, g, b }
 	}
 }
 

contracts/examples/crypto-kitties/kitty-auction/src/lib.rs

@@ -1,5 +1,6 @@
 #![no_std]
 #![allow(non_snake_case)]
+#![allow(clippy::too_many_arguments)]
 
 elrond_wasm::imports!();
 

contracts/examples/crypto-kitties/kitty-ownership/src/lib.rs

@@ -1,5 +1,6 @@
 #![no_std]
 #![allow(non_snake_case)]
+#![allow(clippy::suspicious_operation_groupings)]
 
 elrond_wasm::imports!();
 
@@ -519,7 +520,7 @@ pub trait KittyOwnership {
 			return false;
 		}
 
-		return true;
+		true
 	}
 
 	// getters

contracts/examples/egld-esdt-swap/src/lib.rs

@@ -41,15 +41,17 @@ pub trait EgldEsdtSwap {
 				&token_display_name,
 				&token_ticker,
 				&initial_supply,
-				EGLD_NUM_DECIMALS,
-				false,
-				false,
-				false,
-				true,
-				false,
-				true,
-				true,
-				false,
+				FungibleTokenProperties {
+					num_decimals: EGLD_NUM_DECIMALS,
+					can_freeze: false,
+					can_wipe: false,
+					can_pause: false,
+					can_mint: true,
+					can_burn: false,
+					can_change_owner: true,
+					can_upgrade: true,
+					can_add_special_roles: false,
+				},
 			)
 			.async_call()
 			.with_callback(self.callbacks().esdt_issue_callback(&caller)))

contracts/examples/erc1155-marketplace/src/lib.rs

@@ -1,6 +1,7 @@
 #![no_std]
 #![allow(unused_attributes)]
 #![allow(non_snake_case)]
+#![allow(clippy::too_many_arguments)]
 
 elrond_wasm::imports!();
 elrond_wasm::derive_imports!();
@@ -368,9 +369,7 @@ pub trait Erc1155Marketplace {
 
 	fn add_claimable_funds(&self, token_identifier: &TokenIdentifier, amount: &BigUint) {
 		let mut mapper = self.get_claimable_funds_mapper();
-		let mut total = mapper
-			.get(token_identifier)
-			.unwrap_or_else(|| BigUint::zero());
+		let mut total = mapper.get(token_identifier).unwrap_or_else(BigUint::zero);
 		total += amount;
 		mapper.insert(token_identifier.clone(), total);
 	}

contracts/examples/erc1155/src/lib.rs

@@ -225,7 +225,7 @@ pub trait Erc1155 {
 	fn balance_of(&self, owner: &Address, type_id: &BigUint) -> BigUint {
 		self.get_balance_mapper(&owner)
 			.get(&type_id)
-			.unwrap_or_else(|| BigUint::zero())
+			.unwrap_or_else(BigUint::zero)
 	}
 
 	// returns balance for each (owner, id) pair

contracts/examples/lottery-erc20/src/lib.rs

@@ -313,7 +313,7 @@ pub trait Lottery {
 		)
 	}
 
-	fn get_random_winning_ticket_id(&self, prev_winners: &Vec<u32>, total_tickets: u32) -> u32 {
+	fn get_random_winning_ticket_id(&self, prev_winners: &[u32], total_tickets: u32) -> u32 {
 		let seed = self.get_block_random_seed();
 		let mut rand = Random::new(*seed);
 

contracts/examples/multisig/src/lib.rs

@@ -269,7 +269,7 @@ pub trait Multisig {
 	#[endpoint]
 	fn sign(&self, action_id: usize) -> SCResult<()> {
 		require!(
-			!self.action_mapper().is_empty_unchecked(action_id),
+			!self.action_mapper().item_is_empty_unchecked(action_id),
 			"action does not exist"
 		);
 
@@ -292,7 +292,7 @@ pub trait Multisig {
 	#[endpoint]
 	fn unsign(&self, action_id: usize) -> SCResult<()> {
 		require!(
-			!self.action_mapper().is_empty_unchecked(action_id),
+			!self.action_mapper().item_is_empty_unchecked(action_id),
 			"action does not exist"
 		);
 
@@ -331,7 +331,7 @@ pub trait Multisig {
 		self.set_user_id_to_role(user_id, new_role);
 
 		// update board size
-		#[allow(clippy::collapsible_if)]
+		#[allow(clippy::collapsible_else_if)]
 		if old_role == UserRole::BoardMember {
 			if new_role != UserRole::BoardMember {
 				self.num_board_members().update(|value| *value -= 1);
@@ -343,7 +343,7 @@ pub trait Multisig {
 		}
 
 		// update num_proposers
-		#[allow(clippy::collapsible_if)]
+		#[allow(clippy::collapsible_else_if)]
 		if old_role == UserRole::Proposer {
 			if new_role != UserRole::Proposer {
 				self.num_proposers().update(|value| *value -= 1);

contracts/feature-tests/basic-features/src/lib.rs

@@ -18,7 +18,6 @@ use ser_ex1::*;
 use ser_ex2::*;
 use simple_enum::*;
 
-use core::iter::FromIterator;
 use core::num::NonZeroUsize;
 
 #[elrond_wasm_derive::contract(BasicFeaturesImpl)]
@@ -504,12 +503,12 @@ pub trait BasicFeatures {
 
 	#[view]
 	fn map_mapper_keys(&self) -> MultiResultVec<u32> {
-		MultiResultVec::from_iter(self.map_mapper().keys())
+		self.map_mapper().keys().collect()
 	}
 
 	#[view]
 	fn map_mapper_values(&self) -> MultiResultVec<u32> {
-		MultiResultVec::from_iter(self.map_mapper().values())
+		self.map_mapper().values().collect()
 	}
 
 	#[endpoint]