diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-13 17:23:11 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-13 17:40:39 +0800 |
| commit | 19982f946735948478b6b7e7706f1b615f171d0d (patch) | |
| tree | cbacbdb6f9e6e731c2ebc17bad74e875f4d8ea8b /consensus/ethash/algorithm_test.go | |
| parent | 1dc19de5da64962a98a37bbc7b93a3895d2eb6e6 (diff) | |
| parent | 32516c768ec09e2a71cab5983d2c8b8ae5d92fc7 (diff) | |
| download | go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.gz go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.bz2 go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.lz go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.xz go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.tar.zst go-tangerine-19982f946735948478b6b7e7706f1b615f171d0d.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Merge with changes that implement config file PR #15548.
Field *EnsApi string* in swarm/api.Config is replaced with
*EnsAPIs []string*.
A new field *EnsDisabled bool* is added to swarm/api.Config for
easy way to disable ENS resolving with config file.
Signature of function swarm.NewSwarm is changed and simplified.
Diffstat (limited to 'consensus/ethash/algorithm_test.go')
| -rw-r--r-- | consensus/ethash/algorithm_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index 7e4307a74..7765ff9fe 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -703,8 +703,7 @@ func TestConcurrentDiskCacheGeneration(t *testing.T) { go func(idx int) { defer pend.Done() - - ethash := New(cachedir, 0, 1, "", 0, 0) + ethash := New(Config{cachedir, 0, 1, "", 0, 0, ModeNormal}) if err := ethash.VerifySeal(nil, block.Header()); err != nil { t.Errorf("proc %d: block verification failed: %v", idx, err) } |