From c571978947e946eb5286d6bd1f34287757df1e89 Mon Sep 17 00:00:00 2001 From: Madhur Shrimal Date: Wed, 11 Dec 2024 18:04:55 -0800 Subject: [PATCH] upgrade logger to remove noop --- api/clients/retrieval_client_test.go | 5 +++-- common/geth/multihoming_client_test.go | 5 +++-- common/ratelimit/ratelimit_test.go | 4 ++-- common/store/dynamo_store_test.go | 5 +++-- common/testutils/test_utils.go | 6 ++++++ core/aggregation_test.go | 4 ++-- core/indexer/state_test.go | 3 ++- core/meterer/meterer_test.go | 5 ++--- core/thegraph/state_integration_test.go | 3 ++- core/thegraph/state_test.go | 10 +++++----- core/v2/core_test.go | 6 +++--- disperser/apiserver/server_test.go | 5 +++-- disperser/apiserver/server_v2_test.go | 4 ++-- disperser/batcher/batcher_test.go | 6 +++--- disperser/batcher/encoding_streamer_test.go | 8 ++++---- disperser/batcher/finalizer_test.go | 8 ++++---- disperser/batcher/txn_manager_test.go | 16 ++++++++-------- disperser/common/blobstore/blobstore_test.go | 4 ++-- disperser/common/v2/blobstore/blobstore_test.go | 4 ++-- disperser/controller/controller_test.go | 4 ++-- disperser/controller/dispatcher_test.go | 2 +- disperser/controller/encoding_manager_test.go | 4 ++-- disperser/dataapi/server_test.go | 4 ++-- disperser/dataapi/server_v2_test.go | 4 ++-- disperser/dataapi/subgraph_client_test.go | 14 +++++++------- disperser/encoder/server_test.go | 4 ++-- disperser/encoder/setup_test.go | 4 ++-- indexer/eth/header_service_test.go | 5 ++--- indexer/test/indexer_test.go | 5 +++-- node/operator_test.go | 7 ++++--- node/store_test.go | 4 ++-- node/store_v2_test.go | 4 ++-- operators/churner/server_test.go | 4 ++-- operators/churner/tests/churner_test.go | 3 ++- relay/chunkstore/chunk_store_test.go | 4 ++-- retriever/eth/chain_client_test.go | 5 +++-- retriever/server_test.go | 4 ++-- test/integration_test.go | 3 ++- tools/traffic/generator_test.go | 7 +++---- 39 files changed, 110 insertions(+), 96 deletions(-) diff --git a/api/clients/retrieval_client_test.go b/api/clients/retrieval_client_test.go index 0c61531b42..2b19629d58 100644 --- a/api/clients/retrieval_client_test.go +++ b/api/clients/retrieval_client_test.go @@ -3,11 +3,13 @@ package clients_test import ( "bytes" "context" + "runtime" "testing" "github.com/Layr-Labs/eigenda/api/clients" clientsmock "github.com/Layr-Labs/eigenda/api/clients/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" coreindexer "github.com/Layr-Labs/eigenda/core/indexer" coremock "github.com/Layr-Labs/eigenda/core/mock" @@ -17,7 +19,6 @@ import ( "github.com/Layr-Labs/eigenda/encoding/kzg/verifier" "github.com/Layr-Labs/eigenda/encoding/utils/codec" indexermock "github.com/Layr-Labs/eigenda/indexer/mock" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -96,7 +97,7 @@ func setup(t *testing.T) { if err != nil { t.Fatal(err) } - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() indexer = &indexermock.MockIndexer{} indexer.On("Index").Return(nil).Once() diff --git a/common/geth/multihoming_client_test.go b/common/geth/multihoming_client_test.go index 91b4802a32..6ba42d3dd9 100644 --- a/common/geth/multihoming_client_test.go +++ b/common/geth/multihoming_client_test.go @@ -3,12 +3,13 @@ package geth_test import ( "context" "fmt" + "math/big" "testing" "github.com/Layr-Labs/eigenda/common/geth" damock "github.com/Layr-Labs/eigenda/common/mock" - "github.com/Layr-Labs/eigensdk-go/logging" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/ethereum/go-ethereum/rpc" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -25,7 +26,7 @@ func (j *JsonError) Error() string { return "json error" } func (j *JsonError) ErrorCode() int { return -32000 } func makeTestMultihomingClient(numRetries int, designatedError error) (*geth.MultiHomingClient, error) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() ethClientCfg := geth.EthClientConfig{ RPCURLs: rpcURLs, diff --git a/common/ratelimit/ratelimit_test.go b/common/ratelimit/ratelimit_test.go index 969d698dbf..aadec8d128 100644 --- a/common/ratelimit/ratelimit_test.go +++ b/common/ratelimit/ratelimit_test.go @@ -8,7 +8,7 @@ import ( "github.com/Layr-Labs/eigenda/common" "github.com/Layr-Labs/eigenda/common/ratelimit" "github.com/Layr-Labs/eigenda/common/store" - "github.com/Layr-Labs/eigensdk-go/logging" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" ) @@ -26,7 +26,7 @@ func makeTestRatelimiter() (common.RateLimiter, error) { return nil, err } - ratelimiter := ratelimit.NewRateLimiter(prometheus.NewRegistry(), globalParams, bucketStore, logging.NewNoopLogger()) + ratelimiter := ratelimit.NewRateLimiter(prometheus.NewRegistry(), globalParams, bucketStore, testutils.GetLogger()) return ratelimiter, nil diff --git a/common/store/dynamo_store_test.go b/common/store/dynamo_store_test.go index 8ddeebeee8..4e0d6fef35 100644 --- a/common/store/dynamo_store_test.go +++ b/common/store/dynamo_store_test.go @@ -3,6 +3,7 @@ package store_test import ( "context" "fmt" + "os" "testing" "time" @@ -12,14 +13,14 @@ import ( "github.com/Layr-Labs/eigenda/common/aws/dynamodb" test_utils "github.com/Layr-Labs/eigenda/common/aws/dynamodb/utils" "github.com/Layr-Labs/eigenda/common/store" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/inabox/deploy" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/assert" ) var ( - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() dockertestPool *dockertest.Pool dockertestResource *dockertest.Resource diff --git a/common/testutils/test_utils.go b/common/testutils/test_utils.go index e08180b652..2dc25473da 100644 --- a/common/testutils/test_utils.go +++ b/common/testutils/test_utils.go @@ -3,8 +3,10 @@ package testutils import ( "context" "fmt" + "github.com/Layr-Labs/eigensdk-go/logging" "github.com/stretchr/testify/assert" "golang.org/x/exp/rand" + "os" "testing" "time" ) @@ -108,3 +110,7 @@ func RandomString(length int) string { } return string(b) } + +func GetLogger() logging.Logger { + return logging.NewTextSLogger(os.Stdout, &logging.SLoggerOptions{}) +} diff --git a/core/aggregation_test.go b/core/aggregation_test.go index 5b5523180a..a6595f83b4 100644 --- a/core/aggregation_test.go +++ b/core/aggregation_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/core/mock" - "github.com/Layr-Labs/eigensdk-go/logging" gethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/assert" ) @@ -30,7 +30,7 @@ func TestMain(m *testing.M) { if err != nil { panic(err) } - logger := logging.NewTextSLogger(os.Stdout, &logging.SLoggerOptions{}) + logger := testutils.GetLogger() transactor := &mock.MockWriter{} transactor.On("OperatorIDToAddress").Return(gethcommon.Address{}, nil) agg, err = core.NewStdSignatureAggregator(logger, transactor) diff --git a/core/indexer/state_test.go b/core/indexer/state_test.go index 96e463638a..06b62f28cd 100644 --- a/core/indexer/state_test.go +++ b/core/indexer/state_test.go @@ -18,6 +18,7 @@ import ( "github.com/Layr-Labs/eigenda/common" "github.com/Layr-Labs/eigenda/common/geth" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/core/eth" indexedstate "github.com/Layr-Labs/eigenda/core/indexer" @@ -154,7 +155,7 @@ var _ = Describe("Indexer", func() { Skip("No test path provided") } - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() ctx, cancel := context.WithCancel(context.Background()) _ = cancel diff --git a/core/meterer/meterer_test.go b/core/meterer/meterer_test.go index dfc4b5f6b5..ed4b0092d6 100644 --- a/core/meterer/meterer_test.go +++ b/core/meterer/meterer_test.go @@ -12,6 +12,7 @@ import ( "github.com/Layr-Labs/eigenda/common" commonaws "github.com/Layr-Labs/eigenda/common/aws" commondynamodb "github.com/Layr-Labs/eigenda/common/aws/dynamodb" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/core/meterer" "github.com/Layr-Labs/eigenda/core/mock" @@ -22,8 +23,6 @@ import ( "github.com/ory/dockertest/v3" "github.com/stretchr/testify/assert" testifymock "github.com/stretchr/testify/mock" - - "github.com/Layr-Labs/eigensdk-go/logging" ) var ( @@ -101,7 +100,7 @@ func setup(_ *testing.M) { panic("failed to generate private key") } - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() config := meterer.Config{ ChainReadTimeout: 3 * time.Second, UpdateInterval: 1 * time.Second, diff --git a/core/thegraph/state_integration_test.go b/core/thegraph/state_integration_test.go index 8260db5094..e092a1e6b0 100644 --- a/core/thegraph/state_integration_test.go +++ b/core/thegraph/state_integration_test.go @@ -9,6 +9,7 @@ import ( "github.com/Layr-Labs/eigenda/common" "github.com/Layr-Labs/eigenda/common/geth" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core/eth" "github.com/Layr-Labs/eigenda/core/thegraph" "github.com/Layr-Labs/eigenda/inabox/deploy" @@ -81,7 +82,7 @@ func TestIndexerIntegration(t *testing.T) { setup() defer teardown() - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() client := mustMakeTestClient(t, testConfig, testConfig.Batcher[0].BATCHER_PRIVATE_KEY, logger) tx, err := eth.NewWriter(logger, client, testConfig.EigenDA.OperatorStateRetreiver, testConfig.EigenDA.ServiceManager) assert.NoError(t, err) diff --git a/core/thegraph/state_test.go b/core/thegraph/state_test.go index f9fcf4f0af..47dd97db6c 100644 --- a/core/thegraph/state_test.go +++ b/core/thegraph/state_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/core/mock" "github.com/Layr-Labs/eigenda/core/thegraph" - "github.com/Layr-Labs/eigensdk-go/logging" ethcomm "github.com/ethereum/go-ethereum/common" "github.com/shurcooL/graphql" "github.com/stretchr/testify/assert" @@ -26,7 +26,7 @@ func (m mockGraphQLQuerier) Query(ctx context.Context, q any, variables map[stri } func TestIndexedChainState_GetIndexedOperatorState(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() chainState, _ := mock.MakeChainDataMock(map[uint8]int{ 0: 1, @@ -93,7 +93,7 @@ func TestIndexedChainState_GetIndexedOperatorState(t *testing.T) { } func TestIndexedChainState_GetIndexedOperatorStateMissingOperator(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() chainState, _ := mock.MakeChainDataMock(map[uint8]int{ 0: 2, @@ -160,7 +160,7 @@ func TestIndexedChainState_GetIndexedOperatorStateMissingOperator(t *testing.T) } func TestIndexedChainState_GetIndexedOperatorStateExtraOperator(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() chainState, _ := mock.MakeChainDataMock(map[uint8]int{ 0: 1, @@ -243,7 +243,7 @@ func TestIndexedChainState_GetIndexedOperatorStateExtraOperator(t *testing.T) { } func TestIndexedChainState_GetIndexedOperatorInfoByOperatorId(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() chainState, _ := mock.MakeChainDataMock(map[uint8]int{ 0: 1, diff --git a/core/v2/core_test.go b/core/v2/core_test.go index e4ecd520b3..80c49c11ff 100644 --- a/core/v2/core_test.go +++ b/core/v2/core_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/Layr-Labs/eigenda/common" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/core/mock" corev2 "github.com/Layr-Labs/eigenda/core/v2" @@ -18,7 +19,6 @@ import ( "github.com/Layr-Labs/eigenda/encoding/kzg/prover" "github.com/Layr-Labs/eigenda/encoding/kzg/verifier" "github.com/Layr-Labs/eigenda/encoding/utils/codec" - "github.com/Layr-Labs/eigensdk-go/logging" gethcommon "github.com/ethereum/go-ethereum/common" "github.com/gammazero/workerpool" "github.com/hashicorp/go-multierror" @@ -53,7 +53,7 @@ func TestMain(m *testing.M) { if err != nil { panic(err) } - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() reader := &mock.MockWriter{} reader.On("OperatorIDToAddress").Return(gethcommon.Address{}, nil) agg, err = core.NewStdSignatureAggregator(logger, reader) @@ -227,7 +227,7 @@ func checkBatchByUniversalVerifier( for id := range state.IndexedOperators { - val := corev2.NewShardValidator(v, id, logging.NewNoopLogger()) + val := corev2.NewShardValidator(v, id, testutils.GetLogger()) blobs := packagedBlobs[id] diff --git a/disperser/apiserver/server_test.go b/disperser/apiserver/server_test.go index 29f4f74a94..a740c7518c 100644 --- a/disperser/apiserver/server_test.go +++ b/disperser/apiserver/server_test.go @@ -5,6 +5,7 @@ import ( "crypto/rand" "flag" "fmt" + "math" "math/big" "net" @@ -22,7 +23,6 @@ import ( "github.com/Layr-Labs/eigenda/encoding/kzg" p "github.com/Layr-Labs/eigenda/encoding/kzg/prover" "github.com/Layr-Labs/eigenda/encoding/utils/codec" - "github.com/Layr-Labs/eigensdk-go/logging" gethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/google/uuid" @@ -37,6 +37,7 @@ import ( "github.com/Layr-Labs/eigenda/common/aws/s3" "github.com/Layr-Labs/eigenda/common/ratelimit" "github.com/Layr-Labs/eigenda/common/store" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/disperser" "github.com/Layr-Labs/eigenda/inabox/deploy" @@ -718,7 +719,7 @@ func teardown() { } func newTestServer(transactor core.Writer, testName string) *apiserver.DispersalServer { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() awsConfig := aws.ClientConfig{ Region: "us-east-1", diff --git a/disperser/apiserver/server_v2_test.go b/disperser/apiserver/server_v2_test.go index 1d9d76e4e8..4cb370ce0d 100644 --- a/disperser/apiserver/server_v2_test.go +++ b/disperser/apiserver/server_v2_test.go @@ -13,6 +13,7 @@ import ( "github.com/Layr-Labs/eigenda/common/aws" "github.com/Layr-Labs/eigenda/common/aws/dynamodb" "github.com/Layr-Labs/eigenda/common/aws/s3" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" auth "github.com/Layr-Labs/eigenda/core/auth/v2" "github.com/Layr-Labs/eigenda/core/meterer" @@ -24,7 +25,6 @@ import ( "github.com/Layr-Labs/eigenda/disperser/common/v2/blobstore" "github.com/Layr-Labs/eigenda/encoding" "github.com/Layr-Labs/eigenda/encoding/utils/codec" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254" "google.golang.org/grpc/peer" @@ -412,7 +412,7 @@ func TestV2GetBlobCommitment(t *testing.T) { } func newTestServerV2(t *testing.T) *testComponents { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() // logger, err := common.NewLogger(common.DefaultLoggerConfig()) // if err != nil { // panic("failed to create logger") diff --git a/disperser/batcher/batcher_test.go b/disperser/batcher/batcher_test.go index 53c7950eff..e042654190 100644 --- a/disperser/batcher/batcher_test.go +++ b/disperser/batcher/batcher_test.go @@ -4,6 +4,7 @@ import ( "context" "encoding/hex" "errors" + "math/big" "runtime" "sync" @@ -11,9 +12,8 @@ import ( "time" "github.com/Layr-Labs/eigenda/common" - "github.com/Layr-Labs/eigensdk-go/logging" - cmock "github.com/Layr-Labs/eigenda/common/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" "github.com/Layr-Labs/eigenda/disperser" @@ -78,7 +78,7 @@ func makeBatcher(t *testing.T) (*batcherComponents, *bat.Batcher, func() []time. // Common Components // logger, err := common.NewLogger(common.DefaultLoggerConfig()) // assert.NoError(t, err) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() finalizationBlockDelay := uint(75) diff --git a/disperser/batcher/encoding_streamer_test.go b/disperser/batcher/encoding_streamer_test.go index fc05b8254c..8a583e8d39 100644 --- a/disperser/batcher/encoding_streamer_test.go +++ b/disperser/batcher/encoding_streamer_test.go @@ -8,13 +8,13 @@ import ( "time" cmock "github.com/Layr-Labs/eigenda/common/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" "github.com/Layr-Labs/eigenda/disperser" "github.com/Layr-Labs/eigenda/disperser/batcher" "github.com/Layr-Labs/eigenda/disperser/common/inmem" "github.com/Layr-Labs/eigenda/disperser/mock" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/gammazero/workerpool" "github.com/stretchr/testify/assert" tmock "github.com/stretchr/testify/mock" @@ -39,7 +39,7 @@ type components struct { } func createEncodingStreamer(t *testing.T, initialBlockNumber uint, batchThreshold uint64, streamerConfig batcher.StreamerConfig) (*batcher.EncodingStreamer, *components) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() blobStore := inmem.NewBlobStore() cst, err := coremock.MakeChainDataMock(map[uint8]int{ 0: numOperators, @@ -66,7 +66,7 @@ func createEncodingStreamer(t *testing.T, initialBlockNumber uint, batchThreshol } func TestEncodingQueueLimit(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() blobStore := inmem.NewBlobStore() cst, err := coremock.MakeChainDataMock(map[uint8]int{ 0: numOperators, @@ -296,7 +296,7 @@ func TestStreamingEncoding(t *testing.T) { } func TestEncodingFailure(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() blobStore := inmem.NewBlobStore() cst, err := coremock.MakeChainDataMock(map[uint8]int{ 0: numOperators, diff --git a/disperser/batcher/finalizer_test.go b/disperser/batcher/finalizer_test.go index 2bc18d295c..68a1b69817 100644 --- a/disperser/batcher/finalizer_test.go +++ b/disperser/batcher/finalizer_test.go @@ -7,12 +7,12 @@ import ( "time" "github.com/Layr-Labs/eigenda/common/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/disperser" "github.com/Layr-Labs/eigenda/disperser/batcher" "github.com/Layr-Labs/eigenda/disperser/common/inmem" "github.com/Layr-Labs/eigenda/encoding" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" @@ -26,7 +26,7 @@ const loopInterval = 6 * time.Minute func TestFinalizedBlob(t *testing.T) { queue := inmem.NewBlobStore() - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() ethClient := &mock.MockEthClient{} rpcClient := &mock.MockRPCEthClient{} @@ -125,7 +125,7 @@ func TestFinalizedBlob(t *testing.T) { func TestUnfinalizedBlob(t *testing.T) { ctx := context.Background() queue := inmem.NewBlobStore() - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() ethClient := &mock.MockEthClient{} rpcClient := &mock.MockRPCEthClient{} @@ -198,7 +198,7 @@ func TestUnfinalizedBlob(t *testing.T) { func TestNoReceipt(t *testing.T) { ctx := context.Background() queue := inmem.NewBlobStore() - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() ethClient := &mock.MockEthClient{} rpcClient := &mock.MockRPCEthClient{} diff --git a/disperser/batcher/txn_manager_test.go b/disperser/batcher/txn_manager_test.go index c3886898e4..628d8de305 100644 --- a/disperser/batcher/txn_manager_test.go +++ b/disperser/batcher/txn_manager_test.go @@ -8,10 +8,10 @@ import ( "time" "github.com/Layr-Labs/eigenda/common/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/disperser/batcher" sdkmock "github.com/Layr-Labs/eigensdk-go/chainio/clients/mocks" walletsdk "github.com/Layr-Labs/eigensdk-go/chainio/clients/wallet" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/assert" @@ -22,7 +22,7 @@ func TestProcessTransaction(t *testing.T) { ethClient := &mock.MockEthClient{} ctrl := gomock.NewController(t) w := sdkmock.NewMockWallet(ctrl) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() metrics := batcher.NewMetrics("9100", logger) txnManager := batcher.NewTxnManager(ethClient, w, 0, 5, 100*time.Millisecond, 100*time.Millisecond, logger, metrics.TxnManagerMetrics) ctx, cancel := context.WithTimeout(context.Background(), time.Second*1) @@ -72,7 +72,7 @@ func TestReplaceGasFee(t *testing.T) { ethClient := &mock.MockEthClient{} ctrl := gomock.NewController(t) w := sdkmock.NewMockWallet(ctrl) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() metrics := batcher.NewMetrics("9100", logger) txnManager := batcher.NewTxnManager(ethClient, w, 0, 5, 100*time.Millisecond, 100*time.Millisecond, logger, metrics.TxnManagerMetrics) ctx, cancel := context.WithTimeout(context.Background(), time.Second*1) @@ -108,7 +108,7 @@ func TestTransactionReplacementFailure(t *testing.T) { ethClient := &mock.MockEthClient{} ctrl := gomock.NewController(t) w := sdkmock.NewMockWallet(ctrl) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() metrics := batcher.NewMetrics("9100", logger) txnManager := batcher.NewTxnManager(ethClient, w, 0, 5, time.Second, 48*time.Second, logger, metrics.TxnManagerMetrics) ctx, cancel := context.WithTimeout(context.Background(), time.Second*1) @@ -141,7 +141,7 @@ func TestSendTransactionReceiptRetry(t *testing.T) { ethClient := &mock.MockEthClient{} ctrl := gomock.NewController(t) w := sdkmock.NewMockWallet(ctrl) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() metrics := batcher.NewMetrics("9100", logger) txnManager := batcher.NewTxnManager(ethClient, w, 0, 5, time.Second, 48*time.Second, logger, metrics.TxnManagerMetrics) ctx, cancel := context.WithTimeout(context.Background(), time.Second*1) @@ -179,7 +179,7 @@ func TestSendTransactionRetrySuccess(t *testing.T) { ethClient := &mock.MockEthClient{} ctrl := gomock.NewController(t) w := sdkmock.NewMockWallet(ctrl) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() metrics := batcher.NewMetrics("9100", logger) txnManager := batcher.NewTxnManager(ethClient, w, 0, 5, time.Second, 48*time.Second, logger, metrics.TxnManagerMetrics) ctx, cancel := context.WithTimeout(context.Background(), time.Second*1) @@ -221,7 +221,7 @@ func TestSendTransactionRetryFailure(t *testing.T) { ethClient := &mock.MockEthClient{} ctrl := gomock.NewController(t) w := sdkmock.NewMockWallet(ctrl) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() metrics := batcher.NewMetrics("9100", logger) txnManager := batcher.NewTxnManager(ethClient, w, 0, 5, time.Second, 48*time.Second, logger, metrics.TxnManagerMetrics) ctx, cancel := context.WithTimeout(context.Background(), time.Second*1) @@ -259,7 +259,7 @@ func TestTransactionNotBroadcasted(t *testing.T) { ethClient := &mock.MockEthClient{} ctrl := gomock.NewController(t) w := sdkmock.NewMockWallet(ctrl) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() metrics := batcher.NewMetrics("9100", logger) txnManager := batcher.NewTxnManager(ethClient, w, 0, 5, 100*time.Millisecond, 48*time.Second, logger, metrics.TxnManagerMetrics) ctx, cancel := context.WithTimeout(context.Background(), time.Second*1) diff --git a/disperser/common/blobstore/blobstore_test.go b/disperser/common/blobstore/blobstore_test.go index 23aa2bafe0..5d2dbcb3ef 100644 --- a/disperser/common/blobstore/blobstore_test.go +++ b/disperser/common/blobstore/blobstore_test.go @@ -10,10 +10,10 @@ import ( "github.com/Layr-Labs/eigenda/common/aws" "github.com/Layr-Labs/eigenda/common/aws/dynamodb" test_utils "github.com/Layr-Labs/eigenda/common/aws/dynamodb/utils" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/google/uuid" awsmock "github.com/Layr-Labs/eigenda/common/aws/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/disperser/common/blobstore" "github.com/Layr-Labs/eigenda/inabox/deploy" @@ -21,7 +21,7 @@ import ( ) var ( - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() securityParams = []*core.SecurityParam{{ QuorumID: 1, AdversaryThreshold: 80, diff --git a/disperser/common/v2/blobstore/blobstore_test.go b/disperser/common/v2/blobstore/blobstore_test.go index a864e3b03f..56be90f73e 100644 --- a/disperser/common/v2/blobstore/blobstore_test.go +++ b/disperser/common/v2/blobstore/blobstore_test.go @@ -12,9 +12,9 @@ import ( test_utils "github.com/Layr-Labs/eigenda/common/aws/dynamodb/utils" "github.com/Layr-Labs/eigenda/common/aws/mock" "github.com/Layr-Labs/eigenda/common/aws/s3" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/encoding" "github.com/Layr-Labs/eigenda/inabox/deploy" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/consensys/gnark-crypto/ecc/bn254/fp" "github.com/google/uuid" @@ -24,7 +24,7 @@ import ( ) var ( - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() dockertestPool *dockertest.Pool dockertestResource *dockertest.Resource diff --git a/disperser/controller/controller_test.go b/disperser/controller/controller_test.go index dd1f0efa86..144551fe51 100644 --- a/disperser/controller/controller_test.go +++ b/disperser/controller/controller_test.go @@ -13,12 +13,12 @@ import ( "github.com/Layr-Labs/eigenda/common/aws/dynamodb" test_utils "github.com/Layr-Labs/eigenda/common/aws/dynamodb/utils" "github.com/Layr-Labs/eigenda/common/aws/s3" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" corev2 "github.com/Layr-Labs/eigenda/core/v2" "github.com/Layr-Labs/eigenda/disperser/common/v2/blobstore" "github.com/Layr-Labs/eigenda/encoding" "github.com/Layr-Labs/eigenda/inabox/deploy" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/consensys/gnark-crypto/ecc/bn254/fp" "github.com/google/uuid" @@ -27,7 +27,7 @@ import ( ) var ( - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() dockertestPool *dockertest.Pool dockertestResource *dockertest.Resource diff --git a/disperser/controller/dispatcher_test.go b/disperser/controller/dispatcher_test.go index 84ba68198b..400c859701 100644 --- a/disperser/controller/dispatcher_test.go +++ b/disperser/controller/dispatcher_test.go @@ -307,7 +307,7 @@ func deleteBlobs(t *testing.T, blobMetadataStore *blobstore.BlobMetadataStore, k } func newDispatcherComponents(t *testing.T) *dispatcherComponents { - // logger := logging.NewNoopLogger() + // logger := testutils.GetLogger() logger, err := common.NewLogger(common.DefaultLoggerConfig()) require.NoError(t, err) pool := workerpool.New(5) diff --git a/disperser/controller/encoding_manager_test.go b/disperser/controller/encoding_manager_test.go index e72d5f67e8..29ec52d811 100644 --- a/disperser/controller/encoding_manager_test.go +++ b/disperser/controller/encoding_manager_test.go @@ -8,6 +8,7 @@ import ( "github.com/Layr-Labs/eigenda/common" commonmock "github.com/Layr-Labs/eigenda/common/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" corev2 "github.com/Layr-Labs/eigenda/core/v2" @@ -17,7 +18,6 @@ import ( "github.com/Layr-Labs/eigenda/disperser/controller" dispmock "github.com/Layr-Labs/eigenda/disperser/mock" "github.com/Layr-Labs/eigenda/encoding" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/gammazero/workerpool" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -283,7 +283,7 @@ func TestEncodingManagerHandleBatchRetryFailure(t *testing.T) { } func newTestComponents(t *testing.T, mockPool bool) *testComponents { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() // logger, err := common.NewLogger(common.DefaultLoggerConfig()) // require.NoError(t, err) var pool common.WorkerPool diff --git a/disperser/dataapi/server_test.go b/disperser/dataapi/server_test.go index 05c23efc3f..8d63035d81 100644 --- a/disperser/dataapi/server_test.go +++ b/disperser/dataapi/server_test.go @@ -15,6 +15,7 @@ import ( "testing" "time" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" "github.com/Layr-Labs/eigenda/disperser" @@ -24,7 +25,6 @@ import ( "github.com/Layr-Labs/eigenda/disperser/dataapi/subgraph" subgraphmock "github.com/Layr-Labs/eigenda/disperser/dataapi/subgraph/mock" "github.com/Layr-Labs/eigenda/encoding" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254/fp" "github.com/ethereum/go-ethereum/common" gethcommon "github.com/ethereum/go-ethereum/common" @@ -43,7 +43,7 @@ var ( mockPrometheusRespAvgThroughput string expectedBlobCommitment *encoding.BlobCommitments - mockLogger = logging.NewNoopLogger() + mockLogger = testutils.GetLogger() blobstore = inmem.NewBlobStore() mockPrometheusApi = &prommock.MockPrometheusApi{} prometheusClient = dataapi.NewPrometheusClient(mockPrometheusApi, "test-cluster") diff --git a/disperser/dataapi/server_v2_test.go b/disperser/dataapi/server_v2_test.go index 23cc9abf7b..88f35dfabf 100644 --- a/disperser/dataapi/server_v2_test.go +++ b/disperser/dataapi/server_v2_test.go @@ -17,6 +17,7 @@ import ( "github.com/Layr-Labs/eigenda/common/aws" "github.com/Layr-Labs/eigenda/common/aws/dynamodb" test_utils "github.com/Layr-Labs/eigenda/common/aws/dynamodb/utils" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" corev2 "github.com/Layr-Labs/eigenda/core/v2" commonv2 "github.com/Layr-Labs/eigenda/disperser/common/v2" @@ -24,7 +25,6 @@ import ( "github.com/Layr-Labs/eigenda/disperser/dataapi" "github.com/Layr-Labs/eigenda/encoding" "github.com/Layr-Labs/eigenda/inabox/deploy" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/consensys/gnark-crypto/ecc/bn254/fp" "github.com/google/uuid" @@ -37,7 +37,7 @@ var ( blobMetadataStore *blobstorev2.BlobMetadataStore testDataApiServerV2 *dataapi.ServerV2 - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() // Local stack localStackPort = "4566" diff --git a/disperser/dataapi/subgraph_client_test.go b/disperser/dataapi/subgraph_client_test.go index 1d3768359c..5282ca45e9 100644 --- a/disperser/dataapi/subgraph_client_test.go +++ b/disperser/dataapi/subgraph_client_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/disperser/dataapi" "github.com/Layr-Labs/eigenda/disperser/dataapi/subgraph" subgraphmock "github.com/Layr-Labs/eigenda/disperser/dataapi/subgraph/mock" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/shurcooL/graphql" "github.com/stretchr/testify/assert" ) @@ -436,7 +436,7 @@ var ( func TestQueryBatchesWithLimit(t *testing.T) { mockSubgraphApi := &subgraphmock.MockSubgraphApi{} - subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, logging.NewNoopLogger()) + subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, testutils.GetLogger()) mockSubgraphApi.On("QueryBatches").Return(subgraphBatches, nil) batches, err := subgraphClient.QueryBatchesWithLimit(context.Background(), 2, 0) assert.NoError(t, err) @@ -463,7 +463,7 @@ func TestQueryBatchesWithLimit(t *testing.T) { func TestQueryOperators(t *testing.T) { mockSubgraphApi := &subgraphmock.MockSubgraphApi{} mockSubgraphApi.On("QueryOperators").Return(subgraphOperatorRegistereds, nil) - subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, logging.NewNoopLogger()) + subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, testutils.GetLogger()) operators, err := subgraphClient.QueryOperatorsWithLimit(context.Background(), 2) assert.NoError(t, err) @@ -490,7 +490,7 @@ func TestQueryIndexedDeregisteredOperatorsForTimeWindow(t *testing.T) { mockSubgraphApi := &subgraphmock.MockSubgraphApi{} mockSubgraphApi.On("QueryDeregisteredOperatorsGreaterThanBlockTimestamp").Return(subgraphOperatorDeregistered, nil) mockSubgraphApi.On("QueryOperatorInfoByOperatorIdAtBlockNumber").Return(subgraphIndexedOperatorInfo1, nil) - subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, logging.NewNoopLogger()) + subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, testutils.GetLogger()) indexedDeregisteredOperatorState, err := subgraphClient.QueryIndexedOperatorsWithStateForTimeWindow(context.Background(), 1, dataapi.Deregistered) assert.NoError(t, err) @@ -519,7 +519,7 @@ func TestQueryIndexedRegisteredOperatorsForTimeWindow(t *testing.T) { mockSubgraphApi := &subgraphmock.MockSubgraphApi{} mockSubgraphApi.On("QueryRegisteredOperatorsGreaterThanBlockTimestamp").Return(subgraphOperatorRegistered, nil) mockSubgraphApi.On("QueryOperatorInfoByOperatorIdAtBlockNumber").Return(subgraphIndexedOperatorInfo1, nil) - subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, logging.NewNoopLogger()) + subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, testutils.GetLogger()) indexedRegisteredOperatorState, err := subgraphClient.QueryIndexedOperatorsWithStateForTimeWindow(context.Background(), 1, dataapi.Registered) assert.NoError(t, err) @@ -547,7 +547,7 @@ func TestQueryIndexedRegisteredOperatorsForTimeWindow(t *testing.T) { func TestQueryBatchNonSigningInfoInInterval(t *testing.T) { mockSubgraphApi := &subgraphmock.MockSubgraphApi{} mockSubgraphApi.On("QueryBatchNonSigningInfo", int64(0), int64(1)).Return(batchNonSigningInfo, nil) - subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, logging.NewNoopLogger()) + subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, testutils.GetLogger()) result, err := subgraphClient.QueryBatchNonSigningInfoInInterval(context.Background(), 0, 1) assert.NoError(t, err) assert.Equal(t, 2, len(result)) @@ -582,7 +582,7 @@ func TestQueryOperatorQuorumEvent(t *testing.T) { mockSubgraphApi := &subgraphmock.MockSubgraphApi{} mockSubgraphApi.On("QueryOperatorAddedToQuorum").Return(operatorAddedToQuorum, nil) mockSubgraphApi.On("QueryOperatorRemovedFromQuorum").Return(operatorRemovedFromQuorum, nil) - subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, logging.NewNoopLogger()) + subgraphClient := dataapi.NewSubgraphClient(mockSubgraphApi, testutils.GetLogger()) result, err := subgraphClient.QueryOperatorQuorumEvent(context.Background(), uint32(78), uint32(88)) assert.NoError(t, err) diff --git a/disperser/encoder/server_test.go b/disperser/encoder/server_test.go index b8c83e0503..a438cf8b5b 100644 --- a/disperser/encoder/server_test.go +++ b/disperser/encoder/server_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/encoding/kzg" encmock "github.com/Layr-Labs/eigenda/encoding/mock" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" @@ -32,7 +32,7 @@ var ( gettysburgAddressBytes = []byte("Fourscore and seven years ago our fathers brought forth, on this continent, a new nation, conceived in liberty, and dedicated to the proposition that all men are created equal. Now we are engaged in a great civil war, testing whether that nation, or any nation so conceived, and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting-place for those who here gave their lives, that that nation might live. It is altogether fitting and proper that we should do this. But, in a larger sense, we cannot dedicate, we cannot consecrate—we cannot hallow—this ground. The brave men, living and dead, who struggled here, have consecrated it far above our poor power to add or detract. The world will little note, nor long remember what we say here, but it can never forget what they did here. It is for us the living, rather, to be dedicated here to the unfinished work which they who fought here have thus far so nobly advanced. It is rather for us to be here dedicated to the great task remaining before us—that from these honored dead we take increased devotion to that cause for which they here gave the last full measure of devotion—that we here highly resolve that these dead shall not have died in vain—that this nation, under God, shall have a new birth of freedom, and that government of the people, by the people, for the people, shall not perish from the earth.") ) -var logger = logging.NewNoopLogger() +var logger = testutils.GetLogger() func makeTestProver(numPoint uint64) (encoding.Prover, ServerConfig) { kzgConfig := &kzg.KzgConfig{ diff --git a/disperser/encoder/setup_test.go b/disperser/encoder/setup_test.go index cb6df6fd95..3982346a0b 100644 --- a/disperser/encoder/setup_test.go +++ b/disperser/encoder/setup_test.go @@ -5,15 +5,15 @@ import ( "os" "testing" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/encoding" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/consensys/gnark-crypto/ecc/bn254/fp" "github.com/google/uuid" ) var ( - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() UUID = uuid.New() s3BucketName = "test-eigenda" mockCommitment = encoding.BlobCommitments{} diff --git a/indexer/eth/header_service_test.go b/indexer/eth/header_service_test.go index bbef1a108f..a351b9fb99 100644 --- a/indexer/eth/header_service_test.go +++ b/indexer/eth/header_service_test.go @@ -7,10 +7,9 @@ import ( "testing" cm "github.com/Layr-Labs/eigenda/common/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/indexer" "github.com/Layr-Labs/eigenda/indexer/eth" - "github.com/Layr-Labs/eigensdk-go/logging" - "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" @@ -20,7 +19,7 @@ import ( ) var ( - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() blockNumber int64 = 17320293 ) diff --git a/indexer/test/indexer_test.go b/indexer/test/indexer_test.go index 1c5d9eecbb..5a9c32a31e 100644 --- a/indexer/test/indexer_test.go +++ b/indexer/test/indexer_test.go @@ -2,21 +2,22 @@ package weth_test import ( "context" + "testing" "time" "github.com/Layr-Labs/eigenda/indexer" - "github.com/Layr-Labs/eigensdk-go/logging" ethereumcm "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/assert" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/indexer/eth" "github.com/Layr-Labs/eigenda/indexer/test/mock" "github.com/Layr-Labs/eigenda/indexer/inmem" ) -var logger = logging.NewNoopLogger() +var logger = testutils.GetLogger() func newTestFilterer(sc *mock.ContractSimulator, isFastMode bool) *Filterer { return &Filterer{ diff --git a/node/operator_test.go b/node/operator_test.go index f88342054f..bf33637a31 100644 --- a/node/operator_test.go +++ b/node/operator_test.go @@ -2,22 +2,23 @@ package node_test import ( "context" + "strings" "testing" "time" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" "github.com/Layr-Labs/eigenda/node" nodemock "github.com/Layr-Labs/eigenda/node/mock" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) func TestRegisterOperator(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() operatorID := [32]byte(hexutil.MustDecode("0x3fbfefcdc76462d2cdb7d0cea75f27223829481b8b4aa6881c94cb2126a316ad")) keyPair, err := core.GenRandomBlsKeys() assert.NoError(t, err) @@ -58,7 +59,7 @@ func TestRegisterOperator(t *testing.T) { } func TestRegisterOperatorWithChurn(t *testing.T) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() operatorID := [32]byte(hexutil.MustDecode("0x3fbfefcdc76462d2cdb7d0cea75f27223829481b8b4aa6881c94cb2126a316ad")) keyPair, err := core.GenRandomBlsKeys() assert.NoError(t, err) diff --git a/node/store_test.go b/node/store_test.go index ef64a78e90..39789f8e59 100644 --- a/node/store_test.go +++ b/node/store_test.go @@ -15,8 +15,8 @@ import ( "github.com/Layr-Labs/eigenda/encoding" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/node" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/Layr-Labs/eigensdk-go/metrics" "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/consensys/gnark-crypto/ecc/bn254/fp" @@ -213,7 +213,7 @@ func CreateBatchWith(t *testing.T, encodeBundle bool) (*core.BatchHeader, []*cor func createStore(t *testing.T) *node.Store { noopMetrics := metrics.NewNoopMetrics() reg := prometheus.NewRegistry() - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() operatorId := [32]byte(hexutil.MustDecode("0x3fbfefcdc76462d2cdb7d0cea75f27223829481b8b4aa6881c94cb2126a316ad")) tx := &coremock.MockWriter{} dat, _ := mock.MakeChainDataMock(map[uint8]int{ diff --git a/node/store_v2_test.go b/node/store_v2_test.go index 26ee3a3bc0..407ff5c500 100644 --- a/node/store_v2_test.go +++ b/node/store_v2_test.go @@ -6,11 +6,11 @@ import ( "github.com/Layr-Labs/eigenda/common/kvstore" "github.com/Layr-Labs/eigenda/common/kvstore/tablestore" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" corev2 "github.com/Layr-Labs/eigenda/core/v2" "github.com/Layr-Labs/eigenda/node" nodemock "github.com/Layr-Labs/eigenda/node/mock" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -162,7 +162,7 @@ func TestGetChunks(t *testing.T) { } func createStoreV2(t *testing.T) (node.StoreV2, kvstore.TableStore) { - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() config := tablestore.DefaultLevelDBConfig(t.TempDir()) config.Schema = []string{node.BatchHeaderTableName, node.BlobCertificateTableName, node.BundleTableName} tStore, err := tablestore.Start(logger, config) diff --git a/operators/churner/server_test.go b/operators/churner/server_test.go index 5c7c471b7f..ec75f1c71f 100644 --- a/operators/churner/server_test.go +++ b/operators/churner/server_test.go @@ -10,12 +10,12 @@ import ( "github.com/Layr-Labs/eigenda/common" "github.com/Layr-Labs/eigenda/common/geth" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" dacore "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" indexermock "github.com/Layr-Labs/eigenda/core/mock" "github.com/Layr-Labs/eigenda/operators/churner" - "github.com/Layr-Labs/eigensdk-go/logging" gethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/assert" @@ -27,7 +27,7 @@ import ( var ( keyPair *dacore.KeyPair quorumIds = []uint32{0, 1} - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() transactorMock = &coremock.MockWriter{} mockIndexer = &indexermock.MockIndexedChainState{} operatorAddr = gethcommon.HexToAddress("0x0000000000000000000000000000000000000001") diff --git a/operators/churner/tests/churner_test.go b/operators/churner/tests/churner_test.go index ba9f11c522..6267667fd1 100644 --- a/operators/churner/tests/churner_test.go +++ b/operators/churner/tests/churner_test.go @@ -14,6 +14,7 @@ import ( pb "github.com/Layr-Labs/eigenda/api/grpc/churner" "github.com/Layr-Labs/eigenda/common" "github.com/Layr-Labs/eigenda/common/geth" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core" dacore "github.com/Layr-Labs/eigenda/core" "github.com/Layr-Labs/eigenda/core/eth" @@ -37,7 +38,7 @@ var ( testConfig *deploy.Config templateName string testName string - logger = logging.NewNoopLogger() + logger = testutils.GetLogger() mockIndexer = &indexermock.MockIndexedChainState{} rpcURL = "http://localhost:8545" quorumIds = []uint32{0, 1} diff --git a/relay/chunkstore/chunk_store_test.go b/relay/chunkstore/chunk_store_test.go index 6d0c3e2d3e..8aedde11e4 100644 --- a/relay/chunkstore/chunk_store_test.go +++ b/relay/chunkstore/chunk_store_test.go @@ -10,13 +10,13 @@ import ( "github.com/Layr-Labs/eigenda/common/aws" "github.com/Layr-Labs/eigenda/common/aws/mock" "github.com/Layr-Labs/eigenda/common/aws/s3" + "github.com/Layr-Labs/eigenda/common/testutils" tu "github.com/Layr-Labs/eigenda/common/testutils" corev2 "github.com/Layr-Labs/eigenda/core/v2" "github.com/Layr-Labs/eigenda/encoding" "github.com/Layr-Labs/eigenda/encoding/rs" "github.com/Layr-Labs/eigenda/encoding/utils/codec" "github.com/Layr-Labs/eigenda/inabox/deploy" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/consensys/gnark-crypto/ecc/bn254/fp" "github.com/ory/dockertest/v3" "github.com/stretchr/testify/assert" @@ -262,7 +262,7 @@ func TestCheckProofCoefficientsExist(t *testing.T) { // logger, err := common.NewLogger(common.DefaultLoggerConfig()) // require.NoError(t, err) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() chunkSize := uint64(rand.Intn(1024) + 100) fragmentSize := int(chunkSize / 2) diff --git a/retriever/eth/chain_client_test.go b/retriever/eth/chain_client_test.go index fe66e1c6ca..80edd2f177 100644 --- a/retriever/eth/chain_client_test.go +++ b/retriever/eth/chain_client_test.go @@ -3,14 +3,15 @@ package eth_test import ( "context" "encoding/hex" + "math/big" "testing" "github.com/Layr-Labs/eigenda/common" damock "github.com/Layr-Labs/eigenda/common/mock" + "github.com/Layr-Labs/eigenda/common/testutils" binding "github.com/Layr-Labs/eigenda/contracts/bindings/EigenDAServiceManager" "github.com/Layr-Labs/eigenda/retriever/eth" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/ethereum/go-ethereum" gcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" @@ -19,7 +20,7 @@ import ( func TestFetchBatchHeader(t *testing.T) { ethClient := &damock.MockEthClient{} - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() serviceManagerAddress := gcommon.HexToAddress("0x0000000000000000000000000000000000000000") batchHeaderHash := []byte("hashhash") chainClient := eth.NewChainClient(ethClient, logger) diff --git a/retriever/server_test.go b/retriever/server_test.go index 79e2b22a8e..2617ec2f5a 100644 --- a/retriever/server_test.go +++ b/retriever/server_test.go @@ -8,6 +8,7 @@ import ( clientsmock "github.com/Layr-Labs/eigenda/api/clients/mock" pb "github.com/Layr-Labs/eigenda/api/grpc/retriever" + "github.com/Layr-Labs/eigenda/common/testutils" binding "github.com/Layr-Labs/eigenda/contracts/bindings/EigenDAServiceManager" "github.com/Layr-Labs/eigenda/core" coremock "github.com/Layr-Labs/eigenda/core/mock" @@ -18,7 +19,6 @@ import ( "github.com/Layr-Labs/eigenda/encoding/utils/codec" "github.com/Layr-Labs/eigenda/retriever" "github.com/Layr-Labs/eigenda/retriever/mock" - "github.com/Layr-Labs/eigensdk-go/logging" "github.com/stretchr/testify/assert" ) @@ -61,7 +61,7 @@ func newTestServer(t *testing.T) *retriever.Server { var err error config := &retriever.Config{} - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() indexedChainState, err = coremock.MakeChainDataMock(map[uint8]int{ 0: numOperators, diff --git a/test/integration_test.go b/test/integration_test.go index 5016f3598f..7b2e64cda0 100644 --- a/test/integration_test.go +++ b/test/integration_test.go @@ -28,6 +28,7 @@ import ( clientsmock "github.com/Layr-Labs/eigenda/api/clients/mock" commonaws "github.com/Layr-Labs/eigenda/common/aws" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/core/meterer" "github.com/Layr-Labs/eigenda/disperser/apiserver" dispatcher "github.com/Layr-Labs/eigenda/disperser/batcher/grpc" @@ -473,7 +474,7 @@ func TestDispersalAndRetrieval(t *testing.T) { cst.On("GetCurrentBlockNumber").Return(uint(10), nil) - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() assert.NoError(t, err) store := inmem.NewBlobStore() dis := mustMakeDisperser(t, cst, store, logger) diff --git a/tools/traffic/generator_test.go b/tools/traffic/generator_test.go index b530ef5bd2..d0db0b9d2e 100644 --- a/tools/traffic/generator_test.go +++ b/tools/traffic/generator_test.go @@ -7,16 +7,15 @@ import ( "github.com/Layr-Labs/eigenda/api/clients" clientsmock "github.com/Layr-Labs/eigenda/api/clients/mock" + "github.com/Layr-Labs/eigenda/common/testutils" "github.com/Layr-Labs/eigenda/disperser" "github.com/Layr-Labs/eigenda/tools/traffic" - "github.com/Layr-Labs/eigensdk-go/logging" - "github.com/stretchr/testify/mock" ) func TestTrafficGenerator(t *testing.T) { disperserClient := clientsmock.NewMockDisperserClient() - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() trafficGenerator := &traffic.TrafficGenerator{ Logger: logger, Config: &traffic.Config{ @@ -43,7 +42,7 @@ func TestTrafficGenerator(t *testing.T) { func TestTrafficGeneratorAuthenticated(t *testing.T) { disperserClient := clientsmock.NewMockDisperserClient() - logger := logging.NewNoopLogger() + logger := testutils.GetLogger() trafficGenerator := &traffic.TrafficGenerator{ Logger: logger,