ethutil -> ethtrie.NewTrie
This commit is contained in:
parent
89630d2826
commit
ff5703fd9b
|
@ -51,7 +51,7 @@ func MakeContract(tx *Transaction, state *State) *StateObject {
|
|||
|
||||
func NewStateObject(addr []byte) *StateObject {
|
||||
object := &StateObject{address: addr, Amount: new(big.Int), gasPool: new(big.Int)}
|
||||
object.state = NewState(ethutil.NewTrie(ethutil.Config.Db, ""))
|
||||
object.state = NewState(ethtrie.NewTrie(ethutil.Config.Db, ""))
|
||||
|
||||
return object
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ package ethchain
|
|||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"github.com/ethereum/eth-go/ethtrie"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
"math/big"
|
||||
)
|
||||
|
@ -268,7 +269,7 @@ func Call(vm *Vm, closure *Closure, data []byte) (ret []byte, err error, deepErr
|
|||
var (
|
||||
context = closure.object
|
||||
trie = context.state.trie
|
||||
trie2 = ethutil.NewTrie(ethutil.Config.Db, "")
|
||||
trie2 = ethtrie.NewTrie(ethutil.Config.Db, "")
|
||||
)
|
||||
|
||||
trie.NewIterator().Each(func(key string, v *ethutil.Value) {
|
||||
|
|
Loading…
Reference in New Issue