git.delta.rocks / unique-network / refs/commits / 4fa2a1bb0fae

difftreelog

test fix unit tests

Yaroslav Bolyukin2021-07-27parent: #18b08e8.patch.diff
in: master

3 files changed

modifiedcrates/evm-coder/tests/a.rsdiffbeforeafterboth
before · crates/evm-coder/tests/a.rs
1#![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(23	name = "OurInterface2",24	is(OurInterface),25	inline_is(OurInterface1),26	events(ERC721Log)27)]28impl Impls {29	#[solidity(rename_selector = "fnK")]30	fn fn_c(&self, input: uint32) -> Result<uint8> {31		todo!()32	}33	fn fn_d(&self, value: uint32) -> Result<uint32> {34		todo!()35	}3637	fn caller_sensitive(&self, caller: caller) -> Result<uint8> {38		todo!()39	}40	fn payable(&mut self, value: value) -> Result<uint8> {41		todo!()42	}43}4445#[derive(ToLog)]46enum ERC721Log {47	Transfer {48		#[indexed]49		from: address,50		#[indexed]51		to: address,52		value: uint256,53	},54	Eee {55		#[indexed]56		aaa: address,57		bbb: uint256,58	},59}6061struct ERC20;6263#[solidity_interface(name = "ERC20")]64impl ERC20 {65	fn decimals(&self) -> Result<uint8> {66		todo!()67	}68	fn balance_of(&self, owner: address) -> Result<uint256> {69		todo!()70	}71	fn transfer(&mut self, caller: caller, to: address, value: uint256) -> Result<bool> {72		todo!()73	}74	fn transfer_from(75		&mut self,76		caller: caller,77		from: address,78		to: address,79		value: uint256,80	) -> Result<bool> {81		todo!()82	}83	fn approve(&mut self, caller: caller, spender: address, value: uint256) -> Result<bool> {84		todo!()85	}86	fn allowance(&self, owner: address, spender: address) -> Result<uint256> {87		todo!()88	}89}
after · crates/evm-coder/tests/a.rs
1#![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(23	name = "OurInterface2",24	is(OurInterface),25	inline_is(OurInterface1),26	events(ERC721Log)27)]28impl Impls {29	#[solidity(rename_selector = "fnK")]30	fn fn_c(&self, _input: uint32) -> Result<uint8> {31		todo!()32	}33	fn fn_d(&self, _value: uint32) -> Result<uint32> {34		todo!()35	}3637	fn caller_sensitive(&self, _caller: caller) -> Result<uint8> {38		todo!()39	}40	fn payable(&mut self, _value: value) -> Result<uint8> {41		todo!()42	}43}4445#[derive(ToLog)]46enum ERC721Log {47	Transfer {48		#[indexed]49		from: address,50		#[indexed]51		to: address,52		value: uint256,53	},54	Eee {55		#[indexed]56		aaa: address,57		bbb: uint256,58	},59}6061struct ERC20;6263#[solidity_interface(name = "ERC20")]64impl ERC20 {65	fn decimals(&self) -> Result<uint8> {66		todo!()67	}68	fn balance_of(&self, _owner: address) -> Result<uint256> {69		todo!()70	}71	fn transfer(&mut self, _caller: caller, _to: address, _value: uint256) -> Result<bool> {72		todo!()73	}74	fn transfer_from(75		&mut self,76		_caller: caller,77		_from: address,78		_to: address,79		_value: uint256,80	) -> Result<bool> {81		todo!()82	}83	fn approve(&mut self, _caller: caller, _spender: address, _value: uint256) -> Result<bool> {84		todo!()85	}86	fn allowance(&self, _owner: address, _spender: address) -> Result<uint256> {87		todo!()88	}89}
modifiedpallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-coder-substrate/src/lib.rs
+++ b/pallets/evm-coder-substrate/src/lib.rs
@@ -38,7 +38,7 @@
 	}
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_evm::Config {
+	pub trait Config: frame_system::Config {
 		type EthereumTransactionSender: pallet_ethereum::EthereumTransactionSender;
 	}
 
modifiedpallets/nft/src/mock.rsdiffbeforeafterboth
--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -6,7 +6,6 @@
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup},
 	testing::Header,
-	Perbill,
 };
 use pallet_transaction_payment::{CurrencyAdapter};
 use frame_system as system;
@@ -99,9 +98,6 @@
 	type WeightInfo = ();
 }
 
-type Timestamp = pallet_timestamp::Pallet<Test>;
-type Randomness = pallet_randomness_collective_flip::Pallet<Test>;
-
 parameter_types! {
 	pub const CollectionCreationPrice: u32 = 0;
 	pub TreasuryAccountId: u64 = 1234;
@@ -151,6 +147,10 @@
 	}
 }
 
+impl pallet_evm_coder_substrate::Config for Test {
+	type EthereumTransactionSender = TestEtheremTransactionSender;
+}
+
 impl pallet_template::Config for Test {
 	type Event = ();
 	type WeightInfo = ();
@@ -160,7 +160,6 @@
 	type EvmAddressMapping = TestEvmAddressMapping;
 	type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;
 	type CrossAccountId = TestCrossAccountId;
-	type EthereumTransactionSender = TestEtheremTransactionSender;
 }
 
 // Build genesis storage according to the mock runtime.