interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ethutil -> ethtrie.NewTrie

This commit is contained in:
zelig 2014-07-01 15:09:43 +01:00
parent 89630d2826
commit ff5703fd9b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethchain/state_object.go
View File

@ -51,7 +51,7 @@ func MakeContract(tx *Transaction, state *State) *StateObject {
func NewStateObject(addr []byte) *StateObject { func NewStateObject(addr []byte) *StateObject {
object := &StateObject{address: addr, Amount: new(big.Int), gasPool: new(big.Int)} 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 return object
} }

3
ethchain/state_transition.go
View File

@ -3,6 +3,7 @@ package ethchain
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/ethereum/eth-go/ethtrie"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
"math/big" "math/big"
) )
@ -268,7 +269,7 @@ func Call(vm *Vm, closure *Closure, data []byte) (ret []byte, err error, deepErr
var ( var (
context = closure.object context = closure.object
trie = context.state.trie 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) { trie.NewIterator().Each(func(key string, v *ethutil.Value) {