increase code coverage, ignore double insertions to bridge_archive table

Author: Stefan-Ethernal

bridgesync/downloader_test.go

@@ -55,6 +55,7 @@ func TestBuildAppender(t *testing.T) {
 		eventSignature common.Hash
 		deploymentKind BridgeDeployment
 		logBuilder     func() (types.Log, error)
+		expectedErr    string
 	}{
 		{
 			name:           "bridgeEventSignature appender",
@@ -372,6 +373,12 @@ func TestBuildAppender(t *testing.T) {
 				return l, nil
 			},
 		},
+		{
+			name:           "unknown deployment kind",
+			deploymentKind: 100,
+			logBuilder:     func() (types.Log, error) { return types.Log{}, nil },
+			expectedErr:    "unsupported bridge deployment kind: 100",
+		},
 	}
 
 	for _, tt := range tests {
@@ -382,17 +389,21 @@ func TestBuildAppender(t *testing.T) {
 			logger := logger.WithFields("module", "test")
 			bridgeDeployment.kind = tt.deploymentKind
 			appenderMap, err := buildAppender(ethClient, bridgeAddr, false, bridgeDeployment, logger)
-			require.NoError(t, err)
-			require.NotNil(t, appenderMap)
+			if tt.expectedErr == "" {
+				require.NoError(t, err)
+				require.NotNil(t, appenderMap)
 
-			block := &sync.EVMBlock{EVMBlockHeader: sync.EVMBlockHeader{Num: blockNum}}
+				block := &sync.EVMBlock{EVMBlockHeader: sync.EVMBlockHeader{Num: blockNum}}
 
-			appenderFunc, exists := appenderMap[tt.eventSignature]
-			require.True(t, exists)
+				appenderFunc, exists := appenderMap[tt.eventSignature]
+				require.True(t, exists)
 
-			err = appenderFunc(block, log)
-			require.NoError(t, err)
-			require.Len(t, block.Events, 1)
+				err = appenderFunc(block, log)
+				require.NoError(t, err)
+				require.Len(t, block.Events, 1)
+			} else {
+				require.ErrorContains(t, err, tt.expectedErr)
+			}
 		})
 	}
 }

bridgesync/migrations/bridgesync0011.sql

@@ -42,7 +42,7 @@ CREATE TRIGGER IF NOT EXISTS archive_bridge_before_delete
 BEFORE DELETE ON bridge
 FOR EACH ROW
 BEGIN
-    INSERT INTO bridge_archive (
+    INSERT OR IGNORE INTO bridge_archive (
         deposit_count,
         block_num,
         block_pos,

bridgesync/processor.go

@@ -1369,10 +1369,9 @@ func (p *processor) ProcessBlock(ctx context.Context, block sync.Block) error {
 
 			// remove all the bridges whose deposit_count is greater than the one captured by the BackwardLET event
 			deleteBridges := fmt.Sprintf("DELETE from %s WHERE deposit_count > $1", bridgeTableName)
-			_, err := tx.Exec(deleteBridges, newDepositCount)
+			_, err := tx.Exec(deleteBridges, newDepositCountU64)
 			if err != nil {
-				p.log.Errorf("failed to remove bridges whose deposit count is greater than or equal to %d",
-					event.BackwardLET.NewDepositCount)
+				p.log.Errorf("failed to remove bridges whose deposit count is greater than %d", newDepositCountU64)
 				return err
 			}
 

bridgesync/processor_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/0xPolygon/cdk-contracts-tooling/contracts/aggchain-multisig/polygonzkevmbridge"
 	bridgetypes "github.com/agglayer/aggkit/bridgeservice/types"
 	"github.com/agglayer/aggkit/bridgesync/migrations"
+	bridgesynctypes "github.com/agglayer/aggkit/bridgesync/types"
 	"github.com/agglayer/aggkit/db"
 	"github.com/agglayer/aggkit/log"
 	"github.com/agglayer/aggkit/sync"
@@ -339,22 +340,22 @@ var (
 			Event{Bridge: &Bridge{
 				BlockNum:           1,
 				BlockPos:           0,
-				LeafType:           1,
+				LeafType:           bridgesynctypes.LeafTypeAsset.Uint8(),
 				OriginNetwork:      1,
-				OriginAddress:      common.HexToAddress("01"),
+				OriginAddress:      common.HexToAddress("1"),
 				DestinationNetwork: 1,
-				DestinationAddress: common.HexToAddress("01"),
+				DestinationAddress: common.HexToAddress("1"),
 				Amount:             big.NewInt(1),
-				Metadata:           common.Hex2Bytes("01"),
+				Metadata:           common.Hex2Bytes("1"),
 				DepositCount:       0,
 			}},
 			Event{Claim: &Claim{
 				BlockNum:           1,
 				BlockPos:           1,
 				GlobalIndex:        big.NewInt(1),
 				OriginNetwork:      1,
-				OriginAddress:      common.HexToAddress("01"),
-				DestinationAddress: common.HexToAddress("01"),
+				OriginAddress:      common.HexToAddress("1"),
+				DestinationAddress: common.HexToAddress("1"),
 				Amount:             big.NewInt(1),
 				MainnetExitRoot:    common.Hash{},
 			}},
@@ -390,27 +391,39 @@ var (
 			Event{Bridge: &Bridge{
 				BlockNum:           3,
 				BlockPos:           0,
-				LeafType:           2,
+				LeafType:           bridgesynctypes.LeafTypeAsset.Uint8(),
 				OriginNetwork:      2,
-				OriginAddress:      common.HexToAddress("02"),
+				OriginAddress:      common.HexToAddress("2"),
 				DestinationNetwork: 2,
-				DestinationAddress: common.HexToAddress("02"),
+				DestinationAddress: common.HexToAddress("2"),
 				Amount:             big.NewInt(2),
-				Metadata:           common.Hex2Bytes("02"),
+				Metadata:           common.Hex2Bytes("2"),
 				DepositCount:       1,
 			}},
 			Event{Bridge: &Bridge{
 				BlockNum:           3,
 				BlockPos:           1,
-				LeafType:           3,
+				LeafType:           bridgesynctypes.LeafTypeAsset.Uint8(),
 				OriginNetwork:      3,
-				OriginAddress:      common.HexToAddress("03"),
+				OriginAddress:      common.HexToAddress("3"),
 				DestinationNetwork: 3,
-				DestinationAddress: common.HexToAddress("03"),
+				DestinationAddress: common.HexToAddress("3"),
 				Amount:             big.NewInt(0),
-				Metadata:           common.Hex2Bytes("03"),
+				Metadata:           common.Hex2Bytes("3"),
 				DepositCount:       2,
 			}},
+			Event{Bridge: &Bridge{
+				BlockNum:           3,
+				BlockPos:           2,
+				LeafType:           bridgesynctypes.LeafTypeAsset.Uint8(),
+				OriginNetwork:      3,
+				OriginAddress:      common.HexToAddress("4"),
+				DestinationNetwork: 3,
+				DestinationAddress: common.HexToAddress("4"),
+				Amount:             big.NewInt(0),
+				Metadata:           common.Hex2Bytes("4"),
+				DepositCount:       3,
+			}},
 		},
 	}
 	block4 = sync.Block{
@@ -453,6 +466,12 @@ var (
 				BlockPos:           3,
 				LegacyTokenAddress: common.HexToAddress("0x11"),
 			}},
+			Event{BackwardLET: &BackwardLET{
+				BlockNum:             5,
+				BlockPos:             4,
+				PreviousDepositCount: big.NewInt(3),
+				NewDepositCount:      big.NewInt(2),
+			}},
 		},
 	}
 )