diff options
| author | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
|---|---|---|
| committer | Daniel A. Nagy <nagy.da@gmail.com> | 2015-05-11 18:47:14 +0800 |
| commit | a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5 (patch) | |
| tree | 6c16d3e2b216fdf0027a477a8975c9052930e34a /tests | |
| parent | 1fe70a66ba2ef0f148affa7a72b4e65023474859 (diff) | |
| parent | 5176fbc6faaa5e7f0305ad7f2b896c092781deaa (diff) | |
| download | go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.gz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.bz2 go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.lz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.xz go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.tar.zst go-tangerine-a9e1d38612cfde56c285a5de5b5bfe5326bdc9b5.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Conflicts:
rpc/jeth.go
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/block_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/block_test.go b/tests/block_test.go index 79e3335b1..e72f2b548 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -103,7 +103,7 @@ func testEthConfig() *eth.Config { return ð.Config{ DataDir: common.DefaultDataDir(), - LogLevel: 5, + Verbosity: 5, Etherbase: "primary", AccountManager: accounts.NewManager(ks), NewDB: func(path string) (common.Database, error) { return ethdb.NewMemDatabase() }, |