aboutsummaryrefslogtreecommitdiffstats
path: root/state/state.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-31 21:45:03 +0800
committerobscuren <geffobscura@gmail.com>2014-10-31 21:45:03 +0800
commitaf34749a6b47ff8f9b4cb55d9ea65e1235d63b68 (patch)
treed7b244bf5076cd6a56df626d97249b3264d92a86 /state/state.go
parentaf8f5f0b69f1c359991d12c7708804fe8dd1f944 (diff)
downloaddexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar.gz
dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.tar.zst
dexon-af34749a6b47ff8f9b4cb55d9ea65e1235d63b68.zip
ethtrie => trie
Diffstat (limited to 'state/state.go')
-rw-r--r--state/state.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/state/state.go b/state/state.go
index 298cf9680..e1b73a6ab 100644
--- a/state/state.go
+++ b/state/state.go
@@ -3,9 +3,9 @@ package state
import (
"math/big"
- "github.com/ethereum/go-ethereum/ethtrie"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
+ "github.com/ethereum/go-ethereum/trie"
)
var statelogger = logger.NewLogger("STATE")
@@ -17,7 +17,7 @@ var statelogger = logger.NewLogger("STATE")
// * Accounts
type State struct {
// The trie for this structure
- Trie *ethtrie.Trie
+ Trie *trie.Trie
stateObjects map[string]*StateObject
@@ -29,7 +29,7 @@ type State struct {
}
// Create a new state from a given trie
-func New(trie *ethtrie.Trie) *State {
+func New(trie *trie.Trie) *State {
return &State{Trie: trie, stateObjects: make(map[string]*StateObject), manifest: NewManifest(), refund: make(map[string]*big.Int)}
}
@@ -300,7 +300,7 @@ func (self *State) Update() {
// FIXME trie delete is broken
if deleted {
- valid, t2 := ethtrie.ParanoiaCheck(self.Trie)
+ valid, t2 := trie.ParanoiaCheck(self.Trie)
if !valid {
statelogger.Infof("Warn: PARANOIA: Different state root during copy %x vs %x\n", self.Trie.Root, t2.Root)