Moved ptrie => trie. Removed old trie

2015-01-08 11:47:04 +01:00
parent 982c812e81
commit db4aaedcbd
19 changed files with 558 additions and 1744 deletions
--- a/tests/helper/trie.go
+++ b/tests/helper/trie.go
@ -1,6 +1,6 @@
 package helper

-import "github.com/ethereum/go-ethereum/ptrie"
+import "github.com/ethereum/go-ethereum/trie"

 type MemDatabase struct {
 	db map[string][]byte
@ -24,8 +24,8 @@ func (db *MemDatabase) Print()              {}
 func (db *MemDatabase) Close()              {}
 func (db *MemDatabase) LastKnownTD() []byte { return nil }

-func NewTrie() *ptrie.Trie {
+func NewTrie() *trie.Trie {
 	db, _ := NewMemDatabase()

-	return ptrie.New(nil, db)
+	return trie.New(nil, db)
 }