- fixes after merge

factory/crypto/cryptoComponents.go

@@ -24,7 +24,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go/genesis/process/disabled"
 	"github.com/ElrondNetwork/elrond-go/heartbeat"
 	"github.com/ElrondNetwork/elrond-go/keysManagement"
-	"github.com/ElrondNetwork/elrond-go/p2p"
+	p2pFactory "github.com/ElrondNetwork/elrond-go/p2p/factory"
 	storageFactory "github.com/ElrondNetwork/elrond-go/storage/factory"
 	"github.com/ElrondNetwork/elrond-go/storage/storageunit"
 	"github.com/ElrondNetwork/elrond-go/vm"
@@ -180,7 +180,7 @@ func (ccf *cryptoComponentsFactory) Create() (*cryptoComponents, error) {
 	isMainMachine := redundancyLevel == mainMachineRedundancyLevel
 	argsManagedPeersHolder := keysManagement.ArgsManagedPeersHolder{
 		KeyGenerator:                     blockSignKeyGen,
-		P2PIdentityGenerator:             p2p.NewRandomP2PIdentityGenerator(),
+		P2PIdentityGenerator:             p2pFactory.NewRandomP2PIdentityGenerator(),
 		IsMainMachine:                    isMainMachine,
 		MaxRoundsWithoutReceivedMessages: redundancyLevel,
 		PrefsConfig:                      ccf.prefsConfig,

factory/interface.go

@@ -24,6 +24,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go/epochStart"
 	"github.com/ElrondNetwork/elrond-go/epochStart/bootstrap"
 	"github.com/ElrondNetwork/elrond-go/genesis"
+	"github.com/ElrondNetwork/elrond-go/heartbeat"
 	heartbeatData "github.com/ElrondNetwork/elrond-go/heartbeat/data"
 	"github.com/ElrondNetwork/elrond-go/ntp"
 	"github.com/ElrondNetwork/elrond-go/outport"

heartbeat/interface.go

@@ -1,6 +1,8 @@
 package heartbeat
 
 import (
+	"time"
+
 	"github.com/ElrondNetwork/elrond-go-core/core"
 	"github.com/ElrondNetwork/elrond-go-core/data"
 	"github.com/ElrondNetwork/elrond-go-crypto"

heartbeat/sender/multikeyHeartbeatSender_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go/heartbeat"
 	"github.com/ElrondNetwork/elrond-go/heartbeat/mock"
 	"github.com/ElrondNetwork/elrond-go/testscommon"
+	"github.com/ElrondNetwork/elrond-go/testscommon/p2pmocks"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -286,7 +287,7 @@ func TestMultikeyHeartbeatSender_execute(t *testing.T) {
 		args := createMockMultikeyHeartbeatSenderArgs(createMockBaseArgs())
 		broadcastCalled := false
 		recordedMessages := make(map[core.PeerID][][]byte)
-		args.messenger = &mock.MessengerStub{
+		args.messenger = &p2pmocks.MessengerStub{
 			BroadcastCalled: func(topic string, buff []byte) {
 				assert.Equal(t, args.topic, topic)
 				recordedMessages[args.messenger.ID()] = append(recordedMessages[args.messenger.ID()], buff)
@@ -308,7 +309,7 @@ func TestMultikeyHeartbeatSender_execute(t *testing.T) {
 
 		args := createMockMultikeyHeartbeatSenderArgs(createMockBaseArgs())
 		recordedMessages := make(map[core.PeerID][][]byte)
-		args.messenger = &mock.MessengerStub{
+		args.messenger = &p2pmocks.MessengerStub{
 			BroadcastCalled: func(topic string, buff []byte) {
 				assert.Equal(t, args.topic, topic)
 				recordedMessages[args.messenger.ID()] = append(recordedMessages[args.messenger.ID()], buff)

heartbeat/sender/multikeyPeerAuthenticationSender_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/ElrondNetwork/elrond-go/sharding/nodesCoordinator"
 	"github.com/ElrondNetwork/elrond-go/testscommon"
 	"github.com/ElrondNetwork/elrond-go/testscommon/cryptoMocks"
+	"github.com/ElrondNetwork/elrond-go/testscommon/p2pmocks"
 	"github.com/ElrondNetwork/elrond-go/testscommon/shardingMocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -53,7 +54,7 @@ func createMockMultikeyPeerAuthenticationSenderArgs(argBase argBaseSender) argMu
 
 func createMockMultikeyPeerAuthenticationSenderArgsSemiIntegrationTests(
 	numKeys int,
-) (argMultikeyPeerAuthenticationSender, *mock.MessengerStub) {
+) (argMultikeyPeerAuthenticationSender, *p2pmocks.MessengerStub) {
 	keyGenForBLS := signing.NewKeyGenerator(mcl.NewSuiteBLS12())
 	keyGenForP2P := signing.NewKeyGenerator(ed25519.NewEd25519())
 	signerMessenger := ed25519SingleSig.Ed25519Signer{}
@@ -130,7 +131,7 @@ func createMockMultikeyPeerAuthenticationSenderArgsSemiIntegrationTests(
 		shardCoordinator:         createShardCoordinatorInShard(0),
 	}
 
-	messenger := &mock.MessengerStub{
+	messenger := &p2pmocks.MessengerStub{
 		SignUsingPrivateKeyCalled: func(skBytes []byte, payload []byte) ([]byte, error) {
 			p2pSk, _ := keyGenForP2P.PrivateKeyFromByteArray(skBytes)
 
@@ -692,7 +693,7 @@ func testSingleMessage(
 	errVerify := args.peerSignatureHandler.VerifyPeerSignature(recoveredMessage.Pubkey, core.PeerID(recoveredMessage.Pid), recoveredMessage.Signature)
 	assert.Nil(tb, errVerify)
 
-	messenger := args.messenger.(*mock.MessengerStub)
+	messenger := args.messenger.(*p2pmocks.MessengerStub)
 	errVerify = messenger.Verify(recoveredMessage.Payload, core.PeerID(recoveredMessage.Pid), recoveredMessage.PayloadSignature)
 	assert.Nil(tb, errVerify)
 

p2p/factory/factory.go

@@ -40,6 +40,6 @@ func NewPeersHolder(preferredConnectionAddresses []string) (p2p.PreferredPeersHo
 }
 
 // NewRandomP2PIdentityGenerator creates a new identity generator
-func NewRandomP2PIdentityGenerator() RandomP2PIdentityGenerator {
+func NewRandomP2PIdentityGenerator() p2p.RandomP2PIdentityGenerator {
 	return crypto.NewIdentityGenerator()
 }