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/core/types/derive_sha.go
+++ b/core/types/derive_sha.go
@ -3,7 +3,7 @@ package types
 import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethutil"
-	"github.com/ethereum/go-ethereum/ptrie"
+	"github.com/ethereum/go-ethereum/trie"
 )

 type DerivableList interface {
@ -13,7 +13,7 @@ type DerivableList interface {

 func DeriveSha(list DerivableList) []byte {
 	db, _ := ethdb.NewMemDatabase()
-	trie := ptrie.New(nil, db)
+	trie := trie.New(nil, db)
 	for i := 0; i < list.Len(); i++ {
 		trie.Update(ethutil.Encode(i), list.GetRlp(i))
 	}