git.delta.rocks / unique-network / refs/commits / 7168c554956e

difftreelog

style fix clippy warnings

Yaroslav Bolyukin2021-07-27parent: #0e47fc5.patch.diff
in: master

7 files changed

modifiedcrates/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]
modifiedcrates/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)]
modifiedcrates/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
+}
modifiedcrates/evm-coder/tests/a.rsdiffbeforeafterboth
--- a/crates/evm-coder/tests/a.rs
+++ b/crates/evm-coder/tests/a.rs
@@ -8,33 +8,38 @@
 #[solidity_interface(name = "OurInterface")]
 impl Impls {
 	fn fn_a(&self, input: uint256) -> Result<bool> {
-        todo!()
-    }
+		todo!()
+	}
 }
 
 #[solidity_interface(name = "OurInterface1")]
 impl Impls {
 	fn fn_b(&self, input: uint128) -> Result<uint32> {
-        todo!()
-    }
+		todo!()
+	}
 }
 
-#[solidity_interface(name = "OurInterface2", is(OurInterface), inline_is(OurInterface1), events(ERC721Log))]
+#[solidity_interface(
+	name = "OurInterface2",
+	is(OurInterface),
+	inline_is(OurInterface1),
+	events(ERC721Log)
+)]
 impl Impls {
 	#[solidity(rename_selector = "fnK")]
 	fn fn_c(&self, input: uint32) -> Result<uint8> {
-        todo!()
-    }
+		todo!()
+	}
 	fn fn_d(&self, value: uint32) -> Result<uint32> {
-        todo!()
-    }
+		todo!()
+	}
 
 	fn caller_sensitive(&self, caller: caller) -> Result<uint8> {
-        todo!()
-    }
+		todo!()
+	}
 	fn payable(&mut self, value: value) -> Result<uint8> {
-        todo!()
-    }
+		todo!()
+	}
 }
 
 #[derive(ToLog)]
@@ -58,14 +63,14 @@
 #[solidity_interface(name = "ERC20")]
 impl ERC20 {
 	fn decimals(&self) -> Result<uint8> {
-        todo!()
-    }
+		todo!()
+	}
 	fn balance_of(&self, owner: address) -> Result<uint256> {
-        todo!()
-    }
+		todo!()
+	}
 	fn transfer(&mut self, caller: caller, to: address, value: uint256) -> Result<bool> {
-        todo!()
-    }
+		todo!()
+	}
 	fn transfer_from(
 		&mut self,
 		caller: caller,
@@ -73,12 +78,13 @@
 		to: address,
 		value: uint256,
 	) -> Result<bool> {
-        todo!()
-    }
+		todo!()
+	}
 	fn approve(&mut self, caller: caller, spender: address, value: uint256) -> Result<bool> {
-        todo!()
-    }
+		todo!()
+	}
 	fn allowance(&self, owner: address, spender: address) -> Result<uint256> {
-        todo!()
-    }
+		todo!()
+	}
 }
+
modifiednode/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 {
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
before · pallets/evm-contract-helpers/src/eth.rs
1use core::marker::PhantomData;2use evm_coder::{abi::AbiWriter, execution::Result, solidity_interface, types::*};3use pallet_evm_coder_substrate::SubstrateRecorder;4use pallet_evm::{ExitReason, ExitRevert, OnCreate, OnMethodCall, PrecompileOutput};5use sp_core::H160;6use crate::{7	AllowlistEnabled, Config, Owner, Pallet, SelfSponsoring, SponsorBasket, SponsoringRateLimit,8};9use frame_support::traits::Get;10use up_sponsorship::SponsorshipHandler;11use sp_std::vec::Vec;1213struct ContractHelpers<T: Config>(SubstrateRecorder<T>);1415#[solidity_interface(name = "ContractHelpers")]16impl<T: Config> ContractHelpers<T> {17	fn contract_owner(&self, contract: address) -> Result<address> {18		self.0.consume_sload()?;19		Ok(<Owner<T>>::get(contract))20	}2122	fn sponsoring_enabled(&self, contract: address) -> Result<bool> {23		self.0.consume_sload()?;24		Ok(<SelfSponsoring<T>>::get(contract))25	}2627	fn toggle_sponsoring(28		&mut self,29		caller: caller,30		contract: address,31		enabled: bool,32	) -> Result<void> {33		self.0.consume_sload()?;34		<Pallet<T>>::ensure_owner(contract, caller)?;35		self.0.consume_sstore()?;36		<Pallet<T>>::toggle_sponsoring(contract, enabled);37		Ok(())38	}3940	fn allowed(&self, contract: address, user: address) -> Result<bool> {41		self.0.consume_sload()?;42		Ok(<Pallet<T>>::allowed(contract, user))43	}4445	fn allowlist_enabled(&self, contract: address) -> Result<bool> {46		self.0.consume_sload()?;47		Ok(<AllowlistEnabled<T>>::get(contract))48	}4950	fn toggle_allowlist(51		&mut self,52		caller: caller,53		contract: address,54		enabled: bool,55	) -> Result<void> {56		self.0.consume_sload()?;57		<Pallet<T>>::ensure_owner(contract, caller)?;58		self.0.consume_sstore()?;59		<Pallet<T>>::toggle_allowlist(contract, enabled);60		Ok(())61	}6263	fn toggle_allowed(64		&mut self,65		caller: caller,66		contract: address,67		user: address,68		allowed: bool,69	) -> Result<void> {70		self.0.consume_sload()?;71		<Pallet<T>>::ensure_owner(contract, caller)?;72		self.0.consume_sstore()?;73		<Pallet<T>>::toggle_allowed(contract, user, allowed);74		Ok(())75	}76}7778pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);79impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {80	fn is_reserved(contract: &sp_core::H160) -> bool {81		contract == &T::ContractAddress::get()82	}8384	fn is_used(contract: &sp_core::H160) -> bool {85		contract == &T::ContractAddress::get()86	}8788	fn call(89		source: &sp_core::H160,90		target: &sp_core::H160,91		gas_left: u64,92		input: &[u8],93		value: sp_core::U256,94	) -> Option<PrecompileOutput> {95		// TODO: Extract to another OnMethodCall handler96		if !<Pallet<T>>::allowed(*target, *source) {97			return Some(PrecompileOutput {98				exit_status: ExitReason::Revert(ExitRevert::Reverted),99				cost: 0,100				output: {101					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));102					writer.string("Target contract is allowlisted");103					writer.finish()104				},105				logs: sp_std::vec![],106			});107		}108109		if target != &T::ContractAddress::get() {110			return None;111		}112113		let mut helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));114		let result = pallet_evm_coder_substrate::call_internal(*source, &mut helpers, value, input);115		helpers.0.evm_to_precompile_output(result)116	}117118	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {119		(contract == &T::ContractAddress::get())120			.then(|| include_bytes!("./stubs/ContractHelpers.bin").to_vec())121	}122}123124pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);125impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {126	fn on_create(owner: H160, contract: H160) {127		<Owner<T>>::insert(contract, owner);128	}129}130131pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);132impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {133	fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {134		if <SelfSponsoring<T>>::get(&call.0) {135			let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;136			let limit = <SponsoringRateLimit<T>>::get(&call.0);137			if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {138				<SponsorBasket<T>>::insert(&call.0, who, block_number);139				let limit_time = last_tx_block + limit.into();140				if block_number > limit_time {141					return Some(call.0);142				}143			} else {144				<SponsorBasket<T>>::insert(&call.0, who, block_number);145				return Some(call.0);146			}147		}148		None149	}150}
modifiedruntime/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>,