From d9d8ba7e6c7265d5aa1c58743756c7f3eb03f9e4 Mon Sep 17 00:00:00 2001 From: Zach Ramsay Date: Tue, 12 Dec 2017 04:53:21 +0000 Subject: [PATCH] build: nolint go1.8 features --- cmd/faucet/faucet.go | 2 +- consensus/clique/clique.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index dc13bc3317..5f16f2978e 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -506,7 +506,7 @@ func (f *faucet) apiHandler(conn *websocket.Conn) { // Send an error if too frequent funding, othewise a success if !fund { - if err = sendError(conn, fmt.Errorf("%s left until next allowance", common.PrettyDuration(time.Until(timeout)))); err != nil { + if err = sendError(conn, fmt.Errorf("%s left until next allowance", common.PrettyDuration(timeout.Sub(time.Now())))); err != nil { // nolint: gosimple log.Warn("Failed to send funding error to client", "err", err) return } diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index be8b43e140..a980581417 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -630,7 +630,7 @@ func (c *Clique) Seal(chain consensus.ChainReader, block *types.Block, stop <-ch } } // Sweet, the protocol permits us to sign the block, wait for our time - delay := time.Until(time.Unix(header.Time.Int64(), 0)) + delay := time.Unix(header.Time.Int64(), 0).Sub(time.Now()) // nolint: gosimple if header.Difficulty.Cmp(diffNoTurn) == 0 { // It's not our turn explicitly to sign, delay it a bit wiggle := time.Duration(len(snap.Signers)/2+1) * wiggleTime