git.delta.rocks / unique-network / refs/commits / fbd66f575db9

difftreelog

ci fix clippy warnings

Yaroslav Bolyukin2021-06-28parent: #93b1982.patch.diff
in: master

13 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5996,34 +5996,34 @@
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3#c94e0cdfe5556680dca1996004751eeb114755d7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
  "parity-scale-codec 2.1.3",
+ "serde",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
+ "substrate-test-utils",
+ "up-sponsorship",
 ]
 
 [[package]]
 name = "pallet-scheduler"
 version = "3.0.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3#c94e0cdfe5556680dca1996004751eeb114755d7"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
  "parity-scale-codec 2.1.3",
- "serde",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std",
- "substrate-test-utils",
- "up-sponsorship",
 ]
 
 [[package]]
modifiedcrates/evm-coder-macros/src/solidity_interface.rsdiffbeforeafterboth
before · crates/evm-coder-macros/src/solidity_interface.rs
1#![allow(dead_code)]23use quote::quote;4use darling::FromMeta;5use inflector::cases;6use std::fmt::Write;7use syn::{8	FnArg, Ident, ItemTrait, Meta, NestedMeta, PatType, Path, ReturnType, TraitItem,9	TraitItemMethod, Visibility, spanned::Spanned,10};1112use crate::{13	fn_selector_str, format_ty, parse_ident_from_pat, parse_ident_from_path, parse_ident_from_type,14	parse_result_ok, pascal_ident_to_call, pascal_ident_to_snake_call, snake_ident_to_pascal,15	snake_ident_to_screaming,16};1718struct Is {19	name: Ident,20	pascal_call_name: Ident,21	snake_call_name: Ident,22}23impl Is {24	fn try_from(path: &Path) -> syn::Result<Self> {25		let name = parse_ident_from_path(path)?.clone();26		Ok(Self {27			pascal_call_name: pascal_ident_to_call(&name),28			snake_call_name: pascal_ident_to_snake_call(&name),29			name,30		})31	}3233	fn expand_call_def(&self) -> proc_macro2::TokenStream {34		let name = &self.name;35		let pascal_call_name = &self.pascal_call_name;36		quote! {37			#name(#pascal_call_name)38		}39	}4041	fn expand_interface_id(&self) -> proc_macro2::TokenStream {42		let pascal_call_name = &self.pascal_call_name;43		quote! {44			interface_id ^= #pascal_call_name::interface_id();45		}46	}4748	fn expand_supports_interface(&self) -> proc_macro2::TokenStream {49		let pascal_call_name = &self.pascal_call_name;50		quote! {51			#pascal_call_name::supports_interface(interface_id)52		}53	}5455	fn expand_variant_call(&self) -> proc_macro2::TokenStream {56		let name = &self.name;57		let snake_call_name = &self.snake_call_name;58		quote! {59			InternalCall::#name(call) => return self.#snake_call_name(Msg {60				call,61				caller: c.caller,62				value: c.value,63			})64		}65	}6667	fn expand_call_inner(&self) -> proc_macro2::TokenStream {68		let snake_call_name = &self.snake_call_name;69		let pascal_call_name = &self.pascal_call_name;70		quote! {71			fn #snake_call_name(&mut self, c: Msg<#pascal_call_name>) -> ::core::result::Result<::evm_coder::abi::AbiWriter, Self::Error>;72		}73	}7475	fn expand_parse(&self) -> proc_macro2::TokenStream {76		let name = &self.name;77		let pascal_call_name = &self.pascal_call_name;78		quote! {79			if let Some(parsed_call) = #pascal_call_name::parse(method_id, reader)? {80				return Ok(Some(Self::#name(parsed_call)))81			}82		}83	}84}8586#[derive(Default)]87struct IsList(Vec<Is>);88impl FromMeta for IsList {89	fn from_list(items: &[NestedMeta]) -> darling::Result<Self> {90		let mut out = Vec::new();91		for item in items {92			match item {93				NestedMeta::Meta(Meta::Path(path)) => out.push(Is::try_from(path)?),94				_ => return Err(syn::Error::new(item.span(), "expected path").into()),95			}96		}97		Ok(Self(out))98	}99}100101#[derive(FromMeta)]102pub struct InterfaceInfo {103	#[darling(default)]104	is: IsList,105	#[darling(default)]106	inline_is: IsList,107	#[darling(default)]108	events: IsList,109}110111#[derive(FromMeta)]112struct MethodInfo {113	#[darling(default)]114	rename_selector: Option<String>,115}116117struct MethodArg {118	name: Ident,119	ty: Ident,120}121impl MethodArg {122	fn try_from(value: &PatType) -> syn::Result<Self> {123		Ok(Self {124			name: parse_ident_from_pat(&value.pat)?.clone(),125			ty: parse_ident_from_type(&value.ty)?.clone(),126		})127	}128	fn is_value(&self) -> bool {129		self.ty == "value"130	}131	fn is_caller(&self) -> bool {132		self.ty == "caller"133	}134	fn is_special(&self) -> bool {135		self.is_value() || self.is_caller()136	}137	fn selector_ty(&self) -> &Ident {138		assert!(!self.is_special());139		&self.ty140	}141142	fn expand_call_def(&self) -> proc_macro2::TokenStream {143		assert!(!self.is_special());144		let name = &self.name;145		let ty = &self.ty;146147		quote! {148			#name: #ty149		}150	}151152	fn expand_parse(&self) -> proc_macro2::TokenStream {153		assert!(!self.is_special());154		let name = &self.name;155		quote! {156			#name: reader.abi_read()?157		}158	}159160	fn expand_call_arg(&self) -> proc_macro2::TokenStream {161		if self.is_value() {162			quote! {163				c.value.clone()164			}165		} else if self.is_caller() {166			quote! {167				c.caller.clone()168			}169		} else {170			let name = &self.name;171			quote! {172				#name173			}174		}175	}176177	fn solidity_def(&self) -> String {178		assert!(!self.is_special());179		format!("{} {}", format_ty(&self.ty), self.name)180	}181}182183#[derive(PartialEq)]184enum Mutability {185	Mutable,186	View,187	Pure,188}189190struct Method {191	name: Ident,192	camel_name: String,193	pascal_name: Ident,194	screaming_name: Ident,195	selector_str: String,196	selector: u32,197	args: Vec<MethodArg>,198	has_normal_args: bool,199	mutability: Mutability,200	result: Ident,201}202impl Method {203	fn try_from(value: &TraitItemMethod) -> syn::Result<Self> {204		let mut info = MethodInfo {205			rename_selector: None,206		};207		for attr in &value.attrs {208			let ident = parse_ident_from_path(&attr.path)?;209			if ident == "solidity" {210				let args = attr.parse_meta().unwrap();211				info = MethodInfo::from_meta(&args).unwrap();212			} else if ident == "doc" {213				// TODO: Add docs to evm interfaces214			}215		}216		let ident = &value.sig.ident;217		let ident_str = ident.to_string();218		if !cases::snakecase::is_snake_case(&ident_str) {219			return Err(syn::Error::new(ident.span(), "method name should be snake_cased\nif alternative solidity name needs to be set - use #[solidity] attribute"));220		}221222		let mut mutability = Mutability::Pure;223224		if let Some(FnArg::Receiver(receiver)) = value225			.sig226			.inputs227			.iter()228			.find(|arg| matches!(arg, FnArg::Receiver(_)))229		{230			if receiver.reference.is_none() {231				return Err(syn::Error::new(232					receiver.span(),233					"receiver should be by ref",234				));235			}236			if receiver.mutability.is_some() {237				mutability = Mutability::Mutable;238			} else {239				mutability = Mutability::View;240			}241		}242		let mut args = Vec::new();243		for typ in value244			.sig245			.inputs246			.iter()247			.filter(|arg| matches!(arg, FnArg::Typed(_)))248		{249			let typ = match typ {250				FnArg::Typed(typ) => typ,251				_ => unreachable!(),252			};253			args.push(MethodArg::try_from(typ)?);254		}255256		if mutability != Mutability::Mutable && args.iter().any(|arg| arg.is_value()) {257			return Err(syn::Error::new(258				args.iter().find(|arg| arg.is_value()).unwrap().ty.span(),259				"payable function should be mutable",260			));261		}262263		let result = match &value.sig.output {264			ReturnType::Type(_, ty) => ty,265			_ => return Err(syn::Error::new(value.sig.output.span(), "interface method should return Result<value>\nif there is no value to return - specify void (which is alias to unit)")),266		};267		let result = parse_result_ok(&result)?;268269		let camel_name = info270			.rename_selector271			.unwrap_or_else(|| cases::camelcase::to_camel_case(&ident.to_string()));272		let mut selector_str = camel_name.clone();273		selector_str.push('(');274		let mut has_normal_args = false;275		for (i, arg) in args.iter().filter(|arg| !arg.is_special()).enumerate() {276			if i != 0 {277				selector_str.push(',');278			}279			write!(selector_str, "{}", arg.selector_ty()).unwrap();280			has_normal_args = true;281		}282		selector_str.push(')');283		let selector = fn_selector_str(&selector_str);284285		Ok(Self {286			name: ident.clone(),287			camel_name,288			pascal_name: snake_ident_to_pascal(&ident),289			screaming_name: snake_ident_to_screaming(&ident),290			selector_str,291			selector,292			args,293			has_normal_args,294			mutability,295			result: result.clone(),296		})297	}298	fn expand_call_def(&self) -> proc_macro2::TokenStream {299		let defs = self300			.args301			.iter()302			.filter(|a| !a.is_special())303			.map(|a| a.expand_call_def());304		let pascal_name = &self.pascal_name;305306		if self.has_normal_args {307			quote! {308				#pascal_name {309					#(310						#defs,311					)*312				}313			}314		} else {315			quote! {#pascal_name}316		}317	}318319	fn expand_const(&self) -> proc_macro2::TokenStream {320		let screaming_name = &self.screaming_name;321		let selector = self.selector;322		let selector_str = &self.selector_str;323		quote! {324			#[doc = #selector_str]325			const #screaming_name: u32 = #selector;326		}327	}328329	fn expand_interface_id(&self) -> proc_macro2::TokenStream {330		let screaming_name = &self.screaming_name;331		quote! {332			interface_id ^= Self::#screaming_name;333		}334	}335336	fn expand_parse(&self) -> proc_macro2::TokenStream {337		let pascal_name = &self.pascal_name;338		let screaming_name = &self.screaming_name;339		if self.has_normal_args {340			let parsers = self341				.args342				.iter()343				.filter(|a| !a.is_special())344				.map(|a| a.expand_parse());345			quote! {346				Self::#screaming_name => return Ok(Some(Self::#pascal_name {347					#(348						#parsers,349					)*350				}))351			}352		} else {353			quote! { Self::#screaming_name => return Ok(Some(Self::#pascal_name)) }354		}355	}356357	fn expand_variant_call(&self) -> proc_macro2::TokenStream {358		let pascal_name = &self.pascal_name;359		let name = &self.name;360361		let matcher = if self.has_normal_args {362			let names = self363				.args364				.iter()365				.filter(|a| !a.is_special())366				.map(|a| &a.name);367368			quote! {{369				#(370					#names,371				)*372			}}373		} else {374			quote! {}375		};376377		let receiver = match self.mutability {378			Mutability::Mutable | Mutability::View => quote! {self.},379			Mutability::Pure => quote! {Self::},380		};381		let args = self.args.iter().map(|a| a.expand_call_arg());382383		quote! {384			InternalCall::#pascal_name #matcher => {385				let result = #receiver #name(386					#(387						#args,388					)*389				)?;390				(&result).abi_write(&mut writer);391			}392		}393	}394395	fn solidity_def(&self) -> String {396		let mut out = format!("function {}(", self.camel_name);397		for (i, arg) in self.args.iter().filter(|a| !a.is_special()).enumerate() {398			if i != 0 {399				out.push_str(", ");400			}401			out.push_str(&arg.solidity_def());402		}403		out.push(')');404		match self.mutability {405			Mutability::Mutable => {}406			Mutability::View => write!(out, " view").unwrap(),407			Mutability::Pure => write!(out, " pure").unwrap(),408		}409		if self.result != "void" {410			write!(out, " returns ({})", format_ty(&self.result)).unwrap();411		}412		out.push(';');413		out414	}415}416417pub struct SolidityInterface {418	vis: Visibility,419	name: Ident,420	info: InterfaceInfo,421	methods: Vec<Method>,422	items: Vec<TraitItem>,423}424impl SolidityInterface {425	pub fn try_from(info: InterfaceInfo, value: &ItemTrait) -> syn::Result<Self> {426		let mut found_error = false;427		let mut methods = Vec::new();428429		for item in &value.items {430			match item {431				TraitItem::Type(ty) => {432					if ty.ident == "Error" {433						found_error = true;434					}435				}436				TraitItem::Method(method) => methods.push(Method::try_from(&method)?),437				_ => {}438			}439		}440		if !found_error {441			return Err(syn::Error::new(442				value.span(),443				"expected associated type called Error, which should implement From<&str>",444			));445		}446		Ok(Self {447			vis: value.vis.clone(),448			name: value.ident.clone(),449			info,450			methods,451			items: value.items.clone(),452		})453	}454	pub fn expand(self) -> proc_macro2::TokenStream {455		let vis = self.vis;456		let name = self.name;457		let items = self.items;458459		let call_name = pascal_ident_to_call(&name);460461		let call_sub = self462			.info463			.inline_is464			.0465			.iter()466			.chain(self.info.is.0.iter())467			.map(Is::expand_call_def);468		let call_inner = self469			.info470			.inline_is471			.0472			.iter()473			.chain(self.info.is.0.iter())474			.map(Is::expand_call_inner);475		let call_parse = self476			.info477			.inline_is478			.0479			.iter()480			.chain(self.info.is.0.iter())481			.map(Is::expand_parse);482		let call_variants = self483			.info484			.inline_is485			.0486			.iter()487			.chain(self.info.is.0.iter())488			.map(Is::expand_variant_call);489490		let inline_interface_id = self.info.inline_is.0.iter().map(Is::expand_interface_id);491		let supports_interface = self.info.is.0.iter().map(Is::expand_supports_interface);492493		let calls = self.methods.iter().map(Method::expand_call_def);494		let consts = self.methods.iter().map(Method::expand_const);495		let interface_id = self.methods.iter().map(Method::expand_interface_id);496		let parsers = self.methods.iter().map(Method::expand_parse);497		let call_variants_this = self.methods.iter().map(Method::expand_variant_call);498499		// let methods = self.methods.iter().map(Method::solidity_def);500501		quote! {502			#[derive(Debug)]503			#vis enum #call_name {504				#(505					#calls,506				)*507				#(508					#call_sub,509				)*510			}511			impl #call_name {512				#(513					#consts514				)*515				pub fn parse(method_id: u32, reader: &mut ::evm_coder::abi::AbiReader) -> ::evm_coder::abi::Result<Option<Self>> {516					use ::evm_coder::abi::AbiRead;517					match method_id {518						#(519							#parsers,520						)*521						_ => {},522					}523					#(524						#call_parse525					)else*526					return Ok(None);527				}528				pub const fn interface_id() -> u32 {529					let mut interface_id = 0;530					#(#interface_id)*531					#(#inline_interface_id)*532					interface_id533				}534				pub fn supports_interface(interface_id: u32) -> bool {535					interface_id != 0xffffff && (536						interface_id == Self::interface_id()537						#(538							|| #supports_interface539						)*540					)541				}542			}543			#vis trait #name {544				#(545					#items546				)*547				#(548					#call_inner549				)*550				#[allow(unreachable_code)] // In case of no inner calls551				fn call(&mut self, c: Msg<#call_name>) -> ::core::result::Result<::evm_coder::abi::AbiWriter, Self::Error> {552					use ::evm_coder::abi::AbiWrite;553					type InternalCall = #call_name;554					match c.call {555						#(556							#call_variants,557						)*558						_ => {},559					}560					let mut writer = ::evm_coder::abi::AbiWriter::default();561					match c.call {562						#(563							#call_variants_this,564						)*565						_ => unreachable!()566					}567					Ok(writer)568				}569			}570		}571	}572}
after · crates/evm-coder-macros/src/solidity_interface.rs
1#![allow(dead_code)]23use quote::quote;4use darling::FromMeta;5use inflector::cases;6use std::fmt::Write;7use syn::{8	FnArg, Ident, ItemTrait, Meta, NestedMeta, PatType, Path, ReturnType, TraitItem,9	TraitItemMethod, Visibility, spanned::Spanned,10};1112use crate::{13	fn_selector_str, format_ty, parse_ident_from_pat, parse_ident_from_path, parse_ident_from_type,14	parse_result_ok, pascal_ident_to_call, pascal_ident_to_snake_call, snake_ident_to_pascal,15	snake_ident_to_screaming,16};1718struct Is {19	name: Ident,20	pascal_call_name: Ident,21	snake_call_name: Ident,22}23impl Is {24	fn try_from(path: &Path) -> syn::Result<Self> {25		let name = parse_ident_from_path(path)?.clone();26		Ok(Self {27			pascal_call_name: pascal_ident_to_call(&name),28			snake_call_name: pascal_ident_to_snake_call(&name),29			name,30		})31	}3233	fn expand_call_def(&self) -> proc_macro2::TokenStream {34		let name = &self.name;35		let pascal_call_name = &self.pascal_call_name;36		quote! {37			#name(#pascal_call_name)38		}39	}4041	fn expand_interface_id(&self) -> proc_macro2::TokenStream {42		let pascal_call_name = &self.pascal_call_name;43		quote! {44			interface_id ^= #pascal_call_name::interface_id();45		}46	}4748	fn expand_supports_interface(&self) -> proc_macro2::TokenStream {49		let pascal_call_name = &self.pascal_call_name;50		quote! {51			#pascal_call_name::supports_interface(interface_id)52		}53	}5455	fn expand_variant_call(&self) -> proc_macro2::TokenStream {56		let name = &self.name;57		let snake_call_name = &self.snake_call_name;58		quote! {59			InternalCall::#name(call) => return self.#snake_call_name(Msg {60				call,61				caller: c.caller,62				value: c.value,63			})64		}65	}6667	fn expand_call_inner(&self) -> proc_macro2::TokenStream {68		let snake_call_name = &self.snake_call_name;69		let pascal_call_name = &self.pascal_call_name;70		quote! {71			fn #snake_call_name(&mut self, c: Msg<#pascal_call_name>) -> ::core::result::Result<::evm_coder::abi::AbiWriter, Self::Error>;72		}73	}7475	fn expand_parse(&self) -> proc_macro2::TokenStream {76		let name = &self.name;77		let pascal_call_name = &self.pascal_call_name;78		quote! {79			if let Some(parsed_call) = #pascal_call_name::parse(method_id, reader)? {80				return Ok(Some(Self::#name(parsed_call)))81			}82		}83	}84}8586#[derive(Default)]87struct IsList(Vec<Is>);88impl FromMeta for IsList {89	fn from_list(items: &[NestedMeta]) -> darling::Result<Self> {90		let mut out = Vec::new();91		for item in items {92			match item {93				NestedMeta::Meta(Meta::Path(path)) => out.push(Is::try_from(path)?),94				_ => return Err(syn::Error::new(item.span(), "expected path").into()),95			}96		}97		Ok(Self(out))98	}99}100101#[derive(FromMeta)]102pub struct InterfaceInfo {103	#[darling(default)]104	is: IsList,105	#[darling(default)]106	inline_is: IsList,107	#[darling(default)]108	events: IsList,109}110111#[derive(FromMeta)]112struct MethodInfo {113	#[darling(default)]114	rename_selector: Option<String>,115}116117struct MethodArg {118	name: Ident,119	ty: Ident,120}121impl MethodArg {122	fn try_from(value: &PatType) -> syn::Result<Self> {123		Ok(Self {124			name: parse_ident_from_pat(&value.pat)?.clone(),125			ty: parse_ident_from_type(&value.ty)?.clone(),126		})127	}128	fn is_value(&self) -> bool {129		self.ty == "value"130	}131	fn is_caller(&self) -> bool {132		self.ty == "caller"133	}134	fn is_special(&self) -> bool {135		self.is_value() || self.is_caller()136	}137	fn selector_ty(&self) -> &Ident {138		assert!(!self.is_special());139		&self.ty140	}141142	fn expand_call_def(&self) -> proc_macro2::TokenStream {143		assert!(!self.is_special());144		let name = &self.name;145		let ty = &self.ty;146147		quote! {148			#name: #ty149		}150	}151152	fn expand_parse(&self) -> proc_macro2::TokenStream {153		assert!(!self.is_special());154		let name = &self.name;155		quote! {156			#name: reader.abi_read()?157		}158	}159160	fn expand_call_arg(&self) -> proc_macro2::TokenStream {161		if self.is_value() {162			quote! {163				c.value.clone()164			}165		} else if self.is_caller() {166			quote! {167				c.caller.clone()168			}169		} else {170			let name = &self.name;171			quote! {172				#name173			}174		}175	}176177	fn solidity_def(&self) -> String {178		assert!(!self.is_special());179		format!("{} {}", format_ty(&self.ty), self.name)180	}181}182183#[derive(PartialEq)]184enum Mutability {185	Mutable,186	View,187	Pure,188}189190struct Method {191	name: Ident,192	camel_name: String,193	pascal_name: Ident,194	screaming_name: Ident,195	selector_str: String,196	selector: u32,197	args: Vec<MethodArg>,198	has_normal_args: bool,199	mutability: Mutability,200	result: Ident,201}202impl Method {203	fn try_from(value: &TraitItemMethod) -> syn::Result<Self> {204		let mut info = MethodInfo {205			rename_selector: None,206		};207		for attr in &value.attrs {208			let ident = parse_ident_from_path(&attr.path)?;209			if ident == "solidity" {210				let args = attr.parse_meta().unwrap();211				info = MethodInfo::from_meta(&args).unwrap();212			} else if ident == "doc" {213				// TODO: Add docs to evm interfaces214			}215		}216		let ident = &value.sig.ident;217		let ident_str = ident.to_string();218		if !cases::snakecase::is_snake_case(&ident_str) {219			return Err(syn::Error::new(ident.span(), "method name should be snake_cased\nif alternative solidity name needs to be set - use #[solidity] attribute"));220		}221222		let mut mutability = Mutability::Pure;223224		if let Some(FnArg::Receiver(receiver)) = value225			.sig226			.inputs227			.iter()228			.find(|arg| matches!(arg, FnArg::Receiver(_)))229		{230			if receiver.reference.is_none() {231				return Err(syn::Error::new(232					receiver.span(),233					"receiver should be by ref",234				));235			}236			if receiver.mutability.is_some() {237				mutability = Mutability::Mutable;238			} else {239				mutability = Mutability::View;240			}241		}242		let mut args = Vec::new();243		for typ in value244			.sig245			.inputs246			.iter()247			.filter(|arg| matches!(arg, FnArg::Typed(_)))248		{249			let typ = match typ {250				FnArg::Typed(typ) => typ,251				_ => unreachable!(),252			};253			args.push(MethodArg::try_from(typ)?);254		}255256		if mutability != Mutability::Mutable && args.iter().any(|arg| arg.is_value()) {257			return Err(syn::Error::new(258				args.iter().find(|arg| arg.is_value()).unwrap().ty.span(),259				"payable function should be mutable",260			));261		}262263		let result = match &value.sig.output {264			ReturnType::Type(_, ty) => ty,265			_ => return Err(syn::Error::new(value.sig.output.span(), "interface method should return Result<value>\nif there is no value to return - specify void (which is alias to unit)")),266		};267		let result = parse_result_ok(result)?;268269		let camel_name = info270			.rename_selector271			.unwrap_or_else(|| cases::camelcase::to_camel_case(&ident.to_string()));272		let mut selector_str = camel_name.clone();273		selector_str.push('(');274		let mut has_normal_args = false;275		for (i, arg) in args.iter().filter(|arg| !arg.is_special()).enumerate() {276			if i != 0 {277				selector_str.push(',');278			}279			write!(selector_str, "{}", arg.selector_ty()).unwrap();280			has_normal_args = true;281		}282		selector_str.push(')');283		let selector = fn_selector_str(&selector_str);284285		Ok(Self {286			name: ident.clone(),287			camel_name,288			pascal_name: snake_ident_to_pascal(ident),289			screaming_name: snake_ident_to_screaming(ident),290			selector_str,291			selector,292			args,293			has_normal_args,294			mutability,295			result: result.clone(),296		})297	}298	fn expand_call_def(&self) -> proc_macro2::TokenStream {299		let defs = self300			.args301			.iter()302			.filter(|a| !a.is_special())303			.map(|a| a.expand_call_def());304		let pascal_name = &self.pascal_name;305306		if self.has_normal_args {307			quote! {308				#pascal_name {309					#(310						#defs,311					)*312				}313			}314		} else {315			quote! {#pascal_name}316		}317	}318319	fn expand_const(&self) -> proc_macro2::TokenStream {320		let screaming_name = &self.screaming_name;321		let selector = self.selector;322		let selector_str = &self.selector_str;323		quote! {324			#[doc = #selector_str]325			const #screaming_name: u32 = #selector;326		}327	}328329	fn expand_interface_id(&self) -> proc_macro2::TokenStream {330		let screaming_name = &self.screaming_name;331		quote! {332			interface_id ^= Self::#screaming_name;333		}334	}335336	fn expand_parse(&self) -> proc_macro2::TokenStream {337		let pascal_name = &self.pascal_name;338		let screaming_name = &self.screaming_name;339		if self.has_normal_args {340			let parsers = self341				.args342				.iter()343				.filter(|a| !a.is_special())344				.map(|a| a.expand_parse());345			quote! {346				Self::#screaming_name => return Ok(Some(Self::#pascal_name {347					#(348						#parsers,349					)*350				}))351			}352		} else {353			quote! { Self::#screaming_name => return Ok(Some(Self::#pascal_name)) }354		}355	}356357	fn expand_variant_call(&self) -> proc_macro2::TokenStream {358		let pascal_name = &self.pascal_name;359		let name = &self.name;360361		let matcher = if self.has_normal_args {362			let names = self363				.args364				.iter()365				.filter(|a| !a.is_special())366				.map(|a| &a.name);367368			quote! {{369				#(370					#names,371				)*372			}}373		} else {374			quote! {}375		};376377		let receiver = match self.mutability {378			Mutability::Mutable | Mutability::View => quote! {self.},379			Mutability::Pure => quote! {Self::},380		};381		let args = self.args.iter().map(|a| a.expand_call_arg());382383		quote! {384			InternalCall::#pascal_name #matcher => {385				let result = #receiver #name(386					#(387						#args,388					)*389				)?;390				(&result).abi_write(&mut writer);391			}392		}393	}394395	fn solidity_def(&self) -> String {396		let mut out = format!("function {}(", self.camel_name);397		for (i, arg) in self.args.iter().filter(|a| !a.is_special()).enumerate() {398			if i != 0 {399				out.push_str(", ");400			}401			out.push_str(&arg.solidity_def());402		}403		out.push(')');404		match self.mutability {405			Mutability::Mutable => {}406			Mutability::View => write!(out, " view").unwrap(),407			Mutability::Pure => write!(out, " pure").unwrap(),408		}409		if self.result != "void" {410			write!(out, " returns ({})", format_ty(&self.result)).unwrap();411		}412		out.push(';');413		out414	}415}416417pub struct SolidityInterface {418	vis: Visibility,419	name: Ident,420	info: InterfaceInfo,421	methods: Vec<Method>,422	items: Vec<TraitItem>,423}424impl SolidityInterface {425	pub fn try_from(info: InterfaceInfo, value: &ItemTrait) -> syn::Result<Self> {426		let mut found_error = false;427		let mut methods = Vec::new();428429		for item in &value.items {430			match item {431				TraitItem::Type(ty) => {432					if ty.ident == "Error" {433						found_error = true;434					}435				}436				TraitItem::Method(method) => methods.push(Method::try_from(method)?),437				_ => {}438			}439		}440		if !found_error {441			return Err(syn::Error::new(442				value.span(),443				"expected associated type called Error, which should implement From<&str>",444			));445		}446		Ok(Self {447			vis: value.vis.clone(),448			name: value.ident.clone(),449			info,450			methods,451			items: value.items.clone(),452		})453	}454	pub fn expand(self) -> proc_macro2::TokenStream {455		let vis = self.vis;456		let name = self.name;457		let items = self.items;458459		let call_name = pascal_ident_to_call(&name);460461		let call_sub = self462			.info463			.inline_is464			.0465			.iter()466			.chain(self.info.is.0.iter())467			.map(Is::expand_call_def);468		let call_inner = self469			.info470			.inline_is471			.0472			.iter()473			.chain(self.info.is.0.iter())474			.map(Is::expand_call_inner);475		let call_parse = self476			.info477			.inline_is478			.0479			.iter()480			.chain(self.info.is.0.iter())481			.map(Is::expand_parse);482		let call_variants = self483			.info484			.inline_is485			.0486			.iter()487			.chain(self.info.is.0.iter())488			.map(Is::expand_variant_call);489490		let inline_interface_id = self.info.inline_is.0.iter().map(Is::expand_interface_id);491		let supports_interface = self.info.is.0.iter().map(Is::expand_supports_interface);492493		let calls = self.methods.iter().map(Method::expand_call_def);494		let consts = self.methods.iter().map(Method::expand_const);495		let interface_id = self.methods.iter().map(Method::expand_interface_id);496		let parsers = self.methods.iter().map(Method::expand_parse);497		let call_variants_this = self.methods.iter().map(Method::expand_variant_call);498499		// let methods = self.methods.iter().map(Method::solidity_def);500501		quote! {502			#[derive(Debug)]503			#vis enum #call_name {504				#(505					#calls,506				)*507				#(508					#call_sub,509				)*510			}511			impl #call_name {512				#(513					#consts514				)*515				pub fn parse(method_id: u32, reader: &mut ::evm_coder::abi::AbiReader) -> ::evm_coder::abi::Result<Option<Self>> {516					use ::evm_coder::abi::AbiRead;517					match method_id {518						#(519							#parsers,520						)*521						_ => {},522					}523					#(524						#call_parse525					)else*526					return Ok(None);527				}528				pub const fn interface_id() -> u32 {529					let mut interface_id = 0;530					#(#interface_id)*531					#(#inline_interface_id)*532					interface_id533				}534				pub fn supports_interface(interface_id: u32) -> bool {535					interface_id != 0xffffff && (536						interface_id == Self::interface_id()537						#(538							|| #supports_interface539						)*540					)541				}542			}543			#vis trait #name {544				#(545					#items546				)*547				#(548					#call_inner549				)*550				#[allow(unreachable_code)] // In case of no inner calls551				fn call(&mut self, c: Msg<#call_name>) -> ::core::result::Result<::evm_coder::abi::AbiWriter, Self::Error> {552					use ::evm_coder::abi::AbiWrite;553					type InternalCall = #call_name;554					match c.call {555						#(556							#call_variants,557						)*558						_ => {},559					}560					let mut writer = ::evm_coder::abi::AbiWriter::default();561					match c.call {562						#(563							#call_variants_this,564						)*565						_ => unreachable!()566					}567					Ok(writer)568				}569			}570		}571	}572}
modifiedcrates/evm-coder-macros/src/to_log.rsdiffbeforeafterboth
--- a/crates/evm-coder-macros/src/to_log.rs
+++ b/crates/evm-coder-macros/src/to_log.rs
@@ -41,7 +41,7 @@
 impl Event {
 	fn try_from(variant: &Variant) -> syn::Result<Self> {
 		let name = &variant.ident;
-		let name_screaming = snake_ident_to_screaming(&name);
+		let name_screaming = snake_ident_to_screaming(name);
 
 		let named = match &variant.fields {
 			Fields::Named(named) => named,
@@ -54,7 +54,7 @@
 		};
 		let mut fields = Vec::new();
 		for field in &named.named {
-			fields.push(EventField::try_from(&field)?);
+			fields.push(EventField::try_from(field)?);
 		}
 		let mut selector_str = format!("{}(", name);
 		for (i, arg) in fields.iter().enumerate() {
modifiedcrates/evm-coder/src/abi.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi.rs
+++ b/crates/evm-coder/src/abi.rs
@@ -104,7 +104,7 @@
 	fn subresult(&mut self) -> Result<AbiReader<'i>> {
 		let offset = self.read_usize()?;
 		Ok(AbiReader {
-			buf: &self.buf,
+			buf: self.buf,
 			offset: offset + self.offset,
 		})
 	}
@@ -252,7 +252,7 @@
 impl_abi_writeable!(&str, string);
 impl AbiWrite for &string {
 	fn abi_write(&self, writer: &mut AbiWriter) {
-		writer.string(&self)
+		writer.string(self)
 	}
 }
 
modifiednode/cli/src/cli.rsdiffbeforeafterboth
--- a/node/cli/src/cli.rs
+++ b/node/cli/src/cli.rs
@@ -1,6 +1,4 @@
 use crate::chain_spec;
-use cumulus_client_cli;
-use sc_cli;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
modifiednode/cli/src/command.rsdiffbeforeafterboth
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -120,8 +120,7 @@
 	}
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
-		polkadot_cli::Cli::from_iter([RelayChainCli::executable_name().to_string()].iter())
-			.load_spec(id)
+		polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)
 	}
 
 	fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
