chore: use retry-go for retries in query

Author: ironman0x7b2

client/client.go

@@ -24,8 +24,8 @@ type Client struct {
 	logger               log.Logger                // Embedded logger
 	protoCodec           codec.ProtoCodecMarshaler // Used for marshaling and unmarshaling protobuf data
 	queryHeight          int64                     // Query height for blockchain data
-	queryMaxRetries      int                       // Maximum number of retries for queries
 	queryProve           bool                      // Flag indicating whether to prove queries
+	queryRetries         uint                      // Number of retries for queries
 	queryRetryDelay      time.Duration             // Delay between query retries
 	rpcAddr              string                    // RPC server address
 	rpcTimeout           time.Duration             // RPC timeout duration
@@ -70,18 +70,18 @@ func (c *Client) WithProtoCodec(protoCodec codec.ProtoCodecMarshaler) *Client {
 	return c
 }
 
-// WithQueryMaxRetries sets the maximum number of retries for queries and returns the updated Client.
-func (c *Client) WithQueryMaxRetries(maxRetries int) *Client {
-	c.queryMaxRetries = maxRetries
-	return c
-}
-
 // WithQueryProve sets the prove flag for queries and returns the updated Client.
 func (c *Client) WithQueryProve(prove bool) *Client {
 	c.queryProve = prove
 	return c
 }
 
+// WithQueryRetries sets the number of retries for queries and returns the updated Client.
+func (c *Client) WithQueryRetries(retries uint) *Client {
+	c.queryRetries = retries
+	return c
+}
+
 // WithQueryRetryDelay sets the retry delay duration for queries and returns the updated Client.
 func (c *Client) WithQueryRetryDelay(delay time.Duration) *Client {
 	c.queryRetryDelay = delay

client/query.go

@@ -5,14 +5,13 @@ import (
 	"errors"
 	"fmt"
 	"strings"
-	"time"
 
+	"github.com/avast/retry-go/v4"
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/libs/bytes"
 	"github.com/cometbft/cometbft/rpc/client"
 	core "github.com/cometbft/cometbft/rpc/core/types"
 	"github.com/cosmos/cosmos-sdk/codec"
-	"github.com/v2fly/v2ray-core/v5/common/retry"
 )
 
 // IsNotFoundError checks if the given error string indicates a gRPC NotFound error.
@@ -32,7 +31,7 @@ func (c *Client) ABCIQueryWithOptions(ctx context.Context, path string, data byt
 	var result *core.ResultABCIQuery
 
 	// Define the function to perform the ABCI query.
-	fn := func() error {
+	queryFunc := func() error {
 		// Get the RPC client for querying.
 		http, err := c.HTTP()
 		if err != nil {
@@ -55,8 +54,12 @@ func (c *Client) ABCIQueryWithOptions(ctx context.Context, path string, data byt
 	}
 
 	// Retry the query using the configured maximum retries and delay.
-	delay := uint32(c.queryRetryDelay / time.Millisecond)
-	if err := retry.Timed(c.queryMaxRetries, delay).On(fn); err != nil {
+	if err := retry.Do(
+		queryFunc,
+		retry.Attempts(c.queryRetries),
+		retry.Delay(c.queryRetryDelay),
+		retry.LastErrorOnly(true),
+	); err != nil {
 		return nil, err
 	}