From ff5703fd9b089de67811af61de05637c62dc7a2c Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Tue, 1 Jul 2014 15:09:43 +0100
Subject: [PATCH] ethutil -> ethtrie.NewTrie

---
 ethchain/state_object.go     | 2 +-
 ethchain/state_transition.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ethchain/state_object.go b/ethchain/state_object.go
index 7c9430af2..35928c899 100644
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@@ -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
 }
diff --git a/ethchain/state_transition.go b/ethchain/state_transition.go
index 94c3de3d9..c382bcd60 100644
--- a/ethchain/state_transition.go
+++ b/ethchain/state_transition.go
@@ -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) {