From 10cf4e00cba095413718c132bb9c4f5a03945de1 Mon Sep 17 00:00:00 2001 From: Matt Curtis Date: Tue, 17 Oct 2023 11:16:44 +0100 Subject: [PATCH 1/2] downgrade spammy logs --- go/enclave/nodetype/sequencer.go | 3 ++- go/host/enclave/guardian.go | 4 ++-- integration/networktest/tests/helpful/availability_test.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go/enclave/nodetype/sequencer.go b/go/enclave/nodetype/sequencer.go index 39d9e19720..56f11c0963 100644 --- a/go/enclave/nodetype/sequencer.go +++ b/go/enclave/nodetype/sequencer.go @@ -189,7 +189,8 @@ func (s *sequencer) createNewHeadBatch(l1HeadBlock *common.L1Block, skipBatchIfE if _, err := s.produceBatch(sequencerNo.Add(sequencerNo, big.NewInt(1)), l1HeadBlock.Hash(), headBatch.Hash(), transactions, uint64(time.Now().Unix()), skipBatchIfEmpty); err != nil { if errors.Is(err, components.ErrNoTransactionsToProcess) { // skip batch production when there are no transactions to process - s.logger.Info("Skipping batch production, no transactions to execute") + // todo: this might be a useful event to track for metrics (skipping batch production because empty batch) + s.logger.Debug("Skipping batch production, no transactions to execute") return nil } return fmt.Errorf(" failed producing batch. Cause: %w", err) diff --git a/go/host/enclave/guardian.go b/go/host/enclave/guardian.go index d70443389d..ba00bfffa3 100644 --- a/go/host/enclave/guardian.go +++ b/go/host/enclave/guardian.go @@ -388,8 +388,8 @@ func (g *Guardian) catchupWithL2() error { func (g *Guardian) submitL1Block(block *common.L1Block, isLatest bool) (bool, error) { g.logger.Trace("submitting L1 block", log.BlockHashKey, block.Hash(), log.BlockHeightKey, block.Number()) if !g.submitDataLock.TryLock() { - g.logger.Info("Unable to submit block, already submitting another block") - // we are already submitting a block, and we don't want to leak goroutines, we wil catch up with the block later + g.logger.Debug("Unable to submit block, enclave is busy processing data") + // we are waiting for the enclave to process other data, and we don't want to leak goroutines, we wil catch up with the block later return false, nil } receipts, err := g.sl.L1Repo().FetchObscuroReceipts(block) diff --git a/integration/networktest/tests/helpful/availability_test.go b/integration/networktest/tests/helpful/availability_test.go index 114a46cda9..624e403b50 100644 --- a/integration/networktest/tests/helpful/availability_test.go +++ b/integration/networktest/tests/helpful/availability_test.go @@ -21,7 +21,7 @@ func TestNetworkAvailability(t *testing.T) { networktest.Run( "network-availability", t, - env.DevTestnet(), + env.SepoliaTestnet(), actions.RunOnlyAction(func(ctx context.Context, network networktest.NetworkConnector) (context.Context, error) { client, err := network.GetL1Client() if err != nil { From 70862864a54011abe39e5aca1f5f0ac0b8739711 Mon Sep 17 00:00:00 2001 From: Matt Curtis Date: Tue, 17 Oct 2023 11:20:36 +0100 Subject: [PATCH 2/2] revert miscommit --- integration/networktest/tests/helpful/availability_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/networktest/tests/helpful/availability_test.go b/integration/networktest/tests/helpful/availability_test.go index 624e403b50..114a46cda9 100644 --- a/integration/networktest/tests/helpful/availability_test.go +++ b/integration/networktest/tests/helpful/availability_test.go @@ -21,7 +21,7 @@ func TestNetworkAvailability(t *testing.T) { networktest.Run( "network-availability", t, - env.SepoliaTestnet(), + env.DevTestnet(), actions.RunOnlyAction(func(ctx context.Context, network networktest.NetworkConnector) (context.Context, error) { client, err := network.GetL1Client() if err != nil {