Remove useless type in evm pallet (#729)

* Remove useless types in evm pallet

* Update test files

Author: bear

Cargo.lock

@@ -82,8 +82,6 @@ impl Config for Runtime {
 	type AddressMapping = ConcatAddressMapping<Self::AccountId>;
 	type FindAuthor = EthereumFindAuthor<Babe>;
 	type BlockHashMapping = EthereumBlockHashMapping<Self>;
-	type RingCurrency = Ring;
-	type KtonCurrency = Kton;
 	type Event = Event;
 	type Precompiles = PangolinPrecompiles<Self>;
 	type ChainId = ChainId;

bin/node/runtime/pangolin/src/pallets/evm_.rs

@@ -138,8 +138,6 @@ impl darwinia_evm::Config for Test {
 	type GasWeightMapping = ();
 	type CallOrigin = EnsureAddressTruncated<Self::AccountId>;
 	type AddressMapping = HashedAddressMapping;
-	type RingCurrency = Ring;
-	type KtonCurrency = Kton;
 	type Event = ();
 	type Precompiles = ();
 	type FindAuthor = ();

frame/bridge/s2s/issuing/src/tests.rs

@@ -187,8 +187,6 @@ impl darwinia_evm::Config for Test {
 	type GasWeightMapping = ();
 	type CallOrigin = EnsureAddressTruncated<Self::AccountId>;
 	type AddressMapping = HashedAddressMapping;
-	type RingCurrency = Ring;
-	type KtonCurrency = Kton;
 	type Event = ();
 	type Precompiles = MockPrecompiles<Self>;
 	type ChainId = ChainId;

frame/dvm/src/mock.rs

@@ -220,10 +220,7 @@ macro_rules! assert_balance {
 			<Test as darwinia_evm::Config>::RingAccountBasic::account_basic(&$evm_address).balance,
 			$balance
 		);
-		assert_eq!(
-			<Test as darwinia_evm::Config>::RingCurrency::free_balance(&account_id),
-			$left
-		);
+		assert_eq!(Ring::free_balance(&account_id), $left);
 		assert_eq!(
 			<RingRemainBalance as RemainBalanceOp<Test, u64>>::remaining_balance(&account_id),
 			$right

frame/dvm/src/tests.rs

@@ -42,7 +42,7 @@ use evm::{Config as EvmConfig, ExitError, ExitReason};
 use serde::{Deserialize, Serialize};
 // --- paritytech ---
 use frame_support::{
-	traits::{Currency, FindAuthor},
+	traits::FindAuthor,
 	weights::{PostDispatchInfo, Weight},
 };
 use frame_system::RawOrigin;
@@ -86,11 +86,7 @@ pub mod pallet {
 		/// Find author for the current block.
 		type FindAuthor: FindAuthor<H160>;
 
-		/// Ring Currency type
-		type RingCurrency: Currency<Self::AccountId>;
-		/// Kton Currency type
-		type KtonCurrency: Currency<Self::AccountId>;
-		/// The account basic mapping way
+		/// Account basic
 		type RingAccountBasic: AccountBasic<Self>;
 		type KtonAccountBasic: AccountBasic<Self>;
 

frame/evm/src/lib.rs

@@ -121,30 +121,11 @@ impl FindAuthor<H160> for FindAuthorTruncated {
 pub struct RawAccountBasic<T>(sp_std::marker::PhantomData<T>);
 impl<T: Config> AccountBasic<T> for RawAccountBasic<T> {
 	/// Get the account basic in EVM format.
-	fn account_basic(address: &H160) -> Account {
-		let account_id = T::AddressMapping::into_account_id(*address);
-
-		let nonce = <frame_system::Pallet<T>>::account_nonce(&account_id);
-		let balance = T::RingCurrency::free_balance(&account_id);
-
-		Account {
-			nonce: U256::from(UniqueSaturatedInto::<u128>::unique_saturated_into(nonce)),
-			balance: U256::from(UniqueSaturatedInto::<u128>::unique_saturated_into(balance)),
-		}
+	fn account_basic(_address: &H160) -> Account {
+		Account::default()
 	}
 
-	fn mutate_account_basic_balance(address: &H160, new_balance: U256) {
-		let account_id = T::AddressMapping::into_account_id(*address);
-		let current = T::RingAccountBasic::account_basic(address);
-
-		if current.balance > new_balance {
-			let diff = current.balance - new_balance;
-			T::RingCurrency::slash(&account_id, diff.low_u128().unique_saturated_into());
-		} else if current.balance < new_balance {
-			let diff = new_balance - current.balance;
-			T::RingCurrency::deposit_creating(&account_id, diff.low_u128().unique_saturated_into());
-		}
-	}
+	fn mutate_account_basic_balance(_address: &H160, _new_balance: U256) {}
 
 	fn transfer(_source: &H160, _target: &H160, _value: U256) -> Result<(), ExitError> {
 		Ok(())
@@ -176,14 +157,9 @@ impl Config for Test {
 	type FeeCalculator = FixedGasPrice;
 	type GasWeightMapping = ();
 	type CallOrigin = EnsureAddressRoot<Self::AccountId>;
-
 	type AddressMapping = ConcatAddressMapping<Self::AccountId>;
 	type BlockHashMapping = SubstrateBlockHashMapping<Self>;
 	type FindAuthor = FindAuthorTruncated;
-
-	type RingCurrency = Ring;
-	type KtonCurrency = Kton;
-
 	type Event = Event;
 	type Precompiles = ();
 	type ChainId = ();