fixed trie

This commit is contained in:
obscuren 2014-12-30 15:58:40 +01:00
parent 8df689bd44
commit 1085960ed8
2 changed files with 5 additions and 5 deletions

View File

@ -37,8 +37,8 @@ import (
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/ptrie"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/trie"
"github.com/ethereum/go-ethereum/vm"
)
@ -65,7 +65,7 @@ func main() {
ethutil.ReadConfig("/tmp/evmtest", "/tmp/evm", "")
db, _ := ethdb.NewMemDatabase()
statedb := state.New(trie.New(db, ""))
statedb := state.New(ptrie.New(nil, db))
sender := statedb.NewStateObject([]byte("sender"))
receiver := statedb.NewStateObject([]byte("receiver"))
//receiver.SetCode([]byte(*code))

View File

@ -1,6 +1,6 @@
package helper
import "github.com/ethereum/go-ethereum/trie"
import "github.com/ethereum/go-ethereum/ptrie"
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() *trie.Trie {
func NewTrie() *ptrie.Trie {
db, _ := NewMemDatabase()
return trie.New(db, "")
return ptrie.New(nil, db)
}