From dc76967d4780c7165b9bb85cdb2cab87cce57d42 Mon Sep 17 00:00:00 2001 From: Trubnikov Sergey Date: Wed, 18 Jan 2023 08:45:17 +0000 Subject: [PATCH] refac: rename value -> Value --- --- a/crates/evm-coder/procedural/src/solidity_interface.rs +++ b/crates/evm-coder/procedural/src/solidity_interface.rs @@ -347,7 +347,7 @@ fn is_value(&self) -> bool { if let Ok(ident) = self.plain() { - return ident == "value"; + return ident == "Value"; } false } --- a/crates/evm-coder/src/lib.rs +++ b/crates/evm-coder/src/lib.rs @@ -145,7 +145,7 @@ //#region Special types /// Makes function payable - pub type value = U256; + pub type Value = U256; /// Makes function caller-sensitive pub type caller = Address; //#endregion --- a/crates/evm-coder/tests/random.rs +++ b/crates/evm-coder/tests/random.rs @@ -67,7 +67,7 @@ fn caller_sensitive(&self, _caller: caller) -> Result { unreachable!() } - fn payable(&mut self, _value: value) -> Result { + fn payable(&mut self, _value: Value) -> Result { unreachable!() } --- a/pallets/evm-coder-substrate/src/lib.rs +++ b/pallets/evm-coder-substrate/src/lib.rs @@ -41,7 +41,7 @@ use evm_coder::{ abi::{AbiReader, AbiWrite, AbiWriter}, execution, - types::{Msg, value}, + types::{Msg, Value}, }; pub use pallet::*; @@ -256,7 +256,7 @@ >( caller: H160, e: &mut E, - value: value, + value: Value, input: &[u8], ) -> execution::Result> { let (selector, mut reader) = AbiReader::new_call(input)?; --- a/pallets/unique/src/eth/mod.rs +++ b/pallets/unique/src/eth/mod.rs @@ -88,7 +88,7 @@ #[inline(always)] fn create_collection_internal( caller: caller, - value: value, + value: Value, name: String, collection_mode: CollectionMode, description: String, @@ -118,7 +118,7 @@ Ok(address) } -fn check_sent_amount_equals_collection_creation_price(value: value) -> Result<()> { +fn check_sent_amount_equals_collection_creation_price(value: Value) -> Result<()> { let value = value.as_u128(); let creation_price: u128 = T::CollectionCreationPrice::get() .try_into() @@ -150,7 +150,7 @@ fn create_nft_collection( &mut self, caller: caller, - value: value, + value: Value, name: String, description: String, token_prefix: String, @@ -189,7 +189,7 @@ fn create_nonfungible_collection( &mut self, caller: caller, - value: value, + value: Value, name: String, description: String, token_prefix: String, @@ -209,7 +209,7 @@ fn create_rft_collection( &mut self, caller: caller, - value: value, + value: Value, name: String, description: String, token_prefix: String, @@ -229,7 +229,7 @@ fn create_fungible_collection( &mut self, caller: caller, - value: value, + value: Value, name: String, decimals: u8, description: String, @@ -355,7 +355,7 @@ Ok(false) } - fn collection_creation_fee(&self) -> Result { + fn collection_creation_fee(&self) -> Result { let price: u128 = T::CollectionCreationPrice::get() .try_into() .map_err(|_| ()) // workaround for `expect` requiring `Debug` trait -- gitstuff