Decouple Runtime API impls from specific structs (#167)

JoshOrndorff · web-flow · commit 9d426054b2b8 · 2020-10-16T12:39:45.000+02:00
* decouple runtime API gas price from struct

* same for chain IDs
diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs
@@ -479,15 +479,15 @@ impl_runtime_apis! {
 
 	impl frontier_rpc_primitives::EthereumRuntimeRPCApi<Block> for Runtime {
 		fn chain_id() -> u64 {
-			ChainId::get()
+			<Runtime as frame_evm::Trait>::ChainId::get()
 		}
 
 		fn account_basic(address: H160) -> EVMAccount {
 			EVM::account_basic(&address)
 		}
 
 		fn gas_price() -> U256 {
-			FixedGasPrice::min_gas_price()
+			<Runtime as frame_evm::Trait>::FeeCalculator::min_gas_price()
 		}
 
 		fn account_code_at(address: H160) -> Vec<u8> {

Original file line number	Diff line number	Diff line change
`@@ -479,15 +479,15 @@ impl_runtime_apis! {`
`479`	`479`
`480`	`480`	`impl frontier_rpc_primitives::EthereumRuntimeRPCApi<Block> for Runtime {`
`481`	`481`	`fn chain_id() -> u64 {`
`482`		`- ChainId::get()`
	`482`	`+ <Runtime as frame_evm::Trait>::ChainId::get()`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`fn account_basic(address: H160) -> EVMAccount {`
`486`	`486`	`EVM::account_basic(&address)`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`fn gas_price() -> U256 {`
`490`		`- FixedGasPrice::min_gas_price()`
	`490`	`+ <Runtime as frame_evm::Trait>::FeeCalculator::min_gas_price()`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`fn account_code_at(address: H160) -> Vec<u8> {`