diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-30 22:58:40 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-30 22:58:40 +0800 |
| commit | 1085960ed8550eb64ae7031b43b1174c8f1c8f94 (patch) | |
| tree | 2fae2186e0b0ab0868f93f537057304fc84ff333 | |
| parent | 8df689bd448390c44ee2c344314257a5987a2e97 (diff) | |
| download | dexon-1085960ed8550eb64ae7031b43b1174c8f1c8f94.tar dexon-1085960ed8550eb64ae7031b43b1174c8f1c8f94.tar.gz dexon-1085960ed8550eb64ae7031b43b1174c8f1c8f94.tar.bz2 dexon-1085960ed8550eb64ae7031b43b1174c8f1c8f94.tar.lz dexon-1085960ed8550eb64ae7031b43b1174c8f1c8f94.tar.xz dexon-1085960ed8550eb64ae7031b43b1174c8f1c8f94.tar.zst dexon-1085960ed8550eb64ae7031b43b1174c8f1c8f94.zip | |
fixed trie
| -rw-r--r-- | cmd/evm/main.go | 4 | ||||
| -rw-r--r-- | tests/helper/trie.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 2bdfdfa9f..66bba7289 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -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)) diff --git a/tests/helper/trie.go b/tests/helper/trie.go index 32432cc7a..3cfb0bbe5 100644 --- a/tests/helper/trie.go +++ b/tests/helper/trie.go @@ -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) } |