From 95fb1b6e27150529b6246386ab77d7897a1f8966 Mon Sep 17 00:00:00 2001 From: Jonathan LEI Date: Mon, 26 Aug 2024 18:51:28 +0800 Subject: [PATCH] chore: make clippy happy again (#652) --- .github/workflows/lint.yaml | 2 +- starknet-accounts/tests/single_owner_account.rs | 8 ++++---- starknet-contract/tests/contract_deployment.rs | 4 ++-- starknet-core/src/types/eth_address.rs | 16 ++++++++-------- starknet-core/src/types/mod.rs | 1 + 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 1a8df083..43bb0dab 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -81,7 +81,7 @@ jobs: - name: "Set allowed lints" run: | if [ "${{ matrix.toolchain }}" == "nightly" ]; then - echo "ALLOWED=-A non_local_definitions" >> $GITHUB_ENV + echo "ALLOWED=-A non_local_definitions -A clippy::too_long_first_doc_paragraph" >> $GITHUB_ENV else echo "ALLOWED=" >> $GITHUB_ENV fi diff --git a/starknet-accounts/tests/single_owner_account.rs b/starknet-accounts/tests/single_owner_account.rs index 1598bdc9..808093f4 100644 --- a/starknet-accounts/tests/single_owner_account.rs +++ b/starknet-accounts/tests/single_owner_account.rs @@ -354,8 +354,8 @@ async fn can_execute_eth_transfer_invoke_v3_inner( selector: get_selector_from_name("transfer").unwrap(), calldata: vec![Felt::from_hex("0x1234").unwrap(), Felt::ONE, Felt::ZERO], }]) - .gas(200000) - .gas_price(500000000000000) + .gas(100000) + .gas_price(800000000000000) .send() .await .unwrap(); @@ -544,8 +544,8 @@ async fn can_declare_cairo1_contract_v3_inner( Arc::new(flattened_class), Felt::from_hex(&hashes.compiled_class_hash).unwrap(), ) - .gas(200000) - .gas_price(500000000000000) + .gas(100000) + .gas_price(800000000000000) .send() .await .unwrap(); diff --git a/starknet-contract/tests/contract_deployment.rs b/starknet-contract/tests/contract_deployment.rs index eff7f2cc..5720d100 100644 --- a/starknet-contract/tests/contract_deployment.rs +++ b/starknet-contract/tests/contract_deployment.rs @@ -80,8 +80,8 @@ async fn can_deploy_contract_to_alpha_sepolia_with_invoke_v3() { let result = factory .deploy_v3(vec![Felt::ONE], Felt::from_bytes_be(&salt_buffer), true) - .gas(200000) - .gas_price(500000000000000) + .gas(100000) + .gas_price(800000000000000) .send() .await; diff --git a/starknet-core/src/types/eth_address.rs b/starknet-core/src/types/eth_address.rs index ab81606f..bfe2924d 100644 --- a/starknet-core/src/types/eth_address.rs +++ b/starknet-core/src/types/eth_address.rs @@ -207,7 +207,7 @@ impl From<[u8; 20]> for EthAddress { #[cfg(test)] mod tests { - use super::{EthAddress, Felt, FromBytesSliceError, FromFieldElementError}; + use super::{EthAddress, Felt}; use alloc::vec::*; @@ -291,11 +291,12 @@ mod tests { #[test] #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test::wasm_bindgen_test)] fn test_eth_address_from_felt_error() { - match EthAddress::from_felt( + if EthAddress::from_felt( &Felt::from_hex("0x10000000000000000000000000000000000000000").unwrap(), - ) { - Ok(_) => panic!("Expected error, but got Ok"), - Err(FromFieldElementError) => {} + ) + .is_ok() + { + panic!("Expected error, but got Ok"); } } @@ -304,9 +305,8 @@ mod tests { fn test_eth_address_from_slice_invalid_slice() { let buffer: Vec = vec![0, 1, 2, 3, 4, 5, 6, 7]; - match EthAddress::try_from(&buffer[0..4]) { - Ok(_) => panic!("Expected error, but got Ok"), - Err(FromBytesSliceError) => {} + if EthAddress::try_from(&buffer[0..4]).is_ok() { + panic!("Expected error, but got Ok"); } } } diff --git a/starknet-core/src/types/mod.rs b/starknet-core/src/types/mod.rs index 5f8e6db3..174968f5 100644 --- a/starknet-core/src/types/mod.rs +++ b/starknet-core/src/types/mod.rs @@ -426,6 +426,7 @@ pub enum TransactionTrace { } /// The execution result of a function invocation. +#[allow(clippy::large_enum_variant)] #[derive(Debug, Clone, PartialEq, Eq, Deserialize)] #[serde(untagged)] pub enum ExecuteInvocation {