make lint-fix

This commit is contained in:
Pedro Pombeiro 2020-01-15 12:36:49 +01:00 committed by Pedro Pombeiro
parent 0316f94907
commit 7f45c43196
18 changed files with 43 additions and 21 deletions

View File

@ -177,7 +177,7 @@ clean-release:
rm -rf $(RELEASE_DIR) rm -rf $(RELEASE_DIR)
lint-fix: lint-fix:
find . -name '*.go' -and -not -name 'bindata*' -and -not -name 'migrations.go' -and -not -wholename '*/vendor/*' -exec goimports -local 'github.com/ethereum/go-ethereum,github.com/status-im/status-go' -w {} \; find . -name '*.go' -and -not -name '*.pb.go' -and -not -name 'bindata*' -and -not -name 'migrations.go' -and -not -wholename '*/vendor/*' -exec goimports -local 'github.com/ethereum/go-ethereum,github.com/status-im/status-go' -w {} \;
$(MAKE) vendor $(MAKE) vendor
check-existing-release: check-existing-release:

View File

@ -3,9 +3,10 @@ package gethbridge
import ( import (
"errors" "errors"
"github.com/status-im/status-go/waku"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/status-im/status-go/waku"
"github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"

View File

@ -1,8 +1,9 @@
package types package types
import ( import (
"github.com/status-im/status-go/eth-node/types"
"math/big" "math/big"
"github.com/status-im/status-go/eth-node/types"
) )
type Message struct { type Message struct {

View File

@ -9,9 +9,11 @@ import (
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
types "github.com/status-im/status-go/eth-node/types"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
types "github.com/status-im/status-go/eth-node/types"
gethcrypto "github.com/ethereum/go-ethereum/crypto" gethcrypto "github.com/ethereum/go-ethereum/crypto"
) )

View File

@ -3,6 +3,7 @@ package protocol
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"encoding/hex" "encoding/hex"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.uber.org/zap" "go.uber.org/zap"

View File

@ -9,13 +9,14 @@ import (
"testing" "testing"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/stretchr/testify/suite"
"go.uber.org/zap"
gethbridge "github.com/status-im/status-go/eth-node/bridge/geth" gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/protocol/tt" "github.com/status-im/status-go/protocol/tt"
"github.com/status-im/status-go/whisper/v6" "github.com/status-im/status-go/whisper/v6"
"github.com/stretchr/testify/suite"
"go.uber.org/zap"
) )
func TestMessengerContactUpdateSuite(t *testing.T) { func TestMessengerContactUpdateSuite(t *testing.T) {

View File

@ -9,14 +9,15 @@ import (
"testing" "testing"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/stretchr/testify/suite"
"go.uber.org/zap"
gethbridge "github.com/status-im/status-go/eth-node/bridge/geth" gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/protocol/encryption/multidevice" "github.com/status-im/status-go/protocol/encryption/multidevice"
"github.com/status-im/status-go/protocol/tt" "github.com/status-im/status-go/protocol/tt"
"github.com/status-im/status-go/whisper/v6" "github.com/status-im/status-go/whisper/v6"
"github.com/stretchr/testify/suite"
"go.uber.org/zap"
) )
func TestMessengerInstallationSuite(t *testing.T) { func TestMessengerInstallationSuite(t *testing.T) {

View File

@ -7,6 +7,7 @@ import (
"encoding/gob" "encoding/gob"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
) )

View File

@ -7,13 +7,15 @@ import (
"fmt" "fmt"
"time" "time"
"math/big"
"strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.uber.org/zap"
coretypes "github.com/status-im/status-go/eth-node/core/types" coretypes "github.com/status-im/status-go/eth-node/core/types"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"go.uber.org/zap"
"math/big"
"strings"
) )
const ( const (

View File

@ -7,12 +7,14 @@ import (
"strings" "strings"
"testing" "testing"
"math/big"
"github.com/stretchr/testify/suite"
coretypes "github.com/status-im/status-go/eth-node/core/types" coretypes "github.com/status-im/status-go/eth-node/core/types"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"github.com/status-im/status-go/protocol/tt" "github.com/status-im/status-go/protocol/tt"
"github.com/stretchr/testify/suite"
"math/big"
) )
func padArray(bb []byte, size int) []byte { func padArray(bb []byte, size int) []byte {

View File

@ -1,8 +1,9 @@
package transport package transport
import ( import (
"github.com/status-im/status-go/eth-node/types"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/status-im/status-go/eth-node/types"
) )
type EnvelopesMonitorConfig struct { type EnvelopesMonitorConfig struct {

View File

@ -3,9 +3,10 @@ package gethbridge
import ( import (
"errors" "errors"
"github.com/status-im/status-go/waku"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/status-im/status-go/waku"
"github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/ethereum/go-ethereum/p2p/enode"

View File

@ -1,8 +1,9 @@
package types package types
import ( import (
"github.com/status-im/status-go/eth-node/types"
"math/big" "math/big"
"github.com/status-im/status-go/eth-node/types"
) )
type Message struct { type Message struct {

View File

@ -9,9 +9,11 @@ import (
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
types "github.com/status-im/status-go/eth-node/types"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
types "github.com/status-im/status-go/eth-node/types"
gethcrypto "github.com/ethereum/go-ethereum/crypto" gethcrypto "github.com/ethereum/go-ethereum/crypto"
) )

View File

@ -3,6 +3,7 @@ package protocol
import ( import (
"crypto/ecdsa" "crypto/ecdsa"
"encoding/hex" "encoding/hex"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.uber.org/zap" "go.uber.org/zap"

View File

@ -7,6 +7,7 @@ import (
"encoding/gob" "encoding/gob"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
) )

View File

@ -7,13 +7,15 @@ import (
"fmt" "fmt"
"time" "time"
"math/big"
"strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"go.uber.org/zap"
coretypes "github.com/status-im/status-go/eth-node/core/types" coretypes "github.com/status-im/status-go/eth-node/core/types"
"github.com/status-im/status-go/eth-node/crypto" "github.com/status-im/status-go/eth-node/crypto"
"github.com/status-im/status-go/eth-node/types" "github.com/status-im/status-go/eth-node/types"
"go.uber.org/zap"
"math/big"
"strings"
) )
const ( const (

View File

@ -1,8 +1,9 @@
package transport package transport
import ( import (
"github.com/status-im/status-go/eth-node/types"
"go.uber.org/zap" "go.uber.org/zap"
"github.com/status-im/status-go/eth-node/types"
) )
type EnvelopesMonitorConfig struct { type EnvelopesMonitorConfig struct {