Skip to content

Commit 361c75d

Browse files
authored
fix(client): fallback to default api version when node does not support discovery (#113)
Signed-off-by: Artur Troian <[email protected]>
1 parent 40e1584 commit 361c75d

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

go/node/client/client.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package client
33
import (
44
"context"
55
"errors"
6+
"strings"
67

78
sdkclient "github.com/cosmos/cosmos-sdk/client"
89
"github.com/spf13/pflag"
@@ -24,16 +25,21 @@ func DiscoverClient(ctx context.Context, cctx sdkclient.Context, flags *pflag.Fl
2425
result := new(Akash)
2526
params := make(map[string]interface{})
2627
_, err = rpc.Call(ctx, "akash", params, result)
27-
if err != nil {
28+
if err != nil && !strings.Contains(err.Error(), "Method not found") {
2829
return err
2930
}
3031

32+
// if client info is nil, mostly likely "akash" endpoint is not yet supported on the node
33+
// fallback to manually set version to v1beta2
34+
if result.ClientInfo == nil {
35+
result.ClientInfo = &ClientInfo{ApiVersion: "v1beta2"}
36+
}
37+
3138
var cl interface{}
3239

3340
switch result.ClientInfo.ApiVersion {
3441
case "v1beta2":
3542
cl, err = v1beta2.NewClient(ctx, cctx, flags)
36-
// case "":
3743
default:
3844
return ErrUnknownClientVersion
3945
}
@@ -54,16 +60,19 @@ func DiscoverQueryClient(ctx context.Context, cctx sdkclient.Context, setup func
5460
result := new(Akash)
5561
params := make(map[string]interface{})
5662
_, err = rpc.Call(ctx, "akash", params, result)
57-
if err != nil {
63+
if err != nil && !strings.Contains(err.Error(), "Method not found") {
5864
return err
5965
}
6066

67+
if result.ClientInfo == nil {
68+
result.ClientInfo = &ClientInfo{ApiVersion: "v1beta2"}
69+
}
70+
6171
var cl interface{}
6272

6373
switch result.ClientInfo.ApiVersion {
6474
case "v1beta2":
6575
cl = v1beta2.NewQueryClient(cctx)
66-
// case "":
6776
default:
6877
return ErrUnknownClientVersion
6978
}

0 commit comments

Comments
 (0)