Update gas to weight radio

Author: boundless-forest

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

@@ -72,24 +72,14 @@ where
 	}
 }
 
-pub struct DarwiniaGasWeightMapping;
-impl GasWeightMapping for DarwiniaGasWeightMapping {
-	fn gas_to_weight(gas: u64) -> Weight {
-		gas * 1_000 as Weight
-	}
-	fn weight_to_gas(weight: Weight) -> u64 {
-		weight / 1_000
-	}
-}
-
 frame_support::parameter_types! {
 	pub const ChainId: u64 = 43;
 	pub BlockGasLimit: U256 = u32::max_value().into();
 }
 
 impl Config for Runtime {
 	type FeeCalculator = dvm_dynamic_fee::Pallet<Self>;
-	type GasWeightMapping = DarwiniaGasWeightMapping;
+	type GasWeightMapping = ();
 	type CallOrigin = EnsureAddressTruncated<Self::AccountId>;
 	type AddressMapping = ConcatAddressMapping<Self::AccountId>;
 	type FindAuthor = EthereumFindAuthor<Babe>;

frame/evm/src/lib.rs

@@ -448,12 +448,13 @@ pub trait GasWeightMapping {
 	fn gas_to_weight(gas: u64) -> Weight;
 	fn weight_to_gas(weight: Weight) -> u64;
 }
+// The radio of gas to weight comes from benchmark test
 impl GasWeightMapping for () {
 	fn gas_to_weight(gas: u64) -> Weight {
-		gas as Weight
+		gas * 16_000 as Weight
 	}
 	fn weight_to_gas(weight: Weight) -> u64 {
-		weight
+		weight / 16_000
 	}
 }