fix: use new interfaces

Author: goran-ethernal

aggsender/aggsender_test.go

@@ -26,7 +26,6 @@ import (
 	mocksdb "github.com/agglayer/aggkit/db/compatibility/mocks"
 	"github.com/agglayer/aggkit/grpc"
 	"github.com/agglayer/aggkit/log"
-	treetypes "github.com/agglayer/aggkit/tree/types"
 	"github.com/agglayer/go_signer/signer"
 	signertypes "github.com/agglayer/go_signer/signer/types"
 	"github.com/ethereum/go-ethereum/common"
@@ -196,73 +195,6 @@ func TestExploratoryGenerateCert(t *testing.T) {
 	require.NoError(t, encoder.Encode(certificate))
 }
 
-func TestSendCertificate_NoClaims(t *testing.T) {
-	privateKey, err := crypto.GenerateKey()
-	require.NoError(t, err)
-
-	ctx := context.Background()
-	mockStorage := mocks.NewAggSenderStorage(t)
-	mockL2BridgeQuerier := mocks.NewBridgeQuerier(t)
-	mockL1Querier := mocks.NewL1InfoTreeDataQuerier(t)
-	mockAggLayerClient := agglayer.NewAgglayerClientMock(t)
-	mockEpochNotifier := mocks.NewEpochNotifier(t)
-	mockLERQuerier := mocks.NewLERQuerier(t)
-	logger := log.WithFields("aggsender-test", "no claims test")
-	signer := signer.NewLocalSignFromPrivateKey("ut", log.WithFields("aggsender", 1), privateKey, 0)
-	aggSender := &AggSender{
-		log:             logger,
-		storage:         mockStorage,
-		l2OriginNetwork: 1,
-		aggLayerClient:  mockAggLayerClient,
-		epochNotifier:   mockEpochNotifier,
-		cfg:             config.Config{},
-		flow: flows.NewPPFlow(logger,
-			flows.NewBaseFlow(logger, mockL2BridgeQuerier, mockStorage,
-				mockL1Querier, mockLERQuerier, flows.NewBaseFlowConfigDefault()),
-			mockStorage, mockL1Querier, mockL2BridgeQuerier, signer, true, 0),
-		rateLimiter: aggkitcommon.NewRateLimit(aggkitcommon.RateLimitConfig{}),
-	}
-
-	mockStorage.EXPECT().GetLastSentCertificateHeader().Return(&aggsendertypes.CertificateHeader{
-		NewLocalExitRoot: common.HexToHash("0x123"),
-		Height:           1,
-		FromBlock:        0,
-		ToBlock:          10,
-		Status:           agglayertypes.Settled,
-	}, nil).Once()
-	mockStorage.EXPECT().SaveLastSentCertificate(mock.Anything, mock.Anything).Return(nil).Once()
-	mockL2BridgeQuerier.EXPECT().GetLastProcessedBlock(mock.Anything).Return(uint64(50), nil)
-	mockL2BridgeQuerier.EXPECT().GetBridgesAndClaims(mock.Anything, uint64(11), uint64(50)).Return([]bridgesync.Bridge{
-		{
-			BlockNum:           30,
-			BlockPos:           0,
-			LeafType:           agglayertypes.LeafTypeAsset.Uint8(),
-			OriginNetwork:      1,
-			OriginAddress:      common.HexToAddress("0x1"),
-			DestinationNetwork: 2,
-			DestinationAddress: common.HexToAddress("0x2"),
-			Amount:             big.NewInt(100),
-			Metadata:           []byte("metadata"),
-			DepositCount:       1,
-		},
-	}, []bridgesync.Claim{}, nil).Once()
-	mockL1Querier.EXPECT().GetLatestFinalizedL1InfoRoot(ctx).Return(&treetypes.Root{}, nil, nil).Once()
-	mockL2BridgeQuerier.EXPECT().GetExitRootByIndex(mock.Anything, uint32(1)).Return(common.Hash{}, nil).Once()
-	mockL2BridgeQuerier.EXPECT().OriginNetwork().Return(uint32(1)).Once()
-	mockAggLayerClient.EXPECT().SendCertificate(mock.Anything, mock.Anything, mock.Anything).Return(common.Hash{}, nil).Once()
-	mockEpochNotifier.EXPECT().GetEpochStatus().Return(aggsendertypes.EpochStatus{})
-	signedCertificate, err := aggSender.sendCertificate(ctx)
-	require.NoError(t, err)
-	require.NotNil(t, signedCertificate)
-	require.NotNil(t, signedCertificate.AggchainData)
-	require.NotNil(t, signedCertificate.ImportedBridgeExits)
-	require.Len(t, signedCertificate.BridgeExits, 1)
-
-	mockStorage.AssertExpectations(t)
-	mockL2BridgeQuerier.AssertExpectations(t)
-	mockAggLayerClient.AssertExpectations(t)
-}
-
 func TestExtractFromCertificateMetadataToBlock(t *testing.T) {
 	t.Parallel()
 
@@ -747,8 +679,9 @@ func newAggsenderTestData(t *testing.T, creationFlags testDataFlags) *aggsenderT
 	l2BridgeQuerier := mocks.NewBridgeQuerier(t)
 	agglayerClientMock := agglayer.NewAgglayerClientMock(t)
 	l1InfoTreeQuerierMock := mocks.NewL1InfoTreeDataQuerier(t)
-	lerQuerier := mocks.NewLERQuerier(t)
 	epochNotifierMock := mocks.NewEpochNotifier(t)
+	paramsBuilderMock := mocks.NewCommonCertParamsBuilder(t)
+	paramsVerifierMock := mocks.NewCommonCertParamsVerifier(t)
 	logger := log.WithFields("aggsender-test", "checkLastCertificateFromAgglayer")
 	var storageMock *mocks.AggSenderStorage
 	var storage db.AggSenderStorage
@@ -783,8 +716,7 @@ func newAggsenderTestData(t *testing.T, creationFlags testDataFlags) *aggsenderT
 		rateLimiter:   aggkitcommon.NewRateLimit(aggkitcommon.RateLimitConfig{}),
 		epochNotifier: epochNotifierMock,
 		flow: flows.NewPPFlow(logger,
-			flows.NewBaseFlow(logger, l2BridgeQuerier, storage,
-				l1InfoTreeQuerierMock, lerQuerier, flows.NewBaseFlowConfigDefault()),
+			paramsBuilderMock, paramsVerifierMock,
 			storage, l1InfoTreeQuerierMock, l2BridgeQuerier, signer, true, 0),
 	}
 	var flowMock *mocks.AggsenderFlow

aggsender/certificatebuild/common_params_builder.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"sync/atomic"
 	"time"
 
 	agglayertypes "github.com/agglayer/aggkit/agglayer/types"
@@ -17,28 +16,13 @@ import (
 
 var (
 	errNoBridgesAndClaims = errors.New("no bridges and claims to build certificate")
-	errNoNewBlocks        = errors.New("no new blocks to send a certificate")
+	ErrNoNewBlocks        = errors.New("no new blocks to send a certificate")
 
-	emptyLER = common.HexToHash("0x27ae5ba08d7291c96c8cbddcc148bf48a6d68c7974b94356f53754ef6171d757")
+	EmptyLER = common.HexToHash("0x27ae5ba08d7291c96c8cbddcc148bf48a6d68c7974b94356f53754ef6171d757")
 )
 
-var timeNowFunc atomic.Value
-
-func init() {
-	timeNowFunc.Store(TimeNowUTC)
-}
-
-// TimeNow returns the current time as a uint32 timestamp (thread-safe).
-func TimeNow() uint32 {
-	return timeNowFunc.Load().(func() uint32)() //nolint:forcetypeassert
-}
-
-func SetTimeNowFunc(f func() uint32) {
-	timeNowFunc.Store(f)
-}
-
-// TimeNowUTC returns the current time in UTC as a uint32 timestamp.
-func TimeNowUTC() uint32 {
+// timeNowUTC returns the current time in UTC as a uint32 timestamp.
+func timeNowUTC() uint32 {
 	// Use a more precise time function to avoid collisions in tests
 	// and ensure that the time is always in UTC.
 	return uint32(time.Now().UTC().Unix())
@@ -93,6 +77,8 @@ type commonParamsBuilder struct {
 	lerQuerier        types.LERQuerier
 
 	cfg CommonBuildConfig
+	// TimeNowFunc is a function that returns the current time as a uint32 timestamp.
+	timeNowFunc func() uint32
 }
 
 // NewCommonParamsBuilder creates a new instance of CommonParamsBuilder.
@@ -109,6 +95,7 @@ func NewCommonParamsBuilder(
 		cfg:               cfg,
 		storage:           storage,
 		lerQuerier:        lerQuerier,
+		timeNowFunc:       timeNowUTC,
 		l2BridgeQuerier:   l2BridgeQuerier,
 		l1InfoTreeQuerier: l1InfoTreeDataQuerier,
 	}
@@ -151,7 +138,7 @@ func (c *commonParamsBuilder) GeneratePreBuildParams(ctx context.Context,
 			L1InfoTreeRootToProve: l1InfoRoot.Hash,
 			L1InfoTreeLeafCount:   l1InfoRoot.Index + 1,
 		},
-		CreatedAt: TimeNow(),
+		CreatedAt: c.timeNowFunc(),
 	}, nil
 }
 
@@ -319,7 +306,7 @@ func (c *commonParamsBuilder) nextCertificateBlockRange(ctx context.Context,
 	if previousToBlock >= lastL2BlockSynced {
 		c.log.Warnf("no new blocks to send a certificate, last certificate block: %d, last L2 block: %d",
 			previousToBlock, lastL2BlockSynced)
-		return types.BlockRangeZero, 0, errNoNewBlocks
+		return types.BlockRangeZero, 0, ErrNoNewBlocks
 	}
 
 	fromBlock := previousToBlock + 1
@@ -352,8 +339,8 @@ func (c *commonParamsBuilder) getLastSentBlockAndRetryCount(
 	return lastSentBlock, retryCount
 }
 
-// GetNewLocalExitRootForCert gets the new local exit root for the new certificate
-func (c *commonParamsBuilder) GetNewLocalExitRootForCert(ctx context.Context,
+// GetNewLocalExitRoot gets the new local exit root for the new certificate
+func (c *commonParamsBuilder) GetNewLocalExitRoot(ctx context.Context,
 	certParams *types.CertificateBuildParams) (common.Hash, error) {
 	if certParams == nil {
 		return common.Hash{},
@@ -450,7 +437,7 @@ func (c *commonParamsBuilder) getStartLER() (common.Hash, error) {
 	}
 
 	if ler == aggkitcommon.ZeroHash {
-		return emptyLER, nil
+		return EmptyLER, nil
 	}
 
 	return ler, nil

aggsender/certificatebuild/common_params_builder_test.go

@@ -25,11 +25,6 @@ func timeNowUTCForTest() uint32 {
 func Test_GeneratePreBuildParams(t *testing.T) {
 	t.Parallel()
 
-	SetTimeNowFunc(timeNowUTCForTest)
-	t.Cleanup(func() {
-		SetTimeNowFunc(TimeNowUTC)
-	})
-
 	testCases := []struct {
 		name           string
 		certType       types.CertificateType
@@ -118,6 +113,9 @@ func Test_GeneratePreBuildParams(t *testing.T) {
 				nil, // lerQuerier
 				NewCommonBuildConfig(0, 0, false),
 			)
+			bl, ok := builder.(*commonParamsBuilder)
+			require.True(t, ok, "builder should be of type *commonParamsBuilder")
+			bl.timeNowFunc = timeNowUTCForTest
 
 			result, err := builder.GeneratePreBuildParams(t.Context(), tc.certType)
 
@@ -138,11 +136,6 @@ func Test_GeneratePreBuildParams(t *testing.T) {
 func Test_GenerateBuildParams(t *testing.T) {
 	t.Parallel()
 
-	SetTimeNowFunc(timeNowUTCForTest)
-	t.Cleanup(func() {
-		SetTimeNowFunc(TimeNowUTC)
-	})
-
 	testCases := []struct {
 		name           string
 		preParams      types.CertificatePreBuildParams
@@ -237,6 +230,9 @@ func Test_GenerateBuildParams(t *testing.T) {
 				nil, // lerQuerier
 				NewCommonBuildConfig(0, 0, false),
 			)
+			bl, ok := builder.(*commonParamsBuilder)
+			require.True(t, ok, "builder should be of type *commonParamsBuilder")
+			bl.timeNowFunc = timeNowUTCForTest
 
 			result, err := builder.GenerateBuildParams(t.Context(), tc.preParams)
 
@@ -378,7 +374,7 @@ func Test_LimitCertSize(t *testing.T) {
 	}
 }
 
-func Test_GetNewLocalExitRootForCert(t *testing.T) {
+func Test_GetNewLocalExitRoot(t *testing.T) {
 	t.Parallel()
 
 	tests := []struct {
@@ -453,7 +449,7 @@ func Test_GetNewLocalExitRootForCert(t *testing.T) {
 			}
 
 			ctx := context.TODO()
-			result, err := builder.GetNewLocalExitRootForCert(ctx, tt.certParams)
+			result, err := builder.GetNewLocalExitRoot(ctx, tt.certParams)
 
 			if tt.expectedError != "" {
 				require.Error(t, err)
@@ -469,11 +465,6 @@ func Test_GetNewLocalExitRootForCert(t *testing.T) {
 func Test_GetCommonCertificateBuildParams(t *testing.T) {
 	t.Parallel()
 
-	SetTimeNowFunc(timeNowUTCForTest)
-	t.Cleanup(func() {
-		SetTimeNowFunc(TimeNowUTC)
-	})
-
 	type mocksSetup struct {
 		storage           *mocks.AggSenderStorage
 		l2BridgeQuerier   *mocks.BridgeQuerier
@@ -571,6 +562,10 @@ func Test_GetCommonCertificateBuildParams(t *testing.T) {
 				m.lerQuerier,
 				cfg,
 			)
+			bl, ok := builder.(*commonParamsBuilder)
+			require.True(t, ok, "builder should be of type *commonParamsBuilder")
+			bl.timeNowFunc = timeNowUTCForTest
+
 			result, err := builder.GetCommonCertificateBuildParams(context.Background(), tt.certType)
 			if tt.expectedError != "" {
 				require.Error(t, err)
@@ -697,7 +692,7 @@ func Test_getNextHeightAndPreviousLER(t *testing.T) {
 			name:           "no last sent certificate - zero start LER",
 			lastSentCert:   nil,
 			expectedHeight: 0,
-			expectedLER:    emptyLER,
+			expectedLER:    EmptyLER,
 			mockFn: func(mockLERQuerier *mocks.LERQuerier, mockStorage *mocks.AggSenderStorage) {
 				mockLERQuerier.EXPECT().GetLastLocalExitRoot().Return(aggkitcommon.ZeroHash, nil)
 			},
@@ -760,9 +755,9 @@ func Test_getNextHeightAndPreviousLER(t *testing.T) {
 				NewLocalExitRoot:      common.HexToHash("0x789"),
 			},
 			expectedHeight: 0,
-			expectedLER:    emptyLER,
+			expectedLER:    EmptyLER,
 			mockFn: func(mockLERQuerier *mocks.LERQuerier, mockStorage *mocks.AggSenderStorage) {
-				mockLERQuerier.EXPECT().GetLastLocalExitRoot().Return(emptyLER, nil)
+				mockLERQuerier.EXPECT().GetLastLocalExitRoot().Return(EmptyLER, nil)
 			},
 		},
 		{