difftreelog
style fix clippy warnings
in: master
7 files changed
crates/evm-coder-macros/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder-macros/src/lib.rs
+++ b/crates/evm-coder-macros/src/lib.rs
@@ -5,7 +5,10 @@
use proc_macro::TokenStream;
use quote::quote;
use sha3::{Digest, Keccak256};
-use syn::{AttributeArgs, DeriveInput, GenericArgument, Ident, ItemImpl, Pat, Path, PathArguments, PathSegment, Type, parse_macro_input, spanned::Spanned};
+use syn::{
+ AttributeArgs, DeriveInput, GenericArgument, Ident, ItemImpl, Pat, Path, PathArguments,
+ PathSegment, Type, parse_macro_input, spanned::Spanned,
+};
mod solidity_interface;
mod to_log;
@@ -196,11 +199,12 @@
Err(e) => e.to_compile_error(),
};
- (quote! {
- #input
+ (quote! {
+ #input
- #expanded
- }).into()
+ #expanded
+ })
+ .into()
}
#[proc_macro_attribute]
crates/evm-coder/src/lib.rsdiffbeforeafterboth--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -54,11 +54,11 @@
}
pub trait Call: Sized {
- fn parse(selector: u32, input: &mut AbiReader) -> execution::Result<Option<Self>>;
+ fn parse(selector: u32, input: &mut AbiReader) -> execution::Result<Option<Self>>;
}
pub trait Callable<C: Call> {
- fn call(&mut self, call: types::Msg<C>) -> execution::Result<AbiWriter>;
+ fn call(&mut self, call: types::Msg<C>) -> execution::Result<AbiWriter>;
}
#[cfg(test)]
crates/evm-coder/src/solidity.rsdiffbeforeafterboth--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -186,4 +186,4 @@
writeln!(out, "}}")?;
Ok(())
}
-}
\ No newline at end of file
+}
crates/evm-coder/tests/a.rsdiffbeforeafterboth1#![allow(dead_code)] // This test only checks that macros is not panicking23use evm_coder::{solidity_interface, types::*, ToLog, execution::Result};4use evm_coder_macros::solidity;56struct Impls;78#[solidity_interface(name = "OurInterface")]9impl Impls {10 fn fn_a(&self, input: uint256) -> Result<bool> {11 todo!()12 }13}1415#[solidity_interface(name = "OurInterface1")]16impl Impls {17 fn fn_b(&self, input: uint128) -> Result<uint32> {18 todo!()19 }20}2122#[solidity_interface(name = "OurInterface2", is(OurInterface), inline_is(OurInterface1), events(ERC721Log))]23impl Impls {24 #[solidity(rename_selector = "fnK")]25 fn fn_c(&self, input: uint32) -> Result<uint8> {26 todo!()27 }28 fn fn_d(&self, value: uint32) -> Result<uint32> {29 todo!()30 }3132 fn caller_sensitive(&self, caller: caller) -> Result<uint8> {33 todo!()34 }35 fn payable(&mut self, value: value) -> Result<uint8> {36 todo!()37 }38}3940#[derive(ToLog)]41enum ERC721Log {42 Transfer {43 #[indexed]44 from: address,45 #[indexed]46 to: address,47 value: uint256,48 },49 Eee {50 #[indexed]51 aaa: address,52 bbb: uint256,53 },54}5556struct ERC20;5758#[solidity_interface(name = "ERC20")]59impl ERC20 {60 fn decimals(&self) -> Result<uint8> {61 todo!()62 }63 fn balance_of(&self, owner: address) -> Result<uint256> {64 todo!()65 }66 fn transfer(&mut self, caller: caller, to: address, value: uint256) -> Result<bool> {67 todo!()68 }69 fn transfer_from(70 &mut self,71 caller: caller,72 from: address,73 to: address,74 value: uint256,75 ) -> Result<bool> {76 todo!()77 }78 fn approve(&mut self, caller: caller, spender: address, value: uint256) -> Result<bool> {79 todo!()80 }81 fn allowance(&self, owner: address, spender: address) -> Result<uint256> {82 todo!()83 }84}node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -304,7 +304,7 @@
nft_rpc::create_full::<_, _, _, RuntimeApi, _>(full_deps, subscription_executor.clone())
});
-
+
task_manager.spawn_essential_handle().spawn(
"frontier-mapping-sync-worker",
MappingSyncWorker::new(
@@ -313,7 +313,8 @@
client.clone(),
backend.clone(),
frontier_backend.clone(),
- ).for_each(|()| futures::future::ready(()))
+ )
+ .for_each(|()| futures::future::ready(())),
);
sc_service::spawn_tasks(sc_service::SpawnTasksParams {
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -136,7 +136,7 @@
let limit = <SponsoringRateLimit<T>>::get(&call.0);
if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {
<SponsorBasket<T>>::insert(&call.0, who, block_number);
- let limit_time = last_tx_block + limit.into();
+ let limit_time = last_tx_block + limit;
if block_number > limit_time {
return Some(call.0);
}
runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -281,7 +281,7 @@
impl pallet_ethereum::Config for Runtime {
type Event = Event;
type StateRoot = pallet_ethereum::IntermediateStateRoot;
- type EvmSubmitLog = pallet_evm::Pallet<Runtime>;
+ type EvmSubmitLog = pallet_evm::Pallet<Self>;
}
impl pallet_randomness_collective_flip::Config for Runtime {}
@@ -329,7 +329,7 @@
/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
type SS58Prefix = SS58Prefix;
/// Weight information for the extrinsics of this pallet.
- type SystemWeightInfo = system::weights::SubstrateWeight<Runtime>;
+ type SystemWeightInfo = system::weights::SubstrateWeight<Self>;
/// Version of the runtime.
type Version = Version;
}
@@ -363,7 +363,7 @@
type DustRemoval = Treasury;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
- type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
+ type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;
}
pub const MICROUNIQUE: Balance = 1_000_000_000;
@@ -487,7 +487,7 @@
type Burn = Burn;
type BurnDestination = ();
type SpendFunds = ();
- type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
+ type WeightInfo = pallet_treasury::weights::SubstrateWeight<Self>;
type MaxApprovals = MaxApprovals;
}
@@ -516,7 +516,7 @@
impl cumulus_pallet_parachain_system::Config for Runtime {
type Event = Event;
type OnValidationData = ();
- type SelfParaId = parachain_info::Pallet<Runtime>;
+ type SelfParaId = parachain_info::Pallet<Self>;
// type DownwardMessageHandlers = cumulus_primitives_utility::UnqueuedDmpAsParent<
// MaxDownwardMessageWeight,
// XcmExecutor<XcmConfig>,