Moved ptrie => trie. Removed old trie

This commit is contained in:
obscuren
2015-01-08 11:47:04 +01:00
parent 982c812e81
commit db4aaedcbd
19 changed files with 558 additions and 1744 deletions

View File

@ -6,7 +6,7 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/ptrie"
"github.com/ethereum/go-ethereum/trie"
)
type Code []byte
@ -152,7 +152,7 @@ func (self *StateObject) Sync() {
}
/*
valid, t2 := ptrie.ParanoiaCheck(self.State.trie, ethutil.Config.Db)
valid, t2 := trie.ParanoiaCheck(self.State.trie, ethutil.Config.Db)
if !valid {
statelogger.Infof("Warn: PARANOIA: Different state storage root during copy %x vs %x\n", self.State.Root(), t2.Root())
@ -273,7 +273,7 @@ func (c *StateObject) Init() Code {
return c.InitCode
}
func (self *StateObject) Trie() *ptrie.Trie {
func (self *StateObject) Trie() *trie.Trie {
return self.State.trie
}