build: revert the changes to import lists

remove lint from travis go 1.9.x linux builder errors reported by varcheck -> delete the variables instead of commenting them out
ethereum · Apr 6, 2018 · f77e0b4 · f77e0b4
1 parent b2e72fc
commit f77e0b4
Show file tree

Hide file tree

Showing 107 changed files with 95 additions and 247 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,6 @@ matrix:
         - sudo chown root:$USER /etc/fuse.conf
         - go run build/ci.go install
         - go run build/ci.go test -coverage
-        - go run build/ci.go lint
 
     # These are the latest Go versions.
     - os: linux

diff --git a/Makefile b/Makefile
@@ -40,9 +40,6 @@ test: all
 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
-	build/gofmt.sh
-
 clean:
 	rm -fr build/_workspace/pkg/ $(GOBIN)/*
 

diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
@@ -26,9 +26,8 @@ import (
 	"strings"
 	"testing"
 
-	"golang.org/x/tools/imports"
-
 	"github.com/ethereum/go-ethereum/common"
+	"golang.org/x/tools/imports"
 )
 
 var bindTests = []struct {

diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go
@@ -25,11 +25,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 var jsonEventTransfer = []byte(`{

diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-
 	"github.com/ethereum/go-ethereum/common"
 )
 

diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go
@@ -26,9 +26,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/stretchr/testify/require"
 )
 
 type unpackTest struct {

diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go
@@ -27,11 +27,10 @@ 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"
+	"gopkg.in/fatih/set.v0"
 )
 
 // Minimum amount of time between cache reloads. This limit applies if the platform does

diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go
@@ -29,7 +29,6 @@ import (
 
 	"github.com/cespare/cp"
 	"github.com/davecgh/go-spew/spew"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 )

diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go
@@ -29,11 +29,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pborman/uuid"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/pborman/uuid"
 )
 
 const (

diff --git a/accounts/keystore/keystore_passphrase.go b/accounts/keystore/keystore_passphrase.go
@@ -36,14 +36,13 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/pborman/uuid"
-	"golang.org/x/crypto/pbkdf2"
-	"golang.org/x/crypto/scrypt"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/crypto/randentropy"
+	"github.com/pborman/uuid"
+	"golang.org/x/crypto/pbkdf2"
+	"golang.org/x/crypto/scrypt"
 )
 
 const (

diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go
@@ -25,11 +25,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/pborman/uuid"
-	"golang.org/x/crypto/pbkdf2"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/pborman/uuid"
+	"golang.org/x/crypto/pbkdf2"
 )
 
 // creates a Key and stores that in the given KeyStore by decrypting a presale key JSON

diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go
@@ -21,9 +21,8 @@ package keystore
 import (
 	"time"
 
-	"github.com/rjeczalik/notify"
-
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/rjeczalik/notify"
 )
 
 type watcher struct {

diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go
@@ -22,11 +22,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/karalabe/hid"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/karalabe/hid"
 )
 
 // LedgerScheme is the protocol scheme prefixing account and wallet URLs.

diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go
@@ -53,11 +53,9 @@ const (
 	ledgerOpGetConfiguration ledgerOpcode = 0x06 // Returns specific wallet application configuration
 
 	ledgerP1DirectlyFetchAddress ledgerParam1 = 0x00 // Return address directly from the wallet
-	//ledgerP1ConfirmFetchAddress     ledgerParam1 = 0x01 // Require a user confirmation before returning the address
 	ledgerP1InitTransactionData     ledgerParam1 = 0x00 // First transaction data block for signing
 	ledgerP1ContTransactionData     ledgerParam1 = 0x80 // Subsequent transaction data block for signing
 	ledgerP2DiscardAddressChainCode ledgerParam2 = 0x00 // Do not return the chain code along with the address
-	//ledgerP2ReturnAddressChainCode  ledgerParam2 = 0x01 // Require a user confirmation before returning the address
 )
 
 // errLedgerReplyInvalidHeader is the error message returned by a Ledger data exchange

diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go
@@ -27,14 +27,13 @@ import (
 	"io"
 	"math/big"
 
-	"github.com/golang/protobuf/proto"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/usbwallet/internal/trezor"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/golang/protobuf/proto"
 )
 
 // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In

diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go
@@ -25,13 +25,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/karalabe/hid"
-
 	ethereum "github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/karalabe/hid"
 )
 
 // Maximum time between wallet health checks to detect USB unplugs.

diff --git a/build/gofmt.sh → build/goimports.sh b/build/gofmt.sh → build/goimports.sh
diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go
@@ -23,12 +23,11 @@ import (
 	"os"
 	"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"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/pborman/uuid"
+	"gopkg.in/urfave/cli.v1"
 )
 
 type outputGenerate struct {

diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go
@@ -53,10 +53,6 @@ var (
 		Name:  "json",
 		Usage: "output JSON instead of human-readable format",
 	}
-	//messageFlag = cli.StringFlag{
-	//	Name:  "message",
-	//	Usage: "the file that contains the message to sign/verify",
-	//}
 )
 
 func main() {

diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go
@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/reexec"
-
 	"github.com/ethereum/go-ethereum/internal/cmdtest"
 )
 

diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go
@@ -22,9 +22,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	cli "gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/core/asm"
+	cli "gopkg.in/urfave/cli.v1"
 )
 
 var disasmCommand = cli.Command{

diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
@@ -27,8 +27,6 @@ import (
 
 	goruntime "runtime"
 
-	cli "gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/evm/internal/compiler"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
@@ -39,6 +37,7 @@ import (
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
+	cli "gopkg.in/urfave/cli.v1"
 )
 
 var runCommand = cli.Command{

diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
@@ -41,8 +41,6 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/websocket"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/common"
@@ -60,6 +58,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/discv5"
 	"github.com/ethereum/go-ethereum/p2p/nat"
 	"github.com/ethereum/go-ethereum/params"
+	"golang.org/x/net/websocket"
 )
 
 var (

diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go
@@ -29,9 +29,8 @@ import (
 	"github.com/ethereum/go-ethereum/cmd/internal/browser"
 	"github.com/ethereum/go-ethereum/params"
 
-	cli "gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
+	cli "gopkg.in/urfave/cli.v1"
 )
 
 var bugCommand = cli.Command{

diff --git a/cmd/geth/config.go b/cmd/geth/config.go
@@ -27,14 +27,13 @@ import (
 
 	cli "gopkg.in/urfave/cli.v1"
 
-	"github.com/naoina/toml"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/dashboard"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/params"
 	whisper "github.com/ethereum/go-ethereum/whisper/whisperv6"
+	"github.com/naoina/toml"
 )
 
 var (

diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go
@@ -23,7 +23,6 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/reexec"
-
 	"github.com/ethereum/go-ethereum/internal/cmdtest"
 )
 

diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go
@@ -45,14 +45,13 @@ 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"
 	"github.com/ethereum/go-ethereum/p2p/simulations"
 	"github.com/ethereum/go-ethereum/p2p/simulations/adapters"
 	"github.com/ethereum/go-ethereum/rpc"
+	"gopkg.in/urfave/cli.v1"
 )
 
 var client *simulations.Client

diff --git a/cmd/puppeth/ssh.go b/cmd/puppeth/ssh.go
@@ -28,10 +28,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/ethereum/go-ethereum/log"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/terminal"
-
-	"github.com/ethereum/go-ethereum/log"
 )
 
 // sshClient is a small wrapper around Go's SSH client with a few utility methods

diff --git a/cmd/puppeth/wizard.go b/cmd/puppeth/wizard.go
@@ -30,11 +30,10 @@ import (
 	"strings"
 	"sync"
 
-	"golang.org/x/crypto/ssh/terminal"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/log"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 // config contains all the configurations needed by puppeth that should be saved

diff --git a/cmd/puppeth/wizard_netstats.go b/cmd/puppeth/wizard_netstats.go
@@ -23,10 +23,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/olekukonko/tablewriter"
-
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/olekukonko/tablewriter"
 )
 
 // networkStats verifies the status of network components and generates a protip

diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go
@@ -28,12 +28,11 @@ import (
 
 	cli "gopkg.in/urfave/cli.v1"
 
-	"github.com/naoina/toml"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
+	"github.com/naoina/toml"
 
 	bzzapi "github.com/ethereum/go-ethereum/swarm/api"
 )

diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go
@@ -27,7 +27,6 @@ import (
 	"time"
 
 	"github.com/docker/docker/pkg/reexec"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/internal/cmdtest"