From c22c3825c2a595964cf4cb49a728fb37e8b851db Mon Sep 17 00:00:00 2001 From: Lucas Hendren Date: Mon, 3 Sep 2018 13:14:40 -0400 Subject: [PATCH] cmd, eth, les: Performed gofmt to update formatting --- cmd/geth/main.go | 41 ++++++++++++++++++------------------ cmd/utils/flags.go | 2 +- eth/downloader/downloader.go | 4 ++-- les/fetcher.go | 2 +- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 9e27fc2f39..638194206b 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -85,7 +85,7 @@ var ( utils.TxPoolGlobalQueueFlag, utils.TxPoolLifetimeFlag, - utils.FastSyncFlag, + utils.FastSyncFlag, utils.ExitWhenSyncedFlag, utils.LightModeFlag, utils.SyncModeFlag, @@ -335,27 +335,26 @@ func startNode(ctx *cli.Context, stack *node.Node) { if exitWhenSynced := ctx.GlobalDuration(utils.ExitWhenSyncedFlag.Name); exitWhenSynced >= 0 { go func() { - if ctx.GlobalBool(utils.LightModeFlag.Name) || ctx.GlobalString(utils.SyncModeFlag.Name) == "light" { - var lightEthereum *les.LightEthereum - if err := stack.Service(&lightEthereum); err != nil { - utils.Fatalf("LightEthereum service not running: %v", err) - } - <-lightEthereum.Downloader().syncedCh - log.Info("Synchronisation completed, exitting", "countdown", exitWhenSynced) - time.Sleep(exitWhenSynced) - stack.Stop() + if ctx.GlobalBool(utils.LightModeFlag.Name) || ctx.GlobalString(utils.SyncModeFlag.Name) == "light" { + var lightEthereum *les.LightEthereum + if err := stack.Service(&lightEthereum); err != nil { + utils.Fatalf("LightEthereum service not running: %v", err) + } + <-lightEthereum.Downloader().syncedCh + log.Info("Synchronisation completed, exitting", "countdown", exitWhenSynced) + time.Sleep(exitWhenSynced) + stack.Stop() - - } else { - var ethereum *eth.Ethereum - if err := stack.Service(ðereum); err != nil { - utils.Fatalf("Ethereum service not running: %v", err) - } - <-ethereum.Downloader().syncedCh - log.Info("Synchronisation completed, exitting", "countdown", exitWhenSynced) - time.Sleep(exitWhenSynced) - stack.Stop() - } + } else { + var ethereum *eth.Ethereum + if err := stack.Service(ðereum); err != nil { + utils.Fatalf("Ethereum service not running: %v", err) + } + <-ethereum.Downloader().syncedCh + log.Info("Synchronisation completed, exitting", "countdown", exitWhenSynced) + time.Sleep(exitWhenSynced) + stack.Stop() + } }() } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 1b90ee9040..87db58a3d2 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -158,7 +158,7 @@ var ( Value: DirectoryString{homeDir()}, } ExitWhenSyncedFlag = cli.DurationFlag{ - Name: "exitwhensynced", + Name: "exitwhensynced", Usage: "Exists syncing by given time (default 0) after block synchronisation", Value: -1, } diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index f01d8f911c..c28d95ee93 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -227,7 +227,7 @@ func New(mode SyncMode, stateDb ethdb.Database, mux *event.TypeMux, chain BlockC syncStatsState: stateSyncStats{ processed: rawdb.ReadFastTrieProgress(stateDb), }, - syncedCh: make(chan bool, 1), + syncedCh: make(chan bool, 1), trackStateReq: make(chan *stateReq), } go dl.qosTuner() @@ -321,7 +321,7 @@ func (d *Downloader) Synchronise(id string, head common.Hash, td *big.Int, mode case nil: select { case d.syncedCh <- true: - default: + default: } case errBusy: diff --git a/les/fetcher.go b/les/fetcher.go index f659f723cc..8834f1b0e3 100644 --- a/les/fetcher.go +++ b/les/fetcher.go @@ -51,7 +51,7 @@ type lightFetcher struct { syncing bool syncDone chan *peer syncedCh chan bool - + reqMu sync.RWMutex // reqMu protects access to sent header fetch requests requested map[uint64]fetchRequest deliverChn chan fetchResponse