added logs

multiversx · Jun 25, 2020 · 045cc00 · 045cc00
1 parent 79b52df
commit 045cc00
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/cmd/node/factory/structs.go b/cmd/node/factory/structs.go
@@ -1750,10 +1750,10 @@ func PrepareNetworkShardingCollector(
 	nodesCoordinator sharding.NodesCoordinator,
 	coordinator sharding.Coordinator,
 	epochStartRegistrationHandler epochStart.RegistrationHandler,
-	epochShard uint32,
+	epochStart uint32,
 ) (*networksharding.PeerShardMapper, error) {
 
-	networkShardingCollector, err := createNetworkShardingCollector(config, nodesCoordinator, epochStartRegistrationHandler, epochShard)
+	networkShardingCollector, err := createNetworkShardingCollector(config, nodesCoordinator, epochStartRegistrationHandler, epochStart)
 	if err != nil {
 		return nil, err
 	}

diff --git a/cmd/node/main.go b/cmd/node/main.go
@@ -2038,7 +2038,7 @@ func createNode(
 		nodesCoordinator,
 		shardCoordinator,
 		epochStartRegistrationHandler,
-		process.EpochStartTrigger.Epoch(),
+		process.EpochStartTrigger.MetaEpoch(),
 	)
 	if err != nil {
 		return nil, err

diff --git a/process/interceptors/multiDataInterceptor.go b/process/interceptors/multiDataInterceptor.go
@@ -169,7 +169,7 @@ func (mdi *MultiDataInterceptor) ProcessReceivedMessage(message p2p.MessageP2P,
 		log.Debug("got message from peer on topic only for validators", "originator",
 			p2p.PeerIdToShortString(message.Peer()),
 			"topic", mdi.topic,
-			"err", err)
+			"err", errOriginator)
 	}
 
 	return lastErrEncountered

diff --git a/process/interceptors/singleDataInterceptor.go b/process/interceptors/singleDataInterceptor.go
@@ -101,7 +101,7 @@ func (sdi *SingleDataInterceptor) ProcessReceivedMessage(message p2p.MessageP2P,
 	if !isWhiteListed && errOriginator != nil {
 		log.Debug("got message from peer on topic only for validators",
 			"originator", p2p.PeerIdToShortString(message.Peer()), "topic",
-			sdi.topic, "err", err)
+			sdi.topic, "err", errOriginator)
 		sdi.throttler.EndProcessing()
 		return errOriginator
 	}

diff --git a/sharding/networksharding/peerShardMapper.go b/sharding/networksharding/peerShardMapper.go
@@ -70,6 +70,8 @@ func NewPeerShardMapper(
 		return nil, err
 	}
 
+	log.Debug("peerShardMapper epoch", "epoch", epochStart)
+
 	return &PeerShardMapper{
 		peerIdPk:         peerIdPk,
 		pkPeerId:         pkPeerId,
@@ -295,6 +297,7 @@ func (psm *PeerShardMapper) EpochStartAction(hdr data.HeaderHandler) {
 
 	psm.mutEpoch.Lock()
 	psm.epoch = hdr.GetEpoch()
+	log.Debug("peerShardMapper epoch", "epoch", psm.epoch)
 	psm.mutEpoch.Unlock()
 }