Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consensus v2 integration tests with logs #6738

Draft
wants to merge 15 commits into
base: rc/andromeda
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add custom log ids for integration tests sync
ssd04 committed Jan 9, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 95df853339a02a7a3dcaf3bb3c86cd18b923140f
15 changes: 13 additions & 2 deletions integrationTests/testProcessorNode.go
Original file line number Diff line number Diff line change
@@ -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]
}
17 changes: 13 additions & 4 deletions integrationTests/testSyncNode.go
Original file line number Diff line number Diff line change
@@ -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]
}