@@ -129,6 +128,7 @@
 	}
 }
 
+#[allow(clippy::borrowed_box)]
 fn extract_genesis_wasm(chain_spec: &Box<dyn sc_service::ChainSpec>) -> Result<Vec<u8>> {
 	let mut storage = chain_spec.build_storage()?;
 
@@ -189,7 +189,7 @@
 			runner.sync_run(|config| {
 				let polkadot_cli = RelayChainCli::new(
 					&config,
-					[RelayChainCli::executable_name().to_string()]
+					[RelayChainCli::executable_name()]
 						.iter()
 						.chain(cli.relaychain_args.iter()),
 				);
@@ -275,7 +275,7 @@
 
 				let polkadot_cli = RelayChainCli::new(
 					&config,
-					[RelayChainCli::executable_name().to_string()]
+					[RelayChainCli::executable_name()]
 						.iter()
 						.chain(cli.relaychain_args.iter()),
 				);
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -141,7 +141,7 @@
 
 	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(
-			&config,
+			config,
 			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
 		)?;
 	let client = Arc::new(client);
modifiedpallets/contract-helpers/src/lib.rsdiffbeforeafterboth
--- a/pallets/contract-helpers/src/lib.rs
+++ b/pallets/contract-helpers/src/lib.rs
@@ -213,7 +213,7 @@
 					Ok(Some((who.clone(), *code_hash, salt.clone())))
 				}
 				Some(pallet_contracts::Call::instantiate_with_code(_, _, code, _, salt)) => {
-					let code_hash = &T::Hashing::hash(&code);
+					let code_hash = &T::Hashing::hash(code);
 					Ok(Some((who.clone(), *code_hash, salt.clone())))
 				}
 				_ => Ok(None),
modifiedpallets/nft/src/eth/erc_impl.rsdiffbeforeafterboth
--- a/pallets/nft/src/eth/erc_impl.rs
+++ b/pallets/nft/src/eth/erc_impl.rs
@@ -114,7 +114,7 @@
 		let to = T::CrossAccountId::from_eth(to);
 		let token_id = token_id.try_into().map_err(|_| "token_id overflow")?;
 
-		<Module<T>>::transfer_from_internal(&caller, &from, &to, &self, token_id, 1)
+		<Module<T>>::transfer_from_internal(&caller, &from, &to, self, token_id, 1)
 			.map_err(|_| "transferFrom error")?;
 		Ok(())
 	}
@@ -130,7 +130,7 @@
 		let approved = T::CrossAccountId::from_eth(approved);
 		let token_id = token_id.try_into().map_err(|_| "token_id overflow")?;
 
-		<Module<T>>::approve_internal(&caller, &approved, &self, token_id, 1)
+		<Module<T>>::approve_internal(&caller, &approved, self, token_id, 1)
 			.map_err(|_| "approve internal")?;
 		Ok(())
 	}
