add custom log ids for integration tests sync

multiversx · Jan 9, 2025 · 95df853 · 95df853
1 parent ec5be33
commit 95df853
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/integrationTests/testProcessorNode.go b/integrationTests/testProcessorNode.go
@@ -2174,7 +2174,10 @@ func (tpn *TestProcessorNode) addMockVm(blockchainHook vmcommon.BlockchainHook)
 func (tpn *TestProcessorNode) initBlockProcessor() {
 	var err error
 
-	id := hex.EncodeToString(tpn.NodesCoordinator.GetOwnPublicKey())[0:8]
+	id := hex.EncodeToString(tpn.OwnAccount.PkTxSignBytes)
+	if len(id) > 8 {
+		id = id[0:8]
+	}
 
 	log := logger.GetOrCreate(fmt.Sprintf("p/sync/%s", id))
 
@@ -2216,6 +2219,13 @@ func (tpn *TestProcessorNode) initBlockProcessor() {
 		AppStatusHandlerField: &statusHandlerMock.AppStatusHandlerStub{},
 	}
 
+	id = hex.EncodeToString(tpn.OwnAccount.PkTxSignBytes)
+	if len(id) > 8 {
+		id = id[0:8]
+	}
+
+	logger := logger.GetOrCreate(fmt.Sprintf("p/b/%s", id))
+
 	argumentsBase := block.ArgBaseProcessor{
 		CoreComponents:       coreComponents,
 		DataComponents:       dataComponents,
@@ -2246,6 +2256,7 @@ func (tpn *TestProcessorNode) initBlockProcessor() {
 		BlockProcessingCutoffHandler: &testscommon.BlockProcessingCutoffStub{},
 		ManagedPeersHolder:           &testscommon.ManagedPeersHolderStub{},
 		SentSignaturesTracker:        &testscommon.SentSignatureTrackerStub{},
+		Logger:                       logger,
 	}
 
 	if check.IfNil(tpn.EpochStartNotifier) {
@@ -3105,7 +3116,7 @@ func (tpn *TestProcessorNode) initRequestedItemsHandler() {
 }
 
 func (tpn *TestProcessorNode) initBlockTracker() {
-	id := hex.EncodeToString(tpn.NodesCoordinator.GetOwnPublicKey())
+	id := hex.EncodeToString(tpn.OwnAccount.PkTxSignBytes)
 	if len(id) > 8 {
 		id = id[0:8]
 	}

diff --git a/integrationTests/testSyncNode.go b/integrationTests/testSyncNode.go
@@ -76,6 +76,14 @@ func (tpn *TestProcessorNode) initBlockProcessorWithSync() {
 		AppStatusHandlerField: &statusHandlerMock.AppStatusHandlerStub{},
 	}
 
+	id := hex.EncodeToString(tpn.OwnAccount.PkTxSignBytes)
+	if len(id) > 8 {
+		id = id[0:8]
+	}
+
+	log := logger.GetOrCreate(fmt.Sprintf("p/sync/%s", id))
+	blockProcessorLogger := logger.GetOrCreate(fmt.Sprintf("p/b/%s", id))
+
 	argumentsBase := block.ArgBaseProcessor{
 		CoreComponents:       coreComponents,
 		DataComponents:       dataComponents,
@@ -107,10 +115,11 @@ func (tpn *TestProcessorNode) initBlockProcessorWithSync() {
 		BlockProcessingCutoffHandler: &testscommon.BlockProcessingCutoffStub{},
 		ManagedPeersHolder:           &testscommon.ManagedPeersHolderStub{},
 		SentSignaturesTracker:        &testscommon.SentSignatureTrackerStub{},
+		Logger:                       blockProcessorLogger,
 	}
 
 	if tpn.ShardCoordinator.SelfId() == core.MetachainShardId {
-		tpn.ForkDetector, _ = sync.NewMetaForkDetector(nil, tpn.RoundHandler, tpn.BlockBlackListHandler, tpn.BlockTracker, 0)
+		tpn.ForkDetector, _ = sync.NewMetaForkDetector(log, tpn.RoundHandler, tpn.BlockBlackListHandler, tpn.BlockTracker, 0)
 		argumentsBase.ForkDetector = tpn.ForkDetector
 		argumentsBase.TxCoordinator = &mock.TransactionCoordinatorMock{}
 		arguments := block.ArgMetaProcessor{
@@ -131,7 +140,7 @@ func (tpn *TestProcessorNode) initBlockProcessorWithSync() {
 
 		tpn.BlockProcessor, err = block.NewMetaProcessor(arguments)
 	} else {
-		tpn.ForkDetector, _ = sync.NewShardForkDetector(nil, tpn.RoundHandler, tpn.BlockBlackListHandler, tpn.BlockTracker, 0)
+		tpn.ForkDetector, _ = sync.NewShardForkDetector(log, tpn.RoundHandler, tpn.BlockBlackListHandler, tpn.BlockTracker, 0)
 		argumentsBase.ForkDetector = tpn.ForkDetector
 		argumentsBase.BlockChainHook = tpn.BlockchainHook
 		argumentsBase.TxCoordinator = tpn.TxCoordinator
@@ -149,7 +158,7 @@ func (tpn *TestProcessorNode) initBlockProcessorWithSync() {
 }
 
 func (tpn *TestProcessorNode) createShardBootstrapper() (TestBootstrapper, error) {
-	id := hex.EncodeToString(tpn.NodesCoordinator.GetOwnPublicKey())
+	id := hex.EncodeToString(tpn.OwnAccount.PkTxSignBytes)
 	if len(id) > 8 {
 		id = id[0:8]
 	}
@@ -204,7 +213,7 @@ func (tpn *TestProcessorNode) createShardBootstrapper() (TestBootstrapper, error
 }
 
 func (tpn *TestProcessorNode) createMetaChainBootstrapper() (TestBootstrapper, error) {
-	id := hex.EncodeToString(tpn.NodesCoordinator.GetOwnPublicKey())
+	id := hex.EncodeToString(tpn.OwnAccount.PkTxSignBytes)
 	if len(id) > 8 {
 		id = id[0:8]
 	}