fix merge

tangle-network · Oct 10, 2024 · 904872c · 904872c
1 parent a0662d8
commit 904872c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/precompiles/balances-erc20/src/eip2612.rs b/precompiles/balances-erc20/src/eip2612.rs
@@ -23,7 +23,6 @@ use sp_core::H256;
 use sp_io::hashing::keccak_256;
 use sp_runtime::traits::UniqueSaturatedInto;
 use sp_runtime::AccountId32;
-use sp_runtime::AccountId32;
 use sp_std::vec::Vec;
 
 /// EIP2612 permit typehash.

diff --git a/precompiles/balances-erc20/src/lib.rs b/precompiles/balances-erc20/src/lib.rs
@@ -34,7 +34,6 @@ use pallet_evm::AddressMapping;
 use precompile_utils::prelude::*;
 use sp_core::{H160, H256, U256};
 use sp_runtime::AccountId32;
-use sp_runtime::AccountId32;
 use sp_std::vec::Vec;
 use sp_std::{
 	convert::{TryFrom, TryInto},

diff --git a/precompiles/balances-erc20/src/mock.rs b/precompiles/balances-erc20/src/mock.rs
@@ -194,7 +194,7 @@ impl pallet_evm::Config for Runtime {
 	type WeightPerGas = WeightPerGas;
 	type CallOrigin = EnsureAddressRoot<AccountId>;
 	type WithdrawOrigin = EnsureAddressNever<AccountId>;
-	type AddressMapping = HashedAddressMapping;
+	type AddressMapping = AccountId;
 	type Currency = Balances;
 	type RuntimeEvent = RuntimeEvent;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
@@ -282,4 +282,4 @@ impl ExtBuilder {
 
 pub(crate) fn events() -> Vec<RuntimeEvent> {
 	System::events().into_iter().map(|r| r.event).collect::<Vec<_>>()
-}
+}