@@ -176,7 +176,7 @@
 		let to = T::CrossAccountId::from_eth(to);
 		let token_id = token_id.try_into().map_err(|_| "amount overflow")?;
 
-		<Module<T>>::transfer_internal(&caller, &to, &self, token_id, 1)
+		<Module<T>>::transfer_internal(&caller, &to, self, token_id, 1)
 			.map_err(|_| "transfer error")?;
 		Ok(())
 	}
@@ -226,7 +226,7 @@
 		let to = T::CrossAccountId::from_eth(to);
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
 
-		<Module<T>>::transfer_internal(&caller, &to, &self, 1, amount)
+		<Module<T>>::transfer_internal(&caller, &to, self, 1, amount)
 			.map_err(|_| "transfer error")?;
 		Ok(true)
 	}
@@ -242,7 +242,7 @@
 		let to = T::CrossAccountId::from_eth(to);
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
 
-		<Module<T>>::transfer_from_internal(&caller, &from, &to, &self, 1, amount)
+		<Module<T>>::transfer_from_internal(&caller, &from, &to, self, 1, amount)
 			.map_err(|_| "transferFrom error")?;
 		Ok(true)
 	}
@@ -251,7 +251,7 @@
 		let spender = T::CrossAccountId::from_eth(spender);
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
 
