roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #22122 from karalabe/snapshot-polishes

Browse Source 
cmd/utils, eth/downloader: minor snap nitpicks
This commit is contained in:
Péter Szilágyi 2021-01-07 09:12:20 +02:00 committed by GitHub
commit 8bd8e1b24a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/utils/flags.go
View File

@ -1568,7 +1568,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
// If snap-sync is requested, this flag is also required // If snap-sync is requested, this flag is also required
if cfg.SyncMode == downloader.SnapSync { if cfg.SyncMode == downloader.SnapSync {
log.Info("Snap sync requested, enabling --snapshot") log.Info("Snap sync requested, enabling --snapshot")
ctx.Set(SnapshotFlag.Name, "true")
} else { } else {
cfg.TrieCleanCache += cfg.SnapshotCache cfg.TrieCleanCache += cfg.SnapshotCache
cfg.SnapshotCache = 0 // Disabled cfg.SnapshotCache = 0 // Disabled

4
eth/downloader/downloader.go
View File

@ -89,7 +89,7 @@ var (
errCancelContentProcessing = errors.New("content processing canceled (requested)") errCancelContentProcessing = errors.New("content processing canceled (requested)")
errCanceled = errors.New("syncing canceled (requested)") errCanceled = errors.New("syncing canceled (requested)")
errNoSyncActive = errors.New("no sync active") errNoSyncActive = errors.New("no sync active")
errTooOld = errors.New("peer doesn't speak recent enough protocol version (need version >= 64)") errTooOld = errors.New("peer's protocol version too old")
) )
type Downloader struct { type Downloader struct {
@ -460,7 +460,7 @@ func (d *Downloader) syncWithPeer(p *peerConnection, hash common.Hash, td *big.I
} }
}() }()
if p.version < 64 { if p.version < 64 {
return fmt.Errorf("%w, peer version: %d", errTooOld, p.version) return fmt.Errorf("%w: advertized %d < required %d", errTooOld, p.version, 64)
} }
mode := d.getMode() mode := d.getMode()