Skip to content

Commit 697c976

Browse files
committed
minor fix
1 parent b2b9366 commit 697c976

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

pkg/loop/internal/relayer/evm.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (e *EVMClient) FilterLogs(ctx context.Context, request evmtypes.FilterLogsR
124124

125125
logs, err := evmpb.ConvertLogsFromProto(reply.GetLogs())
126126
if err != nil {
127-
return nil, net.WrapRPCErr(fmt.Errorf("failed to convert logs response err: %w", err))
127+
return nil, err
128128
}
129129

130130
return &evmtypes.FilterLogsReply{Logs: logs}, nil
@@ -236,7 +236,7 @@ func (e *EVMClient) QueryTrackedLogs(ctx context.Context, filterQuery []query.Ex
236236

237237
logs, err := evmpb.ConvertLogsFromProto(reply.GetLogs())
238238
if err != nil {
239-
return nil, net.WrapRPCErr(fmt.Errorf("failed to convert logs response err: %w", err))
239+
return nil, err
240240
}
241241

242242
return logs, nil
@@ -350,7 +350,7 @@ func (e *evmServer) FilterLogs(ctx context.Context, request *evmpb.FilterLogsReq
350350

351351
logs, err := evmpb.ConvertLogsToProto(reply.Logs)
352352
if err != nil {
353-
return nil, fmt.Errorf("failed to convert logs response")
353+
return nil, err
354354
}
355355

356356
return &evmpb.FilterLogsReply{Logs: logs}, nil

pkg/loop/internal/relayerset/evm.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ func (s *Server) FilterLogs(ctx context.Context, request *evmpb.FilterLogsReques
166166
return nil, fmt.Errorf("reply is nil")
167167
}
168168

169-
return &evmpb.FilterLogsReply{Logs: evmpb.ConvertLogsToProto(reply.Logs)}, nil
169+
logs, err := evmpb.ConvertLogsToProto(reply.Logs)
170+
if err != nil {
171+
return nil, fmt.Errorf("failed to convert reply to proto: %w", err)
172+
}
173+
return &evmpb.FilterLogsReply{Logs: logs}, nil
170174
}
171175

172176
func (s *Server) BalanceAt(ctx context.Context, request *evmpb.BalanceAtRequest) (*evmpb.BalanceAtReply, error) {
@@ -286,8 +290,13 @@ func (s *Server) HeaderByNumber(ctx context.Context, request *evmpb.HeaderByNumb
286290
return nil, fmt.Errorf("reply is nil")
287291
}
288292

293+
header, err := evmpb.ConvertHeaderToProto(reply.Header)
294+
if err != nil {
295+
return nil, err
296+
}
297+
289298
return &evmpb.HeaderByNumberReply{
290-
Header: evmpb.ConvertHeaderToProto(reply.Header),
299+
Header: header,
291300
}, nil
292301
}
293302

@@ -317,7 +326,12 @@ func (s *Server) QueryTrackedLogs(ctx context.Context, request *evmpb.QueryTrack
317326
return nil, err
318327
}
319328

320-
return &evmpb.QueryTrackedLogsReply{Logs: evmpb.ConvertLogsToProto(logs)}, nil
329+
l, err := evmpb.ConvertLogsToProto(logs)
330+
if err != nil {
331+
return nil, err
332+
}
333+
334+
return &evmpb.QueryTrackedLogsReply{Logs: l}, nil
321335
}
322336

323337
func (s *Server) GetFiltersNames(ctx context.Context, _ *emptypb.Empty) (*evmpb.GetFiltersNamesReply, error) {

0 commit comments

Comments
 (0)