- fixes after review & merge

consensus/spos/errors.go

@@ -169,6 +169,9 @@ var ErrNilHeaderIntegrityVerifier = errors.New("nil header integrity verifier")
 // ErrInvalidChainID signals that an invalid chain ID has been provided
 var ErrInvalidChainID = errors.New("invalid chain ID in consensus")
 
+// ErrNilNetworkShardingCollector defines the error for setting a nil network sharding collector
+var ErrNilNetworkShardingCollector = errors.New("nil network sharding collector")
+
 // ErrInvalidMessageType signals that an invalid message type has been received from consensus topic
 var ErrInvalidMessageType = errors.New("invalid message type")
 

p2p/libp2p/directSender.go

@@ -27,7 +27,6 @@ var _ p2p.DirectSender = (*directSender)(nil)
 
 const timeSeenMessages = time.Second * 120
 const maxMutexes = 10000
-const signPrefix = "en-directsend:"
 const sequenceNumberSize = 8
 
 type directSender struct {
@@ -303,7 +302,7 @@ func (ds *directSender) checkSig(message *pubsubPb.Message) error {
 }
 
 func withSignPrefix(bytes []byte) []byte {
-	return append([]byte(signPrefix), bytes...)
+	return append([]byte(pubsub.SignPrefix), bytes...)
 }
 
 // IsInterfaceNil returns true if there is no value under the interface

p2p/libp2p/directSender_test.go

@@ -216,7 +216,7 @@ func TestDirectSender_ProcessReceivedDirectMessageKeyFieldIsNotNilShouldErr(t *t
 
 	id, _ := createLibP2PCredentialsDirectSender()
 
-	msg := &pubsubPb.Message{}
+	msg := &pb.Message{}
 	msg.Data = []byte("data")
 	msg.Seqno = []byte("111")
 	msg.From = []byte(id)
@@ -251,7 +251,7 @@ func TestDirectSender_ProcessReceivedDirectMessageAbnormalSeqNoFieldShouldErr(t
 
 	id, _ := createLibP2PCredentialsDirectSender()
 
-	msg := &pubsubPb.Message{}
+	msg := &pb.Message{}
 	msg.Data = []byte("data")
 	msg.Seqno = bytes.Repeat([]byte{0x00}, libp2p.SequenceNumberSize+1)
 	msg.From = []byte(id)
@@ -517,7 +517,7 @@ func TestDirectSender_SendDirectToConnectedPeerSignFails(t *testing.T) {
 	remotePeer := peer.ID("remote peer")
 
 	stream := mock.NewStreamMock()
-	stream.SetProtocol(libp2p.DirectSendID)
+	_ = stream.SetProtocol(libp2p.DirectSendID)
 
 	cs := createConnStub(stream, id, sk, remotePeer)
 
@@ -778,7 +778,7 @@ func TestDirectSender_ProcessReceivedDirectMessageSignatureFails(t *testing.T) {
 
 	id, _ := createLibP2PCredentialsDirectSender()
 
-	msg := &pubsubPb.Message{}
+	msg := &pb.Message{}
 	msg.Data = []byte("data")
 	msg.Seqno = []byte("111")
 	msg.From = []byte(id)

p2p/libp2p/netMessenger_test.go

@@ -1102,8 +1102,7 @@ func TestLibp2pMessenger_SendDirectWithRealMessengersShouldWork(t *testing.T) {
 		ListenAddress: libp2p.ListenLocalhostAddrWithIp4AndTcp,
 		P2pConfig: config.P2PConfig{
 			Node: config.NodeConfig{
-				Port:                  "0",
-				ConnectionWatcherType: "print",
+				Port: "0",
 			},
 			KadDhtPeerDiscovery: config.KadDhtPeerDiscoveryConfig{
 				Enabled: false,
@@ -1112,9 +1111,10 @@ func TestLibp2pMessenger_SendDirectWithRealMessengersShouldWork(t *testing.T) {
 				Type: p2p.NilListSharder,
 			},
 		},
-		SyncTimer:            &libp2p.LocalSyncTimer{},
-		PreferredPeersHolder: &p2pmocks.PeersHolderStub{},
-		PeersRatingHandler:   &p2pmocks.PeersRatingHandlerStub{},
+		SyncTimer:             &libp2p.LocalSyncTimer{},
+		PreferredPeersHolder:  &p2pmocks.PeersHolderStub{},
+		PeersRatingHandler:    &p2pmocks.PeersRatingHandlerStub{},
+		ConnectionWatcherType: "print",
 	}
 	messenger1, _ := libp2p.NewNetworkMessenger(args)
 	messenger2, _ := libp2p.NewNetworkMessenger(args)
@@ -1167,8 +1167,7 @@ func TestLibp2pMessenger_SendDirectWithRealMessengersWithoutSignatureShouldWork(
 		ListenAddress: libp2p.ListenLocalhostAddrWithIp4AndTcp,
 		P2pConfig: config.P2PConfig{
 			Node: config.NodeConfig{
-				Port:                  "0",
-				ConnectionWatcherType: "print",
+				Port: "0",
 			},
 			KadDhtPeerDiscovery: config.KadDhtPeerDiscoveryConfig{
 				Enabled: false,
@@ -1177,9 +1176,10 @@ func TestLibp2pMessenger_SendDirectWithRealMessengersWithoutSignatureShouldWork(
 				Type: p2p.NilListSharder,
 			},
 		},
-		SyncTimer:            &libp2p.LocalSyncTimer{},
-		PreferredPeersHolder: &p2pmocks.PeersHolderStub{},
-		PeersRatingHandler:   &p2pmocks.PeersRatingHandlerStub{},
+		SyncTimer:             &libp2p.LocalSyncTimer{},
+		PreferredPeersHolder:  &p2pmocks.PeersHolderStub{},
+		PeersRatingHandler:    &p2pmocks.PeersRatingHandlerStub{},
+		ConnectionWatcherType: "print",
 	}
 	messenger1, _ := libp2p.NewNetworkMessenger(args)
 	// force messenger1 not to sign a direct message
@@ -1843,7 +1843,7 @@ func TestNetworkMessenger_Bootstrap(t *testing.T) {
 		},
 		SyncTimer:            &mock.SyncTimerStub{},
 		PeersRatingHandler:   &p2pmocks.PeersRatingHandlerStub{},
-		PreferredPeersHolder: &p2pmocks.PeersHolderStub{},ConnectionWatcherType: p2p.ConnectionWatcherTypePrint,
+		PreferredPeersHolder: &p2pmocks.PeersHolderStub{}, ConnectionWatcherType: p2p.ConnectionWatcherTypePrint,
 	}
 
 	netMes, err := libp2p.NewNetworkMessenger(args)
@@ -1971,7 +1971,6 @@ func TestLibp2pMessenger_ConnectionTopic(t *testing.T) {
 		assert.False(t, netMes.HasTopic(topic))
 		assert.False(t, netMes.PubsubHasTopic(topic))
 
-		testTopic := "test topic"
 		err = netMes.CreateTopic(testTopic, true)
 		assert.Nil(t, err)
 		assert.True(t, netMes.HasTopic(testTopic))
@@ -2013,7 +2012,6 @@ func TestLibp2pMessenger_ConnectionTopic(t *testing.T) {
 		assert.Nil(t, err)
 		assert.True(t, netMes.HasProcessorForTopic(topic))
 
-		testTopic := "test topic"
 		err = netMes.RegisterMessageProcessor(testTopic, "identifier", &mock.MessageProcessorStub{})
 		assert.Nil(t, err)
 		assert.True(t, netMes.HasProcessorForTopic(testTopic))
@@ -2035,7 +2033,6 @@ func TestLibp2pMessenger_ConnectionTopic(t *testing.T) {
 		assert.Nil(t, err)
 		assert.True(t, netMes.HasProcessorForTopic(topic))
 
-		testTopic := "test topic"
 		err = netMes.RegisterMessageProcessor(testTopic, "identifier", &mock.MessageProcessorStub{})
 		assert.Nil(t, err)
 		assert.True(t, netMes.HasProcessorForTopic(testTopic))