Skip to content

Commit d2c155e

Browse files
temaniarpit27temaniarpit27
committed
linters fix
1 parent 2a21eac commit d2c155e

File tree

13 files changed

+94
-52
lines changed

13 files changed

+94
-52
lines changed

‎aggsender/flows/factory.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ func NewFlow(
6060
if err != nil {
6161
return nil, fmt.Errorf("failed to create bridge L2 sovereign reader: %w", err)
6262
}
63-
l2BridgeQuerier := query.NewBridgeDataQuerier(logger, l2Syncer, cfg.DelayBetweenRetries.Duration, bridgeL2SovereignReader)
63+
l2BridgeQuerier := query.NewBridgeDataQuerier(
64+
logger, l2Syncer, cfg.DelayBetweenRetries.Duration, bridgeL2SovereignReader,
65+
)
6466
l1InfoTreeQuerier := query.NewL1InfoTreeDataQuerier(l1Client, l1InfoTreeSyncer)
6567
logger.Infof("Aggsender signer address: %s", signer.PublicAddress().Hex())
6668
baseFlow := NewBaseFlow(
@@ -115,7 +117,9 @@ func NewFlow(
115117
if err != nil {
116118
return nil, fmt.Errorf("failed to create bridge L2 sovereign reader: %w", err)
117119
}
118-
l2BridgeQuerier := query.NewBridgeDataQuerier(logger, l2Syncer, cfg.DelayBetweenRetries.Duration, bridgeL2SovereignReader)
120+
l2BridgeQuerier := query.NewBridgeDataQuerier(
121+
logger, l2Syncer, cfg.DelayBetweenRetries.Duration, bridgeL2SovereignReader,
122+
)
119123
baseFlow := NewBaseFlow(
120124
logger, l2BridgeQuerier, storage, l1InfoTreeQuerier, lerQuerier,
121125
NewBaseFlowConfig(cfg.MaxCertSize, startL2Block, cfg.RequireNoFEPBlockGap),

‎aggsender/query/aggchain_proof_query.go‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ func (a *aggchainProofQuery) GenerateAggchainProof(
9898
return nil, nil, fmt.Errorf("aggchainProverFlow - error getting imported bridge exits for prover: %w", err)
9999
}
100100

101-
removedGERs, err := a.gerQuerier.GetRemovedGERsBlockDetails(ctx, fromBlock, toBlock)
102-
if err != nil {
103-
return nil, nil, fmt.Errorf("aggchainProverFlow - error getting removed GERs block numbers: %w", err)
104-
}
101+
// removedGERs, err := a.gerQuerier.GetRemovedGERsBlockDetails(ctx, fromBlock, toBlock)
102+
// if err != nil {
103+
// return nil, nil, fmt.Errorf("aggchainProverFlow - error getting removed GERs block numbers: %w", err)
104+
// }
105105

106-
unsetClaims, err := a.bridgeQuerier.GetUnsetClaimsBlockRange(ctx, fromBlock, toBlock)
107-
if err != nil {
108-
return nil, nil, fmt.Errorf("aggchainProverFlow - error getting unset claims: %w", err)
109-
}
106+
// unsetClaims, err := a.bridgeQuerier.GetUnsetClaimsBlockRange(ctx, fromBlock, toBlock)
107+
// if err != nil {
108+
// return nil, nil, fmt.Errorf("aggchainProverFlow - error getting unset claims: %w", err)
109+
// }
110110

111111
var aggchainProof *types.AggchainProof
112112
request := &types.AggchainProofRequest{
@@ -120,8 +120,6 @@ func (a *aggchainProofQuery) GenerateAggchainProof(
120120
},
121121
GERLeavesWithBlockNumber: injectedGERsProofs,
122122
ImportedBridgeExitsWithBlockNumber: importedBridgeExits,
123-
RemovedGers: removedGERs,
124-
Unclaims: unsetClaims,
125123
}
126124
// It decide if must generate optimistic proof using CertType
127125
optimisticMode := certBuildParams.CertificateType == types.CertificateTypeOptimistic

‎aggsender/query/bridge_query.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,19 @@ func (b *bridgeDataQuerier) GetUnsetClaimsBlockRange(ctx context.Context,
150150

151151
// Add the unclaim hash to the unclaim
152152
for i, unclaim := range unclaims {
153-
claim, err := b.bridgeSyncer.GetClaimByGlobalIndex(ctx, unclaim.BlockNumber, uint32(unclaim.BlockIndex), string(unclaim.GlobalIndex[:]))
153+
claim, err := b.bridgeSyncer.GetClaimByGlobalIndex(
154+
ctx, unclaim.BlockNumber, uint32(unclaim.BlockIndex), string(unclaim.GlobalIndex[:]),
155+
)
154156
if err != nil {
155-
return nil, fmt.Errorf("failed to get claim by global index: %w, blockNumber: %d, blockIndex: %d, globalIndex: %d", err, unclaim.BlockNumber, unclaim.BlockIndex, unclaim.GlobalIndex)
157+
return nil, fmt.Errorf(
158+
"failed to get claim by global index: %w, blockNumber: %d, blockIndex: %d, globalIndex: %s",
159+
err, unclaim.BlockNumber, unclaim.BlockIndex, unclaim.GlobalIndex,
160+
)
156161
}
157162
ibe, err := converters.ConvertToImportedBridgeExitWithoutClaimData(claim)
163+
if err != nil {
164+
return nil, fmt.Errorf("failed to convert claim to imported bridge exit: %w", err)
165+
}
158166
unclaimsConverted[i] = agglayertypes.Unclaim{
159167
UnclaimHash: ibe.Hash(),
160168
BlockNumber: unclaim.BlockNumber,

‎aggsender/query/bridge_query_test.go‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ func TestGetBridgesAndClaims(t *testing.T) {
4040
{BlockNum: 200, BlockPos: 1},
4141
}, nil)
4242
},
43+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
44+
// No expectations needed for this test case
45+
},
4346
expectedBridges: []bridgesync.Bridge{
4447
{BlockNum: 100, BlockPos: 1},
4548
},
@@ -54,6 +57,9 @@ func TestGetBridgesAndClaims(t *testing.T) {
5457
mockFn: func(mockSyncer *mocks.L2BridgeSyncer) {
5558
mockSyncer.EXPECT().GetBridges(ctx, uint64(100), uint64(200)).Return(nil, errors.New("some error"))
5659
},
60+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
61+
// No expectations needed for this test case
62+
},
5763
expectedBridges: nil,
5864
expectedClaims: nil,
5965
expectedError: "error getting bridges: some error",
@@ -68,6 +74,9 @@ func TestGetBridgesAndClaims(t *testing.T) {
6874
}, nil)
6975
mockSyncer.EXPECT().GetClaims(ctx, uint64(100), uint64(200)).Return(nil, errors.New("some error"))
7076
},
77+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
78+
// No expectations needed for this test case
79+
},
7180
expectedError: "error getting claims: some error",
7281
},
7382
{
@@ -78,6 +87,9 @@ func TestGetBridgesAndClaims(t *testing.T) {
7887
mockSyncer.EXPECT().GetBridges(ctx, uint64(100), uint64(200)).Return(nil, nil)
7988
mockSyncer.EXPECT().GetClaims(ctx, uint64(100), uint64(200)).Return(nil, nil)
8089
},
90+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
91+
// No expectations needed for this test case
92+
},
8193
expectedBridges: nil,
8294
expectedClaims: nil,
8395
},
@@ -133,6 +145,9 @@ func TestGetExitRootByIndex(t *testing.T) {
133145
Hash: common.HexToHash("0x1234"),
134146
}, nil)
135147
},
148+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
149+
// No expectations needed for this test case
150+
},
136151
expectedHash: common.HexToHash("0x1234"),
137152
},
138153
{
@@ -141,6 +156,9 @@ func TestGetExitRootByIndex(t *testing.T) {
141156
mockFn: func(mockSyncer *mocks.L2BridgeSyncer) {
142157
mockSyncer.EXPECT().GetExitRootByIndex(ctx, uint32(2)).Return(treetypes.Root{}, errors.New("some error"))
143158
},
159+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
160+
// No expectations needed for this test case
161+
},
144162
expectedError: "error getting exit root by index: 2. Error: some error",
145163
},
146164
}
@@ -189,13 +207,19 @@ func TestGetLastProcessedBlock(t *testing.T) {
189207
mockFn: func(mockSyncer *mocks.L2BridgeSyncer) {
190208
mockSyncer.EXPECT().GetLastProcessedBlock(ctx).Return(uint64(150), nil)
191209
},
210+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
211+
// No expectations needed for this test case
212+
},
192213
expectedBlock: 150,
193214
},
194215
{
195216
name: "error - failed to fetch last processed block",
196217
mockFn: func(mockSyncer *mocks.L2BridgeSyncer) {
197218
mockSyncer.EXPECT().GetLastProcessedBlock(ctx).Return(uint64(0), errors.New("some error"))
198219
},
220+
mockBridgeL2SovereignReaderFn: func(mockReader *mocks.BridgeL2SovereignReader) {
221+
// No expectations needed for this test case
222+
},
199223
expectedError: "error getting last processed block: some error",
200224
},
201225
}