-		<Module<T>>::approve_internal(&caller, &spender, &self, 1, amount)
+		<Module<T>>::approve_internal(&caller, &spender, self, 1, amount)
 			.map_err(|_| "approve internal")?;
 		Ok(true)
 	}
modifiedpallets/nft/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/nft/src/eth/mod.rs
+++ b/pallets/nft/src/eth/mod.rs
@@ -108,7 +108,7 @@
 			.unwrap_or(false)
 	}
 	fn get_code(target: &H160) -> Option<Vec<u8>> {
-		map_eth_to_id(&target)
+		map_eth_to_id(target)
 			.and_then(<CollectionById<T>>::get)
 			.map(|collection| {
 				match collection.mode {
@@ -127,7 +127,7 @@
 		input: &[u8],
 		value: U256,
 	) -> Option<PrecompileOutput> {
-		let mut collection = map_eth_to_id(&target)
+		let mut collection = map_eth_to_id(target)
 			.and_then(|id| <CollectionHandle<T>>::get_with_gas_limit(id, gas_limit))?;
 		let (method_id, input) = AbiReader::new_call(input).unwrap();
 		let result = call_internal(&mut collection, *source, method_id, input, value);
modifiedpallets/nft/src/eth/sponsoring.rsdiffbeforeafterboth
--- a/pallets/nft/src/eth/sponsoring.rs
+++ b/pallets/nft/src/eth/sponsoring.rs
@@ -132,10 +132,10 @@
 	) -> Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
 		let mut who_pays_fee = *who;
 		if let WithdrawReason::Call { target, input } = &reason {
-			if let Some(collection_id) = crate::eth::map_eth_to_id(&target) {
+			if let Some(collection_id) = crate::eth::map_eth_to_id(target) {
 				if let Some(collection) = <CollectionById<T>>::get(collection_id) {
 					if let Some(sponsor) = collection.sponsorship.sponsor() {
-						if try_sponsor(who, collection_id, &collection, &input).is_ok() {
+						if try_sponsor(who, collection_id, &collection, input).is_ok() {
 							who_pays_fee =
 								T::EvmBackwardsAddressMapping::from_account_id(sponsor.clone());
 						}
modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -1232,7 +1232,7 @@
 		) -> DispatchResult {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
 			let mut target_collection = Self::get_collection(collection_id)?;
-			Self::check_owner_permissions(&target_collection, &sender.as_sub())?;
+			Self::check_owner_permissions(&target_collection, sender.as_sub())?;
 			let old_limits = &target_collection.limits;
 			let chain_limits = ChainLimit::get();
 
@@ -1267,9 +1267,9 @@
 		owner: &T::CrossAccountId,
 		data: CreateItemData,
 	) -> DispatchResult {
-		Self::can_create_items_in_collection(&collection, &sender, &owner, 1)?;
-		Self::validate_create_item_args(&collection, &data)?;
-		Self::create_item_no_validation(&collection, owner, data)?;
+		Self::can_create_items_in_collection(collection, sender, owner, 1)?;
+		Self::validate_create_item_args(collection, &data)?;
+		Self::create_item_no_validation(collection, owner, data)?;
 
 		Ok(())
 	}
@@ -1283,18 +1283,18 @@
 	) -> DispatchResult {
 		target_collection.consume_gas(2000000)?;
 		// Limits check
-		Self::is_correct_transfer(target_collection, &recipient)?;
+		Self::is_correct_transfer(target_collection, recipient)?;
 
 		// Transfer permissions check
 		ensure!(
-			Self::is_item_owner(&sender, target_collection, item_id)
-				|| Self::is_owner_or_admin_permissions(target_collection, &sender),
+			Self::is_item_owner(sender, target_collection, item_id)
+				|| Self::is_owner_or_admin_permissions(target_collection, sender),
 			Error::<T>::NoPermission
 		);
 
 		if target_collection.access == AccessMode::WhiteList {
-			Self::check_white_list(target_collection, &sender)?;
-			Self::check_white_list(target_collection, &recipient)?;
+			Self::check_white_list(target_collection, sender)?;
+			Self::check_white_list(target_collection, recipient)?;
 		}
 
 		match target_collection.mode {
@@ -1305,7 +1305,7 @@
 				recipient.clone(),
 			)?,
 			CollectionMode::Fungible(_) => {
-				Self::transfer_fungible(target_collection, value, &sender, &recipient)?
+				Self::transfer_fungible(target_collection, value, sender, recipient)?
 			}
 			CollectionMode::ReFungible => Self::transfer_refungible(
 				target_collection,
@@ -1336,23 +1336,23 @@
 		amount: u128,
 	) -> DispatchResult {
 		collection.consume_gas(2000000)?;
-		Self::token_exists(&collection, item_id)?;
+		Self::token_exists(collection, item_id)?;
 
 		// Transfer permissions check
 		let bypasses_limits = collection.limits.owner_can_transfer
-			&& Self::is_owner_or_admin_permissions(&collection, &sender);
+			&& Self::is_owner_or_admin_permissions(collection, sender);
 
 		let allowance_limit = if bypasses_limits {
 			None
-		} else if let Some(amount) = Self::owned_amount(&sender, &collection, item_id) {
+		} else if let Some(amount) = Self::owned_amount(sender, collection, item_id) {
 			Some(amount)
 		} else {
 			fail!(Error::<T>::NoPermission);
 		};
 
 		if collection.access == AccessMode::WhiteList {
-			Self::check_white_list(&collection, &sender)?;
-			Self::check_white_list(&collection, &spender)?;
+			Self::check_white_list(collection, sender)?;
+			Self::check_white_list(collection, spender)?;
 		}
 
 		let allowance: u128 = amount
@@ -1412,19 +1412,19 @@
 			<Allowances<T>>::get(collection.id, (item_id, from.as_sub(), sender.as_sub()));
 
 		// Limits check
-		Self::is_correct_transfer(&collection, &recipient)?;
+		Self::is_correct_transfer(collection, recipient)?;
 
 		// Transfer permissions check
 		ensure!(
 			approval >= amount
 				|| (collection.limits.owner_can_transfer
-					&& Self::is_owner_or_admin_permissions(&collection, &sender)),
+					&& Self::is_owner_or_admin_permissions(collection, sender)),
 			Error::<T>::NoPermission
 		);
 
 		if collection.access == AccessMode::WhiteList {
-			Self::check_white_list(&collection, &sender)?;
-			Self::check_white_list(&collection, &recipient)?;
+			Self::check_white_list(collection, sender)?;
+			Self::check_white_list(collection, recipient)?;
 		}
 
 		// Reduce approval by transferred amount or remove if remaining approval drops to 0
@@ -1441,13 +1441,13 @@
 
 		match collection.mode {
 			CollectionMode::NFT => {
-				Self::transfer_nft(&collection, item_id, from.clone(), recipient.clone())?
+				Self::transfer_nft(collection, item_id, from.clone(), recipient.clone())?
 			}
 			CollectionMode::Fungible(_) => {
-				Self::transfer_fungible(&collection, amount, &from, &recipient)?
+				Self::transfer_fungible(collection, amount, from, recipient)?
 			}
 			CollectionMode::ReFungible => Self::transfer_refungible(
-				&collection,
+				collection,
 				item_id,
 				amount,
 				from.clone(),
@@ -1473,7 +1473,7 @@
 		item_id: TokenId,
 		data: Vec<u8>,
 	) -> DispatchResult {
-		Self::token_exists(&collection, item_id)?;
+		Self::token_exists(collection, item_id)?;
 
 		ensure!(
 			ChainLimit::get().custom_data_limit >= data.len() as u32,
@@ -1482,15 +1482,15 @@
 
 		// Modify permissions check
 		ensure!(
-			Self::is_item_owner(&sender, &collection, item_id)
-				|| Self::is_owner_or_admin_permissions(&collection, &sender),
+			Self::is_item_owner(sender, collection, item_id)
+				|| Self::is_owner_or_admin_permissions(collection, sender),
 			Error::<T>::NoPermission
 		);
 
 		match collection.mode {
-			CollectionMode::NFT => Self::set_nft_variable_data(&collection, item_id, data)?,
+			CollectionMode::NFT => Self::set_nft_variable_data(collection, item_id, data)?,
 			CollectionMode::ReFungible => {
-				Self::set_re_fungible_variable_data(&collection, item_id, data)?
+				Self::set_re_fungible_variable_data(collection, item_id, data)?
 			}
 			CollectionMode::Fungible(_) => fail!(Error::<T>::CantStoreMetadataInFungibleTokens),
 			_ => fail!(Error::<T>::UnexpectedCollectionType),
@@ -1505,18 +1505,13 @@
 		owner: &T::CrossAccountId,
 		items_data: Vec<CreateItemData>,
 	) -> DispatchResult {
-		Self::can_create_items_in_collection(
-			&collection,
-			&sender,
-			&owner,
-			items_data.len() as u32,
-		)?;
+		Self::can_create_items_in_collection(collection, sender, owner, items_data.len() as u32)?;
 
 		for data in &items_data {
-			Self::validate_create_item_args(&collection, data)?;
+			Self::validate_create_item_args(collection, data)?;
 		}
 		for data in &items_data {
-			Self::create_item_no_validation(&collection, owner, data.clone())?;
+			Self::create_item_no_validation(collection, owner, data.clone())?;
 		}
 
 		Ok(())
@@ -1529,22 +1524,20 @@
 		value: u128,
 	) -> DispatchResult {
 		ensure!(
-			Self::is_item_owner(&sender, &collection, item_id)
+			Self::is_item_owner(sender, collection, item_id)
 				|| (collection.limits.owner_can_transfer
-					&& Self::is_owner_or_admin_permissions(&collection, &sender)),
+					&& Self::is_owner_or_admin_permissions(collection, sender)),
 			Error::<T>::NoPermission
 		);
 
 		if collection.access == AccessMode::WhiteList {
-			Self::check_white_list(&collection, &sender)?;
+			Self::check_white_list(collection, sender)?;
 		}
 
 		match collection.mode {
-			CollectionMode::NFT => Self::burn_nft_item(&collection, item_id)?,
-			CollectionMode::Fungible(_) => Self::burn_fungible_item(&sender, &collection, value)?,
-			CollectionMode::ReFungible => {
-				Self::burn_refungible_item(&collection, item_id, &sender)?
-			}
+			CollectionMode::NFT => Self::burn_nft_item(collection, item_id)?,
+			CollectionMode::Fungible(_) => Self::burn_fungible_item(sender, collection, value)?,
+			CollectionMode::ReFungible => Self::burn_refungible_item(collection, item_id, sender)?,
 			_ => (),
 		};
 
@@ -1557,7 +1550,7 @@
 		address: &T::CrossAccountId,
 		whitelisted: bool,
 	) -> DispatchResult {
-		Self::check_owner_or_admin_permissions(&collection, &sender)?;
+		Self::check_owner_or_admin_permissions(collection, sender)?;
 
 		if whitelisted {
 			<WhiteList<T>>::insert(collection.id, address.as_sub(), true);
@@ -1610,7 +1603,7 @@
 			Error::<T>::AccountTokenLimitExceeded
 		);
 
-		if !Self::is_owner_or_admin_permissions(collection, &sender) {
+		if !Self::is_owner_or_admin_permissions(collection, sender) {
 			ensure!(collection.mint_mode, Error::<T>::PublicMintingNotAllowed);
 			Self::check_white_list(collection, owner)?;
 			Self::check_white_list(collection, sender)?;
@@ -1691,7 +1684,7 @@
 				Self::add_nft_item(collection, item)?;
 			}
 			CreateItemData::Fungible(data) => {
-				Self::add_fungible_item(collection, &owner, data.value)?;
+				Self::add_fungible_item(collection, owner, data.value)?;
 			}
 			CreateItemData::ReFungible(data) => {
 				let owner_list = vec![Ownership {
@@ -1934,7 +1927,7 @@
 		subject: &T::CrossAccountId,
 	) -> bool {
 		*subject.as_sub() == collection.owner
-			|| <AdminList<T>>::get(collection.id).contains(&subject)
+			|| <AdminList<T>>::get(collection.id).contains(subject)
 	}
 
 	fn check_owner_or_admin_permissions(
@@ -1979,7 +1972,7 @@
 	) -> bool {
 		match target_collection.mode {
 			CollectionMode::Fungible(_) => true,
-			_ => Self::owned_amount(&subject, target_collection, item_id).is_some(),
+			_ => Self::owned_amount(subject, target_collection, item_id).is_some(),
 		}
 	}
 
modifiedpallets/nft/src/sponsorship.rsdiffbeforeafterboth
--- a/pallets/nft/src/sponsorship.rs
+++ b/pallets/nft/src/sponsorship.rs
@@ -179,14 +179,14 @@
 {
 	fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {
 		match IsSubType::<Call<T>>::is_sub_type(call)? {
-			Call::create_item(collection_id, _owner, _properties) => {
-				Self::withdraw_create_item(who, collection_id, &_properties)
+			Call::create_item(collection_id, _owner, properties) => {
+				Self::withdraw_create_item(who, collection_id, properties)
 			}
 			Call::transfer(_new_owner, collection_id, item_id, _value) => {
 				Self::withdraw_transfer(who, collection_id, item_id)
 			}
 			Call::set_variable_meta_data(collection_id, item_id, data) => {
-				Self::withdraw_set_variable_meta_data(collection_id, item_id, &data)
+				Self::withdraw_set_variable_meta_data(collection_id, item_id, data)
 			}
 			_ => None,
 		}