Skip to content

Commit

Permalink
add linting
Browse files Browse the repository at this point in the history
  • Loading branch information
haritha-j committed Jun 4, 2019
1 parent 83e26a6 commit 8d85b3d
Show file tree
Hide file tree
Showing 17 changed files with 13 additions and 43 deletions.
4 changes: 2 additions & 2 deletions p2p/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
coredocumentpb "github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
p2ppb "github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/centerrors"
"github.com/centrifuge/go-centrifuge/code"
"github.com/centrifuge/go-centrifuge/contextutil"
Expand Down
4 changes: 2 additions & 2 deletions p2p/client_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os"
"testing"

"github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
coredocumentpb "github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
p2ppb "github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/bootstrap"
"github.com/centrifuge/go-centrifuge/bootstrap/bootstrappers/testingbootstrap"
"github.com/centrifuge/go-centrifuge/config"
Expand Down
5 changes: 2 additions & 3 deletions p2p/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"context"
"testing"

"github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
coredocumentpb "github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
p2ppb "github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/contextutil"
"github.com/centrifuge/go-centrifuge/documents"
"github.com/centrifuge/go-centrifuge/documents/purchaseorder"
Expand All @@ -24,7 +24,6 @@ import (
"github.com/centrifuge/go-centrifuge/version"
"github.com/golang/protobuf/proto"
libp2pPeer "github.com/libp2p/go-libp2p-peer"
"github.com/libp2p/go-libp2p-protocol"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
3 changes: 1 addition & 2 deletions p2p/common/protocol.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@ import (
"time"

errorspb "github.com/centrifuge/centrifuge-protobufs/gen/go/errors"
"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
p2ppb "github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/contextutil"
"github.com/centrifuge/go-centrifuge/errors"
"github.com/centrifuge/go-centrifuge/identity"
"github.com/centrifuge/go-centrifuge/protobufs/gen/go/protocol"
"github.com/centrifuge/go-centrifuge/utils"
"github.com/centrifuge/go-centrifuge/version"
"github.com/golang/protobuf/proto"
"github.com/libp2p/go-libp2p-protocol"
)

// MessageType holds the protocol message type
Expand Down
3 changes: 1 addition & 2 deletions p2p/common/protocol_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"testing"

"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
p2ppb "github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/bootstrap"
"github.com/centrifuge/go-centrifuge/bootstrap/bootstrappers/testlogging"
"github.com/centrifuge/go-centrifuge/config"
Expand All @@ -19,7 +19,6 @@ import (

"github.com/centrifuge/go-centrifuge/identity"

"github.com/libp2p/go-libp2p-protocol"
"github.com/stretchr/testify/assert"
)

Expand Down
7 changes: 4 additions & 3 deletions p2p/common/protocol_testworld.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ package p2pcommon

import (
"context"
"strconv"
"time"

p2ppb "github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/contextutil"
protocolpb "github.com/centrifuge/go-centrifuge/protobufs/gen/go/protocol"
"github.com/centrifuge/go-centrifuge/utils"
"github.com/centrifuge/go-centrifuge/version"
"github.com/golang/protobuf/proto"
"strconv"
"time"
)

//prepare incorrect protobuf messages
Expand Down Expand Up @@ -119,7 +120,7 @@ func PrepareP2PEnvelopeInvalidHeader(ctx context.Context, networkID uint32, mess
InvalidSenderId := utils.RandomSlice(32)
InvalidNodeVersion := " "
byteArrayforNetworkID := utils.RandomByte32()
InvalidNetworkID := uint32(utils.ConvertByte32ToInt(byteArrayforNetworkID))
InvalidNetworkID := uint32(utils.ConvertByte32ToInt(byteArrayforNetworkID))
InvalidmessageType := " "

p2pheader := &p2ppb.Header{
Expand Down
2 changes: 0 additions & 2 deletions p2p/messenger/messenger.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ import (
"github.com/golang/protobuf/proto"
logging "github.com/ipfs/go-log"
"github.com/jbenet/go-context/io"
"github.com/libp2p/go-libp2p-host"
inet "github.com/libp2p/go-libp2p-net"
libp2pPeer "github.com/libp2p/go-libp2p-peer"
"github.com/libp2p/go-libp2p-protocol"
)

const (
Expand Down
8 changes: 0 additions & 8 deletions p2p/messenger/messenger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"testing"
"time"

"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/anchors"
"github.com/centrifuge/go-centrifuge/bootstrap"
"github.com/centrifuge/go-centrifuge/bootstrap/bootstrappers/testlogging"
Expand All @@ -28,17 +27,10 @@ import (
"github.com/centrifuge/go-centrifuge/storage/leveldb"
"github.com/centrifuge/go-centrifuge/testingutils/config"
"github.com/centrifuge/go-centrifuge/utils"
"github.com/ipfs/go-cid"
ds "github.com/ipfs/go-datastore"
"github.com/ipfs/go-ipfs-addr"
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p-crypto"
"github.com/libp2p/go-libp2p-host"
"github.com/libp2p/go-libp2p-kad-dht"
libp2pPeer "github.com/libp2p/go-libp2p-peer"
pstore "github.com/libp2p/go-libp2p-peerstore"
"github.com/libp2p/go-libp2p-peerstore/pstoremem"
"github.com/libp2p/go-libp2p-protocol"
ma "github.com/multiformats/go-multiaddr"
mh "github.com/multiformats/go-multihash"
"github.com/stretchr/testify/assert"
Expand Down
3 changes: 0 additions & 3 deletions p2p/receiver/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"time"

errorspb "github.com/centrifuge/centrifuge-protobufs/gen/go/errors"
"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/centerrors"
"github.com/centrifuge/go-centrifuge/code"
"github.com/centrifuge/go-centrifuge/config"
Expand All @@ -18,8 +17,6 @@ import (
"github.com/centrifuge/go-centrifuge/utils/timeutils"
"github.com/ethereum/go-ethereum/common"
"github.com/golang/protobuf/proto"
"github.com/libp2p/go-libp2p-peer"
"github.com/libp2p/go-libp2p-protocol"
)

// Handler implements protocol message handlers
Expand Down
2 changes: 0 additions & 2 deletions p2p/receiver/handler_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import (

"github.com/centrifuge/go-centrifuge/errors"

"github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/anchors"
"github.com/centrifuge/go-centrifuge/bootstrap"
"github.com/centrifuge/go-centrifuge/bootstrap/bootstrappers/testingbootstrap"
Expand Down
3 changes: 0 additions & 3 deletions p2p/receiver/handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"time"

errorspb "github.com/centrifuge/centrifuge-protobufs/gen/go/errors"
"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/anchors"
"github.com/centrifuge/go-centrifuge/bootstrap"
"github.com/centrifuge/go-centrifuge/bootstrap/bootstrappers/testlogging"
Expand All @@ -33,9 +32,7 @@ import (
"github.com/centrifuge/go-centrifuge/version"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/golang/protobuf/proto"
"github.com/libp2p/go-libp2p-crypto"
libp2pPeer "github.com/libp2p/go-libp2p-peer"
"github.com/libp2p/go-libp2p-protocol"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
1 change: 0 additions & 1 deletion p2p/receiver/validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"fmt"

"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/centerrors"
"github.com/centrifuge/go-centrifuge/code"
"github.com/centrifuge/go-centrifuge/errors"
Expand Down
1 change: 0 additions & 1 deletion p2p/receiver/validator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"testing"
"time"

"github.com/centrifuge/centrifuge-protobufs/gen/go/p2p"
"github.com/centrifuge/go-centrifuge/errors"
"github.com/centrifuge/go-centrifuge/identity"
"github.com/centrifuge/go-centrifuge/testingutils/commons"
Expand Down
6 changes: 0 additions & 6 deletions p2p/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,10 @@ import (
"github.com/centrifuge/go-centrifuge/p2p/receiver"
pb "github.com/centrifuge/go-centrifuge/protobufs/gen/go/protocol"
ds "github.com/ipfs/go-datastore"
"github.com/ipfs/go-ipfs-addr"
logging "github.com/ipfs/go-log"
"github.com/libp2p/go-libp2p"
"github.com/libp2p/go-libp2p-crypto"
"github.com/libp2p/go-libp2p-host"
"github.com/libp2p/go-libp2p-kad-dht"
libp2pPeer "github.com/libp2p/go-libp2p-peer"
pstore "github.com/libp2p/go-libp2p-peerstore"
"github.com/libp2p/go-libp2p-peerstore/pstoremem"
"github.com/libp2p/go-libp2p-protocol"
ma "github.com/multiformats/go-multiaddr"
)

Expand Down
2 changes: 1 addition & 1 deletion p2p/server_testworld.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (s *peer) getSignatureForDocumentIncorrectMessage(ctx context.Context, cd c
//select which envelope preparing function to call based on the error type
var envelope *protocolpb.P2PEnvelope
var envelopeErr error
switch errorType{
switch errorType {
case "incorrectNodeVersion":
envelope, envelopeErr = p2pcommon.PrepareP2PEnvelopeIncorrectNodeVersion(ctx, nc.GetNetworkID(), p2pcommon.MessageTypeRequestSignature, &p2ppb.SignatureRequest{Document: &cd})
if envelopeErr != nil {
Expand Down
1 change: 0 additions & 1 deletion testworld/signature_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"net/http"
"testing"

"github.com/centrifuge/centrifuge-protobufs/gen/go/coredocument"
"github.com/centrifuge/go-centrifuge/config"
"github.com/centrifuge/go-centrifuge/crypto"
"github.com/centrifuge/go-centrifuge/crypto/secp256k1"
Expand Down
1 change: 0 additions & 1 deletion testworld/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"sync"
"time"

"github.com/centrifuge/centrifuge-protobufs/gen/go/notification"
"github.com/centrifuge/go-centrifuge/errors"
)

Expand Down

0 comments on commit 8d85b3d

Please sign in to comment.