goimports incorrectly removed valid imports, manually restoring all files to original state

add task for format only as this is blocking lint validations
update linters to also lint test files

Makefile

@@ -41,7 +41,7 @@ lint: ## Run linters. Use make install-linters first.
 	build/env.sh go run build/ci.go lint
 
 format:  # Formats the code. Must have goimports installed
-	goimports -w -local github.com/ethereum/go-ethereum ./
+	build/gofmt.sh
 
 clean:
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*

accounts/abi/bind/backend.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"math/big"
 
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 )

accounts/abi/bind/backends/simulated.go

@@ -24,6 +24,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"

accounts/abi/bind/base.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"

accounts/abi/bind/bind.go

@@ -28,9 +28,8 @@ import (
 	"text/template"
 	"unicode"
 
-	"golang.org/x/tools/imports"
-
 	"github.com/ethereum/go-ethereum/accounts/abi"
+	"golang.org/x/tools/imports"
 )
 
 // Lang is a target programming language selector to generate bindings for.

accounts/keystore/account_cache.go

@@ -27,6 +27,8 @@ import (
 	"sync"
 	"time"
 
+	"gopkg.in/fatih/set.v0"
+
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"

accounts/keystore/file_cache.go

@@ -24,9 +24,8 @@ import (
 	"sync"
 	"time"
 
-	set "gopkg.in/fatih/set.v0"
-
 	"github.com/ethereum/go-ethereum/log"
+	set "gopkg.in/fatih/set.v0"
 )
 
 // fileCache is a cache of files seen during scan of keystore.

build/ci.go

@@ -332,6 +332,7 @@ func doLint(cmdline []string) {
 	// Run fast linters batched together
 	configs := []string{
 		"--vendor",
+		"--tests",
 		"--disable-all",
 		"--enable=goimports",
 		"--enable=varcheck",

build/gofmt.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+find_files() {
+  find . -not \( \
+      \( \
+        -wholename '.github' \
+        -o -wholename './build/_workspace' \
+        -o -wholename './build/bin' \
+        -o -wholename './crypto/bn256' \
+        -o -wholename '*/vendor/*' \
+      \) -prune \
+    \) -name '*.go'
+}
+
+GOFMT="gofmt -s -w";
+find_files | xargs $GOFMT;

cmd/ethkey/generate.go

@@ -24,6 +24,7 @@ import (
 	"path/filepath"
 
 	"github.com/pborman/uuid"
+	"gopkg.in/urfave/cli.v1"
 
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"

cmd/ethkey/inspect.go

@@ -24,6 +24,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/crypto"
+	"gopkg.in/urfave/cli.v1"
 )
 
 type outputInspect struct {

cmd/ethkey/main.go

@@ -21,6 +21,7 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
+	"gopkg.in/urfave/cli.v1"
 )
 
 const (

cmd/ethkey/message.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"gopkg.in/urfave/cli.v1"
 )
 
 type outputSign struct {

cmd/ethkey/utils.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/console"
 	"github.com/ethereum/go-ethereum/crypto"
+	"gopkg.in/urfave/cli.v1"
 )
 
 // getPassPhrase obtains a passphrase given by the user.  It first checks the

cmd/evm/main.go

@@ -23,6 +23,7 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var gitCommit = "" // Git SHA1 commit hash of the release (set via linker flags)

cmd/geth/accountcmd.go

@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/console"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

cmd/geth/chaincmd.go

@@ -25,8 +25,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/syndtr/goleveldb/leveldb/util"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/console"
@@ -38,6 +36,8 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/trie"
+	"github.com/syndtr/goleveldb/leveldb/util"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

cmd/geth/consolecmd.go

@@ -28,6 +28,7 @@ import (
 	"github.com/ethereum/go-ethereum/console"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

cmd/geth/main.go

@@ -35,6 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/node"
+	"gopkg.in/urfave/cli.v1"
 )
 
 const (

cmd/geth/misccmd.go

@@ -27,6 +27,7 @@ import (
 	"github.com/ethereum/go-ethereum/consensus/ethash"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/params"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

cmd/geth/monitorcmd.go

@@ -25,11 +25,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gizak/termui"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/gizak/termui"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

cmd/geth/usage.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/internal/debug"
+	"gopkg.in/urfave/cli.v1"
 )
 
 // AppHelpTemplate is the test template for the default, global app help topic.

cmd/p2psim/main.go

@@ -45,6 +45,8 @@ import (
 	"strings"
 	"text/tabwriter"
 
+	"gopkg.in/urfave/cli.v1"
+
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/discover"

cmd/puppeth/puppeth.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/log"
+	"gopkg.in/urfave/cli.v1"
 )
 
 // main is just a boring entry point to set up the CLI app.

cmd/swarm/db.go

@@ -25,6 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/swarm/storage"
+	"gopkg.in/urfave/cli.v1"
 )
 
 func dbExport(ctx *cli.Context) {

cmd/swarm/hash.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/swarm/storage"
+	"gopkg.in/urfave/cli.v1"
 )
 
 func hash(ctx *cli.Context) {

cmd/swarm/list.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	swarm "github.com/ethereum/go-ethereum/swarm/api/client"
+	"gopkg.in/urfave/cli.v1"
 )
 
 func list(ctx *cli.Context) {

cmd/swarm/main.go

@@ -44,6 +44,8 @@ import (
 	"github.com/ethereum/go-ethereum/swarm"
 	bzzapi "github.com/ethereum/go-ethereum/swarm/api"
 	swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics"
+
+	"gopkg.in/urfave/cli.v1"
 )
 
 const clientIdentifier = "swarm"

cmd/swarm/manifest.go

@@ -27,6 +27,7 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/swarm/api"
 	swarm "github.com/ethereum/go-ethereum/swarm/api/client"
+	"gopkg.in/urfave/cli.v1"
 )
 
 const bzzManifestJSON = "application/bzz-manifest+json"

cmd/swarm/upload.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	swarm "github.com/ethereum/go-ethereum/swarm/api/client"
+	"gopkg.in/urfave/cli.v1"
 )
 
 func upload(ctx *cli.Context) {

cmd/utils/customflags.go

@@ -28,6 +28,7 @@ import (
 	"strings"
 
 	"github.com/ethereum/go-ethereum/common/math"
+	"gopkg.in/urfave/cli.v1"
 )
 
 // Custom type which is registered in the flags library which cli uses for

cmd/utils/flags.go

@@ -56,6 +56,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/netutil"
 	"github.com/ethereum/go-ethereum/params"
 	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

console/console.go

@@ -28,6 +28,7 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/mattn/go-colorable"
 	"github.com/peterh/liner"
 	"github.com/robertkrimen/otto"
 

core/blockchain.go

@@ -27,8 +27,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/karalabe/cookiejar.v2/collections/prque"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/mclock"
 	"github.com/ethereum/go-ethereum/consensus"
@@ -43,6 +41,8 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/trie"
+	"github.com/hashicorp/golang-lru"
+	"gopkg.in/karalabe/cookiejar.v2/collections/prque"
 )
 
 var (

core/headerchain.go

@@ -26,6 +26,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hashicorp/golang-lru"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/core/types"

eth/peer.go

@@ -27,6 +27,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/rlp"
+	"gopkg.in/fatih/set.v0"
 )
 
 var (

ethclient/ethclient.go

@@ -24,6 +24,7 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"

ethclient/ethclient_test.go

@@ -16,6 +16,8 @@
 
 package ethclient
 
+import "github.com/ethereum/go-ethereum"
+
 // Verify that Client implements the ethereum interfaces.
 var (
 	_ = ethereum.ChainReader(&Client{})

internal/debug/flags.go

@@ -30,6 +30,7 @@ import (
 	"github.com/ethereum/go-ethereum/log/term"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/metrics/exp"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

light/lightchain.go

@@ -34,6 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/hashicorp/golang-lru"
 )
 
 var (

miner/worker.go

@@ -35,6 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
+	"gopkg.in/fatih/set.v0"
 )
 
 const (

p2p/nat/nat.go

@@ -26,6 +26,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/jackpal/go-nat-pmp"
 )
 
 // An implementation of nat.Interface can map local ports to ports

p2p/nat/natpmp.go

@@ -21,6 +21,8 @@ import (
 	"net"
 	"strings"
 	"time"
+
+	"github.com/jackpal/go-nat-pmp"
 )
 
 // natPMPClient adapts the NAT-PMP protocol implementation so it conforms to

rpc/ipc_windows.go

@@ -22,6 +22,8 @@ import (
 	"context"
 	"net"
 	"time"
+
+	"gopkg.in/natefinch/npipe.v2"
 )
 
 // This is used if the dialing context has no deadline. It is much smaller than the

rpc/server.go

@@ -26,6 +26,7 @@ import (
 	"sync/atomic"
 
 	"github.com/ethereum/go-ethereum/log"
+	"gopkg.in/fatih/set.v0"
 )
 
 const MetadataApi = "rpc"

rpc/types.go

@@ -24,6 +24,7 @@ import (
 	"sync"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"gopkg.in/fatih/set.v0"
 )
 
 // API describes the set of methods offered over the RPC interface

rpc/websocket.go

@@ -32,6 +32,7 @@ import (
 	"golang.org/x/net/websocket"
 
 	"github.com/ethereum/go-ethereum/log"
+	"gopkg.in/fatih/set.v0"
 )
 
 // websocketJSONCodec is a custom JSON codec with payload size enforcement and

swarm/metrics/flags.go

@@ -23,6 +23,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	gethmetrics "github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/metrics/influxdb"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var (

vendor/github.com/Azure/go-autorest/autorest/azure/token.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/Azure/go-autorest/autorest"
+	"github.com/dgrijalva/jwt-go"
 )
 
 const (

vendor/github.com/StackExchange/wmi/swbemservices.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"sync"
 
+	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
 )
 

vendor/github.com/StackExchange/wmi/wmi.go

@@ -37,6 +37,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
 )
 

vendor/github.com/fatih/color/color.go

@@ -7,6 +7,9 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+
+	"github.com/mattn/go-colorable"
+	"github.com/mattn/go-isatty"
 )
 
 var (

vendor/github.com/gizak/termui/events.go

@@ -9,6 +9,8 @@ import (
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/nsf/termbox-go"
 )
 
 type Event struct {

vendor/github.com/gizak/termui/textbuilder.go

@@ -7,6 +7,8 @@ package termui
 import (
 	"regexp"
 	"strings"
+
+	"github.com/mitchellh/go-wordwrap"
 )
 
 // TextBuilder is a minimal interface to produce text []Cell using specific syntax (markdown).

vendor/github.com/mattn/go-colorable/colorable_windows.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"syscall"
 	"unsafe"
+
+	"github.com/mattn/go-isatty"
 )
 
 const (

vendor/github.com/nsf/termbox-go/api.go

@@ -2,6 +2,7 @@
 
 package termbox
 
+import "github.com/mattn/go-runewidth"
 import "fmt"
 import "os"
 import "os/signal"

vendor/github.com/nsf/termbox-go/termbox_windows.go

@@ -3,6 +3,7 @@ package termbox
 import "syscall"
 import "unsafe"
 import "unicode/utf16"
+import "github.com/mattn/go-runewidth"
 
 type (
 	wchar     uint16

vendor/github.com/olekukonko/tablewriter/util.go

@@ -11,6 +11,8 @@ import (
 	"math"
 	"regexp"
 	"strings"
+
+	"github.com/mattn/go-runewidth"
 )
 
 var ansi = regexp.MustCompile("\033\\[(?:[0-9]{1,3}(?:;[0-9]{1,3})*)?[m|K]")

vendor/github.com/robertkrimen/otto/ast/comments.go

@@ -2,7 +2,6 @@ package ast
 
 import (
 	"fmt"
-
 	"github.com/robertkrimen/otto/file"
 )
 

vendor/github.com/robertkrimen/otto/file/file.go

@@ -5,6 +5,8 @@ package file
 import (
 	"fmt"
 	"strings"
+
+	"gopkg.in/sourcemap.v1"
 )
 
 // Idx is a compact encoding of a source position within a file set.

vendor/github.com/robertkrimen/otto/parser/parser.go

@@ -43,6 +43,7 @@ import (
 	"github.com/robertkrimen/otto/ast"
 	"github.com/robertkrimen/otto/file"
 	"github.com/robertkrimen/otto/token"
+	"gopkg.in/sourcemap.v1"
 )
 
 // A Mode value is a set of flags (or 0). They control optional parser functionality.

vendor/github.com/robertkrimen/otto/result.go

@@ -1,5 +1,7 @@
 package otto
 
+import ()
+
 type _resultKind int
 
 const (

vendor/github.com/stretchr/testify/require/require.go

@@ -6,11 +6,10 @@
 package require
 
 import (
+	assert "github.com/stretchr/testify/assert"
 	http "net/http"
 	url "net/url"
 	time "time"
-
-	assert "github.com/stretchr/testify/assert"
 )
 
 // Condition uses a Comparison to assert a complex condition.

vendor/github.com/stretchr/testify/require/require_forward.go

@@ -6,11 +6,10 @@
 package require
 
 import (
+	assert "github.com/stretchr/testify/assert"
 	http "net/http"
 	url "net/url"
 	time "time"
-
-	assert "github.com/stretchr/testify/assert"
 )
 
 // Condition uses a Comparison to assert a complex condition.

vendor/github.com/syndtr/goleveldb/leveldb/storage.go

@@ -1,9 +1,8 @@
 package leveldb
 
 import (
-	"sync/atomic"
-
 	"github.com/syndtr/goleveldb/leveldb/storage"
+	"sync/atomic"
 )
 
 type iStorage struct {

vendor/golang.org/x/crypto/openpgp/armor/armor.go

@@ -10,9 +10,8 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/base64"
-	"io"
-
 	"golang.org/x/crypto/openpgp/errors"
+	"io"
 )
 
 // A Block represents an OpenPGP armored structure.

vendor/golang.org/x/crypto/openpgp/packet/compressed.go

@@ -8,10 +8,9 @@ import (
 	"compress/bzip2"
 	"compress/flate"
 	"compress/zlib"
+	"golang.org/x/crypto/openpgp/errors"
 	"io"
 	"strconv"
-
-	"golang.org/x/crypto/openpgp/errors"
 )
 
 // Compressed represents a compressed OpenPGP packet. The decompressed contents

vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go

@@ -7,11 +7,10 @@ package packet
 import (
 	"crypto"
 	"encoding/binary"
-	"io"
-	"strconv"
-
 	"golang.org/x/crypto/openpgp/errors"
 	"golang.org/x/crypto/openpgp/s2k"
+	"io"
+	"strconv"
 )
 
 // OnePassSignature represents a one-pass signature packet. See RFC 4880,

vendor/golang.org/x/crypto/openpgp/packet/packet.go

@@ -11,11 +11,10 @@ import (
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/des"
-	"io"
-	"math/big"
-
 	"golang.org/x/crypto/cast5"
 	"golang.org/x/crypto/openpgp/errors"
+	"io"
+	"math/big"
 )
 
 // readFull is the same as io.ReadFull except that reading zero bytes returns

vendor/golang.org/x/crypto/openpgp/packet/reader.go

@@ -5,9 +5,8 @@
 package packet
 
 import (
-	"io"
-
 	"golang.org/x/crypto/openpgp/errors"
+	"io"
 )
 
 // Reader reads packets from an io.Reader and allows packets to be 'unread' so

vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go

@@ -8,11 +8,10 @@ import (
 	"crypto/cipher"
 	"crypto/sha1"
 	"crypto/subtle"
+	"golang.org/x/crypto/openpgp/errors"
 	"hash"
 	"io"
 	"strconv"
-
-	"golang.org/x/crypto/openpgp/errors"
 )
 
 // SymmetricallyEncrypted represents a symmetrically encrypted byte string. The

vendor/golang.org/x/crypto/ssh/terminal/util_solaris.go

@@ -7,10 +7,9 @@
 package terminal // import "golang.org/x/crypto/ssh/terminal"
 
 import (
+	"golang.org/x/sys/unix"
 	"io"
 	"syscall"
-
-	"golang.org/x/sys/unix"
 )
 
 // State contains the state of a terminal.

whisper/shhclient/client.go

@@ -19,6 +19,7 @@ package shhclient
 import (
 	"context"
 
+	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/rpc"
 	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"