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 /tests/helper/init.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 'tests/helper/init.go')
| -rw-r--r-- | tests/helper/init.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/helper/init.go b/tests/helper/init.go index df98b9e42..e0892d8f6 100644 --- a/tests/helper/init.go +++ b/tests/helper/init.go @@ -4,7 +4,6 @@ import ( "log" "os" - "github.com/ethereum/go-ethereum/ethutil" logpkg "github.com/ethereum/go-ethereum/logger" ) @@ -14,6 +13,4 @@ var Log = logpkg.NewLogger("TEST") func init() { Logger = logpkg.NewStdLogSystem(os.Stdout, log.LstdFlags, logpkg.InfoLevel) logpkg.AddLogSystem(Logger) - - ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "") } |