‎aggsender/types/aggchain_proof_client_interface.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ type AggchainProofRequest struct {
2323
L1InfoTreeMerkleProof agglayer.MerkleProof
2424
GERLeavesWithBlockNumber map[common.Hash]*agglayer.ProvenInsertedGERWithBlockNumber
2525
ImportedBridgeExitsWithBlockNumber []*agglayer.ImportedBridgeExitWithBlockNumber
26-
RemovedGers []agglayer.RemovedGER
27-
Unclaims []agglayer.Unclaim
2826
}
2927

3028
func NewAggchainProofRequest(
@@ -34,8 +32,6 @@ func NewAggchainProofRequest(
3432
l1InfoTreeMerkleProof agglayer.MerkleProof,
3533
gerLeavesWithBlockNumber map[common.Hash]*agglayer.ProvenInsertedGERWithBlockNumber,
3634
importedBridgeExitsWithBlockNumber []*agglayer.ImportedBridgeExitWithBlockNumber,
37-
removedGers []agglayer.RemovedGER,
38-
unclaims []agglayer.Unclaim,
3935
) *AggchainProofRequest {
4036
return &AggchainProofRequest{
4137
LastProvenBlock: lastProvenBlock,
@@ -45,8 +41,6 @@ func NewAggchainProofRequest(
4541
L1InfoTreeMerkleProof: l1InfoTreeMerkleProof,
4642
GERLeavesWithBlockNumber: gerLeavesWithBlockNumber,
4743
ImportedBridgeExitsWithBlockNumber: importedBridgeExitsWithBlockNumber,
48-
RemovedGers: removedGers,
49-
Unclaims: unclaims,
5044
}
5145
}
5246

@@ -67,8 +61,6 @@ func (r *AggchainProofRequest) String() string {
6761
},
6862
injectedGERsProofs: %+v,
6963
importedBridgeExits: %+v,
70-
removedGers: %+v,
71-
unclaims: %+v,
7264
}`,
7365
r.LastProvenBlock,
7466
r.RequestedEndBlock,
@@ -78,7 +70,5 @@ func (r *AggchainProofRequest) String() string {
7870
r.L1InfoTreeMerkleProof.Proof,
7971
r.GERLeavesWithBlockNumber,
8072
r.ImportedBridgeExitsWithBlockNumber,
81-
r.RemovedGers,
82-
r.Unclaims,
8373
)
8474
}

‎aggsender/types/interfaces.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ type L2BridgeSyncer interface {
7777
OriginNetwork() uint32
7878
BlockFinality() aggkittypes.BlockNumberFinality
7979
GetLastProcessedBlock(ctx context.Context) (uint64, error)
80-
GetClaimByGlobalIndex(ctx context.Context, blockNumber uint64, blockIndex uint32, globalIndex string) (bridgesync.Claim, error)
80+
GetClaimByGlobalIndex(
81+
ctx context.Context, blockNumber uint64, blockIndex uint32, globalIndex string,
82+
) (bridgesync.Claim, error)
8183
}
8284

8385
// BridgeQuerier is an interface defining functions that an BridgeQuerier should implement

‎bridgesync/bridge_l2_sovereign_reader.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ type BridgeL2SovereignReader struct {
1515
bridgeSovereignChain *bridgel2sovereignchain.Bridgel2sovereignchain
1616
}
1717

18-
func NewBridgeL2SovereignReader(bridgeAddr common.Address, l2Client aggkittypes.BaseEthereumClienter) (*BridgeL2SovereignReader, error) {
18+
func NewBridgeL2SovereignReader(
19+
bridgeAddr common.Address,
20+
l2Client aggkittypes.BaseEthereumClienter,
21+
) (*BridgeL2SovereignReader, error) {
1922
bridgeSovereignChainContract, err := bridgel2sovereignchain.NewBridgel2sovereignchain(bridgeAddr, l2Client)
2023
if err != nil {
2124
return nil, err
@@ -43,7 +46,7 @@ func (r *BridgeL2SovereignReader) GetUnsetClaimsBlockRange(ctx context.Context,
4346
unclaims = append(unclaims, types.Unclaim{
4447
GlobalIndex: globalIndex,
4548
BlockNumber: unclaimIterator.Event.Raw.BlockNumber,
46-
BlockIndex: uint(unclaimIterator.Event.Raw.Index),
49+
BlockIndex: unclaimIterator.Event.Raw.Index,
4750
})
4851
}
4952

‎bridgesync/bridgesync.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,14 +494,22 @@ func (s *BridgeSync) GetContractDepositCount(ctx context.Context) (uint32, error
494494
return uint32(depositCount.Int64()), nil
495495
}
496496

497-
func (s *BridgeSync) GetClaimByGlobalIndex(ctx context.Context, blockNumber uint64, blockIndex uint32, globalIndex string) (Claim, error) {
497+
func (s *BridgeSync) GetClaimByGlobalIndex(
498+
ctx context.Context,
499+
blockNumber uint64,
500+
blockIndex uint32,
501+
globalIndex string,
502+
) (Claim, error) {
498503
if s.processor.isHalted() {
499504
return Claim{}, sync.ErrInconsistentState
500505
}
501506

502507
claim, err := s.processor.GetClaimByGlobalIndex(ctx, blockNumber, blockIndex, globalIndex)
503508
if err != nil {
504-
return Claim{}, fmt.Errorf("failed to get claim by global index: %w, blockNumber: %d, blockIndex: %d, globalIndex: %d", err, blockNumber, blockIndex, globalIndex)
509+
return Claim{}, fmt.Errorf(
510+
"failed to get claim by global index: %w, blockNumber: %d, blockIndex: %d, globalIndex: %s",
511+
err, blockNumber, blockIndex, globalIndex,
512+
)
505513
}
506514

507515
return claim, nil

‎bridgesync/processor.go‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,12 +1006,26 @@ func (p *processor) unhalt() {
10061006
p.log.Info("processor unhalted")
10071007
}
10081008

1009-
func (p *processor) GetClaimByGlobalIndex(ctx context.Context, blockNumber uint64, blockIndex uint32, globalIndex string) (Claim, error) {
1009+
func (p *processor) GetClaimByGlobalIndex(
1010+
ctx context.Context,
1011+
blockNumber uint64,
1012+
blockIndex uint32,
1013+
globalIndex string,
1014+
) (Claim, error) {
10101015
var claim Claim
10111016

1012-
err := p.db.QueryRow(fmt.Sprintf(`SELECT * FROM %s WHERE block_num = $1 AND block_index = $2 AND global_index = $3`, claimTableName), blockNumber, blockIndex, globalIndex).Scan(&claim)
1017+
err := p.db.QueryRow(
1018+
fmt.Sprintf(
1019+
`SELECT * FROM %s WHERE block_num = $1 AND block_index = $2 AND global_index = $3`,
1020+
claimTableName,
1021+
),
1022+
blockNumber, blockIndex, globalIndex,
1023+
).Scan(&claim)
10131024
if err != nil {
1014-
return Claim{}, fmt.Errorf("failed to get claim by global index: %w, blockNumber: %d, blockIndex: %d, globalIndex: %d", err, blockNumber, blockIndex, globalIndex)
1025+
return Claim{}, fmt.Errorf(
1026+
"failed to get claim by global index: %w, blockNumber: %d, blockIndex: %d, globalIndex: %s",
1027+
err, blockNumber, blockIndex, globalIndex,
1028+
)
10151029
}
10161030

10171031
return claim, nil

‎cmd/run.go‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,18 @@ func createAggSenderValidator(ctx context.Context,
226226
return nil, fmt.Errorf("error signer.Initialize. Err: %w", err)
227227
}
228228

229-
bridgeL2SovereignReader, err := bridgesync.NewBridgeL2SovereignReader(cfg.BridgeQuerier.BridgeL2SovereignAddr, l2Client)
229+
bridgeL2SovereignReader, err := bridgesync.NewBridgeL2SovereignReader(
230+
cfg.BridgeQuerier.BridgeL2SovereignAddr, l2Client,
231+
)
230232
if err != nil {
231233
return nil, fmt.Errorf("failed to create bridge L2 sovereign reader: %w", err)
232234
}
233-
l2BridgeQuerier := query.NewBridgeDataQuerier(logger, l2Syncer, cfg.DelayBetweenRetries.Duration, bridgeL2SovereignReader)
235+
l2BridgeQuerier := query.NewBridgeDataQuerier(
236+
logger,
237+
l2Syncer,
238+
cfg.DelayBetweenRetries.Duration,
239+
bridgeL2SovereignReader,
240+
)
234241
l1InfoTreeQuerier := query.NewL1InfoTreeDataQuerier(l1Client, l1InfoTreeSync)
235242
lerQuerier, err := query.NewLERDataQuerier(
236243
cfg.LerQuerier.RollupManagerAddr, cfg.LerQuerier.RollupCreationBlockL1, rollupDataQuerier)

0 commit comments

Comments
 (0)