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
--- a/crates/evm-coder/tests/a.rs
+++ b/crates/evm-coder/tests/a.rs
@@ -7,14 +7,14 @@
 
 #[solidity_interface(name = "OurInterface")]
 impl Impls {
-	fn fn_a(&self, input: uint256) -> Result<bool> {
+	fn fn_a(&self, _input: uint256) -> Result<bool> {
 		todo!()
 	}
 }
 
 #[solidity_interface(name = "OurInterface1")]
 impl Impls {
-	fn fn_b(&self, input: uint128) -> Result<uint32> {
+	fn fn_b(&self, _input: uint128) -> Result<uint32> {
 		todo!()
 	}
 }
@@ -27,17 +27,17 @@
 )]
 impl Impls {
 	#[solidity(rename_selector = "fnK")]
-	fn fn_c(&self, input: uint32) -> Result<uint8> {
+	fn fn_c(&self, _input: uint32) -> Result<uint8> {
 		todo!()
 	}
-	fn fn_d(&self, value: uint32) -> Result<uint32> {
+	fn fn_d(&self, _value: uint32) -> Result<uint32> {
 		todo!()
 	}
 
-	fn caller_sensitive(&self, caller: caller) -> Result<uint8> {
+	fn caller_sensitive(&self, _caller: caller) -> Result<uint8> {
 		todo!()
 	}
-	fn payable(&mut self, value: value) -> Result<uint8> {
+	fn payable(&mut self, _value: value) -> Result<uint8> {
 		todo!()
 	}
 }
@@ -65,25 +65,25 @@
 	fn decimals(&self) -> Result<uint8> {
 		todo!()
 	}
-	fn balance_of(&self, owner: address) -> Result<uint256> {
+	fn balance_of(&self, _owner: address) -> Result<uint256> {
 		todo!()
 	}
-	fn transfer(&mut self, caller: caller, to: address, value: uint256) -> Result<bool> {
+	fn transfer(&mut self, _caller: caller, _to: address, _value: uint256) -> Result<bool> {
 		todo!()
 	}
 	fn transfer_from(
 		&mut self,
-		caller: caller,
-		from: address,
-		to: address,
-		value: uint256,
+		_caller: caller,
+		_from: address,
+		_to: address,
+		_value: uint256,
 	) -> Result<bool> {
 		todo!()
 	}
-	fn approve(&mut self, caller: caller, spender: address, value: uint256) -> Result<bool> {
+	fn approve(&mut self, _caller: caller, _spender: address, _value: uint256) -> Result<bool> {
 		todo!()
 	}
-	fn allowance(&self, owner: address, spender: address) -> Result<uint256> {
+	fn allowance(&self, _owner: address, _spender: address) -> Result<uint256> {
 		todo!()
 	}
 }
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
before · pallets/nft/src/mock.rs
1#![allow(clippy::from_over_into)]23use crate as pallet_template;4use sp_core::H256;5use frame_support::{parameter_types, weights::IdentityFee};6use sp_runtime::{7	traits::{BlakeTwo256, IdentityLookup},8	testing::Header,9	Perbill,10};11use pallet_transaction_payment::{CurrencyAdapter};12use frame_system as system;13use pallet_evm::AddressMapping;14use crate::{EvmBackwardsAddressMapping, CrossAccountId};15use codec::{Encode, Decode};1617type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;18type Block = frame_system::mocking::MockBlock<Test>;1920// Configure a mock runtime to test the pallet.21frame_support::construct_runtime!(22	pub enum Test where23		Block = Block,24		NodeBlock = Block,25		UncheckedExtrinsic = UncheckedExtrinsic,26	{27		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},28		TemplateModule: pallet_template::{Pallet, Call, Storage},29		Balances: pallet_balances::{Pallet, Call, Storage},30	}31);3233parameter_types! {34	pub const BlockHashCount: u64 = 250;35	pub const SS58Prefix: u8 = 42;36}3738impl system::Config for Test {39	type BaseCallFilter = ();40	type BlockWeights = ();41	type BlockLength = ();42	type DbWeight = ();43	type Origin = Origin;44	type Call = Call;45	type Index = u64;46	type BlockNumber = u64;47	type Hash = H256;48	type Hashing = BlakeTwo256;49	type AccountId = u64;50	type Lookup = IdentityLookup<Self::AccountId>;51	type Header = Header;52	type Event = ();53	type BlockHashCount = BlockHashCount;54	type Version = ();55	type PalletInfo = PalletInfo;56	type AccountData = pallet_balances::AccountData<u64>;57	type OnNewAccount = ();58	type OnKilledAccount = ();59	type SystemWeightInfo = ();60	type SS58Prefix = SS58Prefix;61	type OnSetCode = ();62}6364parameter_types! {65	pub const ExistentialDeposit: u64 = 1;66	pub const MaxLocks: u32 = 50;67}68//frame_system::Module<Test>;69impl pallet_balances::Config for Test {70	type AccountStore = System;71	type Balance = u64;72	type DustRemoval = ();73	type Event = ();74	type ExistentialDeposit = ExistentialDeposit;75	type WeightInfo = ();76	type MaxLocks = MaxLocks;77	type MaxReserves = ();78	type ReserveIdentifier = [u8; 8];79}8081parameter_types! {82	pub const TransactionByteFee: u64 = 1;83}8485impl pallet_transaction_payment::Config for Test {86	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;87	type TransactionByteFee = TransactionByteFee;88	type WeightToFee = IdentityFee<u64>;89	type FeeMultiplierUpdate = ();90}9192parameter_types! {93	pub const MinimumPeriod: u64 = 1;94}95impl pallet_timestamp::Config for Test {96	type Moment = u64;97	type OnTimestampSet = ();98	type MinimumPeriod = MinimumPeriod;99	type WeightInfo = ();100}101102type Timestamp = pallet_timestamp::Pallet<Test>;103type Randomness = pallet_randomness_collective_flip::Pallet<Test>;104105parameter_types! {106	pub const CollectionCreationPrice: u32 = 0;107	pub TreasuryAccountId: u64 = 1234;108	pub EthereumChainId: u32 = 1111;109}110111pub struct TestEvmAddressMapping;112impl AddressMapping<u64> for TestEvmAddressMapping {113	fn into_account_id(_addr: sp_core::H160) -> u64 {114		unimplemented!()115	}116}117118pub struct TestEvmBackwardsAddressMapping;119impl EvmBackwardsAddressMapping<u64> for TestEvmBackwardsAddressMapping {120	fn from_account_id(_account_id: u64) -> sp_core::H160 {121		unimplemented!()122	}123}124125#[derive(Encode, Decode, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]126pub struct TestCrossAccountId(u64, sp_core::H160);127impl CrossAccountId<u64> for TestCrossAccountId {128	fn from_sub(sub: u64) -> Self {129		let mut eth = [0; 20];130		eth[12..20].copy_from_slice(&sub.to_be_bytes());131		Self(sub, sp_core::H160(eth))132	}133	fn as_sub(&self) -> &u64 {134		&self.0135	}136	fn from_eth(_eth: sp_core::H160) -> Self {137		unimplemented!()138	}139	fn as_eth(&self) -> &sp_core::H160 {140		&self.1141	}142}143144pub struct TestEtheremTransactionSender;145impl pallet_ethereum::EthereumTransactionSender for TestEtheremTransactionSender {146	fn submit_logs_transaction(147		_tx: pallet_ethereum::Transaction,148		_logs: Vec<pallet_ethereum::Log>,149	) -> Result<(), sp_runtime::DispatchError> {150		Ok(())151	}152}153154impl pallet_template::Config for Test {155	type Event = ();156	type WeightInfo = ();157	type CollectionCreationPrice = CollectionCreationPrice;158	type Currency = pallet_balances::Pallet<Test>;159	type TreasuryAccountId = TreasuryAccountId;160	type EvmAddressMapping = TestEvmAddressMapping;161	type EvmBackwardsAddressMapping = TestEvmBackwardsAddressMapping;162	type CrossAccountId = TestCrossAccountId;163	type EthereumTransactionSender = TestEtheremTransactionSender;164}165166// Build genesis storage according to the mock runtime.167pub fn new_test_ext() -> sp_io::TestExternalities {168	system::GenesisConfig::default()169		.build_storage::<Test>()170		.unwrap()171		.into()172}