diff options
author | Jhih-Ming Huang <jm.huang@cobinhood.com> | 2019-03-08 20:25:54 +0800 |
---|---|---|
committer | Jhih-Ming Huang <jm.huang@cobinhood.com> | 2019-05-06 10:44:04 +0800 |
commit | 9faecc847b803e248a5b4d3d256a90b6c55fd26f (patch) | |
tree | 844e157a038037f957d33bd739eefb3405d02acf /core/tx_pool.go | |
parent | ba3337841485beb022d75e9182b380a192c420e2 (diff) | |
download | dexon-9faecc847b803e248a5b4d3d256a90b6c55fd26f.tar dexon-9faecc847b803e248a5b4d3d256a90b6c55fd26f.tar.gz dexon-9faecc847b803e248a5b4d3d256a90b6c55fd26f.tar.bz2 dexon-9faecc847b803e248a5b4d3d256a90b6c55fd26f.tar.lz dexon-9faecc847b803e248a5b4d3d256a90b6c55fd26f.tar.xz dexon-9faecc847b803e248a5b4d3d256a90b6c55fd26f.tar.zst dexon-9faecc847b803e248a5b4d3d256a90b6c55fd26f.zip |
remove dexon/crypto/sha3 pkg.
Diffstat (limited to 'core/tx_pool.go')
-rw-r--r-- | core/tx_pool.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/tx_pool.go b/core/tx_pool.go index e7dbab0d2..df11224e7 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -30,7 +30,7 @@ import ( "github.com/dexon-foundation/dexon/common/prque" "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/event" "github.com/dexon-foundation/dexon/log" "github.com/dexon-foundation/dexon/metrics" @@ -397,7 +397,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) { } else { round -= dexCore.ConfigRoundShift } - state := &vm.GovernanceState{StateDB: statedb} + state := &evm.GovernanceState{StateDB: statedb} height := state.RoundHeight(new(big.Int).SetUint64((round))).Uint64() block := pool.chain.GetBlockByNumber(height) if block == nil { @@ -409,7 +409,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) { log.Error("Failed to get txpool state for min gas price", "err", err) panic("cannot get state for new round's min gas price") } - govState := &vm.GovernanceState{StateDB: configState} + govState := &evm.GovernanceState{StateDB: configState} pool.setGovPrice(govState.MinGasPrice()) } |