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

Author: thomasmodeneis

.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

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)/*
 

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 {

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(`{

accounts/abi/type_test.go

@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-
 	"github.com/ethereum/go-ethereum/common"
 )
 

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 {

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

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"
 )

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 (

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 (