Skip to content

Commit 00021bb

Browse files
committed
fix: rpcErrorOrDefault rename and remove timeout error
1 parent 4f18a4d commit 00021bb

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

pkg/timelock/worker_solana.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -233,16 +233,12 @@ func (w *WorkerSolana) loadTransactions(ctx context.Context, sigCh <-chan solana
233233
}
234234
}
235235

236-
// errOrDefault returns rpc error or deadline exceeded.
237-
func errOrDefault(err error, resps jsonrpc.RPCResponses) error {
236+
// rpcErrorOrDefault returns rpc error.
237+
func rpcErrorOrDefault(err error, resps jsonrpc.RPCResponses) error {
238238
if len(resps) > 0 && resps[0].Error != nil {
239239
return resps[0].Error
240240
}
241-
if err != nil {
242-
return err
243-
}
244-
245-
return context.DeadlineExceeded
241+
return err
246242
}
247243

248244
func (w *WorkerSolana) retryGetTransaction(ctx context.Context, sig solana.Signature) (*rpc.TransactionWithMeta, error) {
@@ -252,7 +248,7 @@ func (w *WorkerSolana) retryGetTransaction(ctx context.Context, sig solana.Signa
252248
req := jsonrpc.NewRequest("getTransaction", sig, &rpc.GetTransactionOpts{Encoding: solana.EncodingBase58})
253249
resps, err := w.solanaClient.RPCCallBatch(ctx, jsonrpc.RPCRequests{req})
254250
if err != nil || len(resps) == 0 || resps[0].Error != nil {
255-
return errOrDefault(err, resps)
251+
return rpcErrorOrDefault(err, resps)
256252
}
257253

258254
tx = new(rpc.TransactionWithMeta)

0 commit comments

Comments
 (0)