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 /miner | |
| 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 'miner')
| -rw-r--r-- | miner/unconfirmed.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/unconfirmed.go b/miner/unconfirmed.go index ee52d8512..7a4fc7cc5 100644 --- a/miner/unconfirmed.go +++ b/miner/unconfirmed.go @@ -42,7 +42,7 @@ type unconfirmedBlock struct { // unconfirmedBlocks implements a data structure to maintain locally mined blocks // have have not yet reached enough maturity to guarantee chain inclusion. It is // used by the miner to provide logs to the user when a previously mined block -// has a high enough guarantee to not be reorged out of te canonical chain. +// has a high enough guarantee to not be reorged out of the canonical chain. type unconfirmedBlocks struct { chain headerRetriever // Blockchain to verify canonical status through depth uint // Depth after which to discard previous blocks |