diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-11 08:08:42 +0800 |
| commit | 7e0ccc9de53e788ddc1879248bceb33a9ccdbae0 (patch) | |
| tree | 816ff2e06aaa78721a22eee7f2c8493fbf313fb4 /core/chain_manager_test.go | |
| parent | ce595b9266d658a5eae626d78aec7f47c04222ca (diff) | |
| parent | eba4f389a6c494bc3e15b3bbc6516b51a5e61236 (diff) | |
| download | go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.gz go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.bz2 go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.lz go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.xz go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.tar.zst go-tangerine-7e0ccc9de53e788ddc1879248bceb33a9ccdbae0.zip | |
Merge branch 'develop' into rpcfrontier
Conflicts:
rpc/api.go
rpc/args.go
Diffstat (limited to 'core/chain_manager_test.go')
| -rw-r--r-- | core/chain_manager_test.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/chain_manager_test.go b/core/chain_manager_test.go index e78c2e980..91822f9e2 100644 --- a/core/chain_manager_test.go +++ b/core/chain_manager_test.go @@ -12,14 +12,12 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/rlp" ) func init() { runtime.GOMAXPROCS(runtime.NumCPU()) - ethutil.ReadConfig("/tmp/ethtest", "/tmp/ethtest", "ETH") } // Test fork of length N starting from block i |