From 01910a70af51fe89c10b92c1eb54f3919b8d380a Mon Sep 17 00:00:00 2001 From: magecnion Date: Tue, 18 Jun 2024 00:09:01 +0200 Subject: [PATCH] clipply issues --- pallets/laos-evolution/src/types.rs | 6 +++--- .../evolution-collection-factory/src/lib.rs | 3 +-- .../evolution-collection-factory/src/tests.rs | 8 ++++---- .../evolution-collection-legacy/src/tests.rs | 2 +- precompile/evolution-collection/src/lib.rs | 3 +-- precompile/evolution-collection/src/tests.rs | 18 ++++++------------ 6 files changed, 16 insertions(+), 24 deletions(-) diff --git a/pallets/laos-evolution/src/types.rs b/pallets/laos-evolution/src/types.rs index ed7caa75e..ce5cd3ec6 100644 --- a/pallets/laos-evolution/src/types.rs +++ b/pallets/laos-evolution/src/types.rs @@ -91,9 +91,9 @@ impl TryFrom for Slot { } } -impl Into for Slot { - fn into(self) -> u128 { - self.as_u128() +impl From for u128 { + fn from(slot: Slot) -> u128 { + slot.as_u128() } } diff --git a/precompile/evolution-collection-factory/src/lib.rs b/precompile/evolution-collection-factory/src/lib.rs index ad6e0e001..cf8503e72 100644 --- a/precompile/evolution-collection-factory/src/lib.rs +++ b/precompile/evolution-collection-factory/src/lib.rs @@ -111,8 +111,7 @@ where fn convert_dispatch_error_to_string(err: DispatchError) -> String { match err { - DispatchError::Module(mod_err) => - mod_err.message.unwrap_or_else(|| "Unknown module error").into(), + DispatchError::Module(mod_err) => mod_err.message.unwrap_or("Unknown module error").into(), _ => format!("{:?}", err), } } diff --git a/precompile/evolution-collection-factory/src/tests.rs b/precompile/evolution-collection-factory/src/tests.rs index 80a7a5a6b..a474ec7a9 100644 --- a/precompile/evolution-collection-factory/src/tests.rs +++ b/precompile/evolution-collection-factory/src/tests.rs @@ -67,7 +67,7 @@ fn create_collection_returns_address() { Precompile1, PrecompileCall::create_collection { owner: Address(Alice.into()) }, ) - .execute_returns(Address(expected_collection_address.into())); + .execute_returns(Address(expected_collection_address)); }) } @@ -87,7 +87,7 @@ fn create_collection_should_generate_log() { Precompile1, SELECTOR_LOG_NEW_COLLECTION, Alice, - solidity::encode_event_data(Address(expected_collection_address.into())), + solidity::encode_event_data(Address(expected_collection_address)), )) .execute_some(); }); @@ -118,7 +118,7 @@ fn create_collection_assign_collection_to_caller() { Precompile1, PrecompileCall::create_collection { owner: Address(Alice.into()) }, ) - .execute_returns(Address(expected_collection_address.into())); + .execute_returns(Address(expected_collection_address)); assert_eq!(LaosEvolution::::collection_owner(0), Some(Alice.into())); }); @@ -135,7 +135,7 @@ fn create_collection_inserts_bytecode_to_address() { Precompile1, PrecompileCall::create_collection { owner: Address(Alice.into()) }, ) - .execute_returns(Address(expected_collection_address.into())); + .execute_returns(Address(expected_collection_address)); // Address is not empty assert!(!Evm::::is_account_empty(&expected_collection_address)); diff --git a/precompile/evolution-collection-legacy/src/tests.rs b/precompile/evolution-collection-legacy/src/tests.rs index 3ad50d050..9028076c9 100644 --- a/precompile/evolution-collection-legacy/src/tests.rs +++ b/precompile/evolution-collection-legacy/src/tests.rs @@ -74,7 +74,7 @@ fn mint( token_uri: Vec, ) -> TokenId { let owner: H160 = owner.into(); - let slot: u128 = slot.0.try_into().unwrap(); + let slot: u128 = slot.0.into(); let input = EvmDataWriter::new_with_selector(Action::Mint) .write(Address(owner)) .write(U256::from(slot)) diff --git a/precompile/evolution-collection/src/lib.rs b/precompile/evolution-collection/src/lib.rs index ac21134a9..5e8aba39f 100644 --- a/precompile/evolution-collection/src/lib.rs +++ b/precompile/evolution-collection/src/lib.rs @@ -322,8 +322,7 @@ where fn convert_dispatch_error_to_string(err: DispatchError) -> String { match err { - DispatchError::Module(mod_err) => - mod_err.message.unwrap_or_else(|| "Unknown module error").into(), + DispatchError::Module(mod_err) => mod_err.message.unwrap_or("Unknown module error").into(), _ => format!("{:?}", err), } } diff --git a/precompile/evolution-collection/src/tests.rs b/precompile/evolution-collection/src/tests.rs index 1cd05dd59..9fe6ae3a2 100644 --- a/precompile/evolution-collection/src/tests.rs +++ b/precompile/evolution-collection/src/tests.rs @@ -53,8 +53,7 @@ fn mint( ); handle.input = - PrecompileCall::mint { to: Address(owner.into()), slot, token_uri: token_uri.clone() } - .into(); + PrecompileCall::mint { to: Address(owner), slot, token_uri: token_uri.clone() }.into(); let res = precompiles().execute(&mut handle).unwrap().unwrap(); @@ -149,11 +148,7 @@ fn mint_should_generate_log() { .prepare_test( Alice, collection_address, - PrecompileCall::mint { - to: Address(owner.into()), - slot, - token_uri: token_uri.clone(), - }, + PrecompileCall::mint { to: Address(owner), slot, token_uri: token_uri.clone() }, ) .expect_log(log2( collection_address, @@ -186,7 +181,7 @@ fn mint_asset_in_an_existing_collection_works() { .prepare_test( to, collection_address, - PrecompileCall::mint { to: Address(to.into()), slot, token_uri: token_uri.clone() }, + PrecompileCall::mint { to: Address(to), slot, token_uri: token_uri.clone() }, ) .execute_returns(expected_token_id); }); @@ -206,7 +201,7 @@ fn when_mint_reverts_should_return_error() { .prepare_test( to, collection_address, - PrecompileCall::mint { to: Address(to.into()), slot, token_uri }, + PrecompileCall::mint { to: Address(to), slot, token_uri }, ) .execute_reverts(|r| r == b"AlreadyMinted"); }); @@ -234,8 +229,7 @@ fn token_uri_returns_the_result_from_source() { let alice = H160::from_str(ALICE).unwrap(); let collection_address = create_collection(alice); let token_uri: UnboundedString = "ciao".into(); - let token_id = - mint(alice, collection_address, 0.try_into().unwrap(), token_uri.clone().into()); + let token_id = mint(alice, collection_address, 0.try_into().unwrap(), token_uri.clone()); precompiles() .prepare_test(alice, collection_address, PrecompileCall::token_uri { token_id }) @@ -453,7 +447,7 @@ fn expected_cost_mint_with_external_uri() { owner, collection_address, PrecompileCall::mint { - to: Address(owner.into()), + to: Address(owner), slot: 9.try_into().unwrap(), token_uri: "ciao".into(), },