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/sealer.go | |
| parent | 1dc19de5da64962a98a37bbc7b93a3895d2eb6e6 (diff) | |
| parent | 32516c768ec09e2a71cab5983d2c8b8ae5d92fc7 (diff) | |
| download | dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.gz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.bz2 dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.lz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.xz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.zst dexon-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/sealer.go')
| -rw-r--r-- | consensus/ethash/sealer.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 784e8f649..c2447e473 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -34,7 +34,7 @@ import ( // the block's difficulty requirements. func (ethash *Ethash) Seal(chain consensus.ChainReader, block *types.Block, stop <-chan struct{}) (*types.Block, error) { // If we're running a fake PoW, simply return a 0 nonce immediately - if ethash.fakeMode { + if ethash.config.PowMode == ModeFake || ethash.config.PowMode == ModeFullFake { header := block.Header() header.Nonce, header.MixDigest = types.BlockNonce{}, common.Hash{} return block.WithSeal(header), nil |