diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
| commit | c8438979a9c5c73bf68a132d5fd0325863ab454b (patch) | |
| tree | 1792da4ffa92e3a225bd37079c0458ea4b101d23 /state/state_test.go | |
| parent | 141d3caabbfbebbbecac455462a40b6056aa3821 (diff) | |
| parent | 394e0f60c20206c7f7c4c76551d11a2b14b23a4d (diff) | |
| download | go-tangerine-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar go-tangerine-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.gz go-tangerine-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.bz2 go-tangerine-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.lz go-tangerine-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.xz go-tangerine-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.zst go-tangerine-c8438979a9c5c73bf68a132d5fd0325863ab454b.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'state/state_test.go')
| -rw-r--r-- | state/state_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/state/state_test.go b/state/state_test.go index 42f434ef0..737815e90 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethtrie" "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/trie" ) var ZeroHash256 = make([]byte, 32) @@ -15,7 +15,7 @@ func TestSnapshot(t *testing.T) { ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "") ethutil.Config.Db = db - state := New(ethtrie.New(db, "")) + state := New(trie.New(db, "")) stateObject := state.GetOrNewStateObject([]byte("aa")) |