From 156e8c3e6a06a7ba3fc35ac7dd1162493090ce29 Mon Sep 17 00:00:00 2001 From: Jhih-Ming Huang Date: Tue, 19 Feb 2019 11:26:49 +0800 Subject: core: rebase dev and fix lint --- core/dexon_chain_makers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/dexon_chain_makers.go') diff --git a/core/dexon_chain_makers.go b/core/dexon_chain_makers.go index 010b30c84..6901a8bc2 100644 --- a/core/dexon_chain_makers.go +++ b/core/dexon_chain_makers.go @@ -28,7 +28,7 @@ import ( "github.com/dexon-foundation/dexon/consensus" "github.com/dexon-foundation/dexon/core/state" "github.com/dexon-foundation/dexon/core/types" - "github.com/dexon-foundation/dexon/core/vm" + "github.com/dexon-foundation/dexon/core/vm/evm" "github.com/dexon-foundation/dexon/ethdb" "github.com/dexon-foundation/dexon/params" "github.com/dexon-foundation/dexon/rlp" @@ -110,7 +110,7 @@ func (b *DexonBlockGen) ProcessTransactions(c ChainContext) { for _, tx := range b.txs { b.statedb.Prepare(tx.Hash(), common.Hash{}, len(b.txs)) // TODO: fix the chain context parameter - receipt, _, err := ApplyTransaction(b.config, c, &b.header.Coinbase, b.gasPool, b.statedb, b.header, tx, &b.header.GasUsed, vm.Config{}) + receipt, _, err := ApplyTransaction(b.config, c, &b.header.Coinbase, b.gasPool, b.statedb, b.header, tx, &b.header.GasUsed, evm.Config{}) if err != nil { panic(err) } -- cgit