goimports incorrectly removed valid imports, manually restoring all f…

…iles to original state add task for format only as this is blocking lint validations update linters to also lint test files
ethereum · Apr 5, 2018 · dea717b · dea717b
1 parent a48f2a4
commit dea717b
Show file tree

Hide file tree

Showing 74 changed files with 110 additions and 37 deletions.
diff --git a/Makefile b/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)/*

diff --git a/accounts/abi/bind/backend.go b/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"
 )

diff --git a/accounts/abi/bind/backends/simulated.go b/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"

diff --git a/accounts/abi/bind/base.go b/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"

diff --git a/accounts/abi/bind/bind.go b/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.

diff --git a/accounts/keystore/account_cache.go b/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"

diff --git a/accounts/keystore/file_cache.go b/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.

diff --git a/build/ci.go b/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",

diff --git a/build/gofmt.sh b/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;
diff --git a/cmd/ethkey/generate.go b/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"

diff --git a/cmd/ethkey/inspect.go b/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 {

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

diff --git a/cmd/ethkey/message.go b/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 {

diff --git a/cmd/ethkey/utils.go b/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

diff --git a/cmd/evm/main.go b/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)

diff --git a/cmd/geth/accountcmd.go b/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 (

diff --git a/cmd/geth/chaincmd.go b/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 (

diff --git a/cmd/geth/consolecmd.go b/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 (

diff --git a/cmd/geth/main.go b/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 (

diff --git a/cmd/geth/misccmd.go b/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 (

diff --git a/cmd/geth/monitorcmd.go b/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 (

diff --git a/cmd/geth/usage.go b/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.

diff --git a/cmd/p2psim/main.go b/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"

diff --git a/cmd/puppeth/puppeth.go b/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.

diff --git a/cmd/swarm/db.go b/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) {

diff --git a/cmd/swarm/hash.go b/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) {

diff --git a/cmd/swarm/list.go b/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) {

diff --git a/cmd/swarm/main.go b/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"

diff --git a/cmd/swarm/manifest.go b/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"

diff --git a/cmd/swarm/upload.go b/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) {

diff --git a/cmd/utils/customflags.go b/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

diff --git a/cmd/utils/flags.go b/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 (

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

diff --git a/core/blockchain.go b/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 (

diff --git a/core/headerchain.go b/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"

diff --git a/eth/peer.go b/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 (

diff --git a/ethclient/ethclient.go b/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"

diff --git a/ethclient/ethclient_test.go b/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{})

diff --git a/internal/debug/flags.go b/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 (

diff --git a/light/lightchain.go b/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 (

diff --git a/miner/worker.go b/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 (

diff --git a/p2p/nat/nat.go b/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

diff --git a/p2p/nat/natpmp.go b/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
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ import ( @@
     	"os"
     	"github.com/ethereum/go-ethereum/cmd/utils"
+    	"gopkg.in/urfave/cli.v1"
     )
     const (
@@ Expand Down @@