Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(client): implement client opts #1928

Merged
merged 1 commit into from
Mar 6, 2024
Merged

feat(client): implement client opts #1928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import (
"fmt"
"reflect"

"github.com/spf13/pflag"

sdkclient "github.com/cosmos/cosmos-sdk/client"

cmtrpctypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"

aclient "github.com/akash-network/akash-api/go/node/client"
cltypes "github.com/akash-network/akash-api/go/node/client/types"
"github.com/akash-network/akash-api/go/node/client/v1beta2"
)

Expand All @@ -39,17 +38,20 @@ func DiscoverQueryClient(ctx context.Context, cctx sdkclient.Context) (v1beta2.Q
return cl, nil
}

func DiscoverClient(ctx context.Context, cctx sdkclient.Context, flags *pflag.FlagSet) (v1beta2.Client, error) {
func DiscoverClient(ctx context.Context, cctx sdkclient.Context, opts ...cltypes.ClientOption) (v1beta2.Client, error) {
var cl v1beta2.Client
err := aclient.DiscoverClient(ctx, cctx, flags, func(i interface{}) error {

setupFn := func(i interface{}) error {
var valid bool

if cl, valid = i.(v1beta2.Client); !valid {
return fmt.Errorf("%w: expected %s, actual %s", ErrInvalidClient, reflect.TypeOf(cl), reflect.TypeOf(i))
}

return nil
})
}

err := aclient.DiscoverClient(ctx, cctx, setupFn, opts...)

if err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/akash-network/node
go 1.21

require (
github.com/akash-network/akash-api v0.0.51
github.com/akash-network/akash-api v0.0.56
github.com/blang/semver/v4 v4.0.0
github.com/boz/go-lifecycle v0.1.1
github.com/cosmos/cosmos-sdk v0.45.16
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBA
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
github.com/akash-network/akash-api v0.0.51 h1:HGborV1y9RWeQESX2JU15iwX87zFrb2rDHVv51tg7I4=
github.com/akash-network/akash-api v0.0.51/go.mod h1:pNr61L4+0sheol7ZK0HjgK3rxpIAbYBGq1w1oH4B0+M=
github.com/akash-network/akash-api v0.0.56 h1:dUiDR7DXeMXgh9xyxCik4gznTsjSJhi8Pq3iPcZoqSc=
github.com/akash-network/akash-api v0.0.56/go.mod h1:pNr61L4+0sheol7ZK0HjgK3rxpIAbYBGq1w1oH4B0+M=
github.com/akash-network/cometbft v0.34.27-akash h1:V1dApDOr8Ee7BJzYyQ7Z9VBtrAul4+baMeA6C49dje0=
github.com/akash-network/cometbft v0.34.27-akash/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw=
github.com/akash-network/ledger-go v0.14.3 h1:LCEFkTfgGA2xFMN2CtiKvXKE7dh0QSM77PJHCpSkaAo=
Expand Down
15 changes: 13 additions & 2 deletions x/audit/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"fmt"
"sort"

cltypes "github.com/akash-network/akash-api/go/node/client/types"
"github.com/spf13/cobra"

sdkclient "github.com/cosmos/cosmos-sdk/client"
Expand Down Expand Up @@ -65,7 +66,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 72 in x/audit/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/audit/client/cli/tx.go#L69-L72 

Added lines #L69 - L72 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)

Check warning on line 74 in x/audit/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/audit/client/cli/tx.go#L74 

Added line #L74 was not covered by tests
if err != nil {
return err
}
Expand Down Expand Up @@ -121,7 +127,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 133 in x/audit/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/audit/client/cli/tx.go#L130-L133 

Added lines #L130 - L133 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)

Check warning on line 135 in x/audit/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/audit/client/cli/tx.go#L135 

Added line #L135 was not covered by tests
if err != nil {
return err
}
Expand Down
15 changes: 13 additions & 2 deletions x/cert/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"math/big"
"time"

cltypes "github.com/akash-network/akash-api/go/node/client/types"
sdkclient "github.com/cosmos/cosmos-sdk/client"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -152,7 +153,12 @@

}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 159 in x/cert/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/cert/client/cli/tx.go#L158-L159 

Added lines #L158 - L159 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -208,7 +214,12 @@

ctx := cmd.Context()

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 220 in x/cert/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/cert/client/cli/tx.go#L219-L220 

Added lines #L219 - L220 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion x/cert/client/cli/tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ type certificateCLISuite struct {
}

func (s *certificateCLISuite) TestGeneratePublishAndRevokeServer() {
result, err := cli.TxGenerateServerExec(s.GoContextForTest(), s.ContextForTest(), s.WalletForTest(), testHost)
result, err := cli.TxGenerateServerExec(s.GoContextForTest(), s.ContextForTest(), s.WalletForTest(),
testHost,
fmt.Sprintf("--fees=%d%s", 1000, s.Config().BondDenom))
require.NoError(s.T(), err)
require.NotNil(s.T(), result)

Expand Down
64 changes: 55 additions & 9 deletions x/deployment/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"strings"
"time"

cltypes "github.com/akash-network/akash-api/go/node/client/types"
"github.com/spf13/cobra"

tmrpc "github.com/tendermint/tendermint/rpc/core/types"
Expand Down Expand Up @@ -63,7 +64,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 70 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L69-L70 

Added lines #L69 - L70 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -170,7 +176,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 182 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L181-L182 

Added lines #L181 - L182 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -225,7 +236,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 242 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L241-L242 

Added lines #L241 - L242 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -264,7 +280,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 286 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L285-L286 

Added lines #L285 - L286 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -360,7 +381,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 387 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L386-L387 

Added lines #L386 - L387 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -408,7 +434,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 440 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L437-L440 

Added lines #L437 - L440 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)

Check warning on line 442 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L442 

Added line #L442 was not covered by tests
if err != nil {
return err
}
Expand Down Expand Up @@ -456,7 +487,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 493 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L490-L493 

Added lines #L490 - L493 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)

Check warning on line 495 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L495 

Added line #L495 was not covered by tests
if err != nil {
return err
}
Expand Down Expand Up @@ -526,7 +562,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 568 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L567-L568 

Added lines #L567 - L568 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -592,7 +633,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 639 in x/deployment/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/deployment/client/cli/tx.go#L638-L639 

Added lines #L638 - L639 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down
36 changes: 31 additions & 5 deletions x/market/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import (
"fmt"

cltypes "github.com/akash-network/akash-api/go/node/client/types"
sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -57,7 +58,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 64 in x/market/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/market/client/cli/tx.go#L63-L64 

Added lines #L63 - L64 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -123,7 +129,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 135 in x/market/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/market/client/cli/tx.go#L134-L135 

Added lines #L134 - L135 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -184,7 +195,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 201 in x/market/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/market/client/cli/tx.go#L200-L201 

Added lines #L200 - L201 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -231,7 +247,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 253 in x/market/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/market/client/cli/tx.go#L250-L253 

Added lines #L250 - L253 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)

Check warning on line 255 in x/market/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/market/client/cli/tx.go#L255 

Added line #L255 was not covered by tests
if err != nil {
return err
}
Expand Down Expand Up @@ -278,7 +299,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 305 in x/market/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/market/client/cli/tx.go#L302-L305 

Added lines #L302 - L305 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)

Check warning on line 307 in x/market/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/market/client/cli/tx.go#L307 

Added line #L307 was not covered by tests
if err != nil {
return err
}
Expand Down
15 changes: 13 additions & 2 deletions x/provider/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import (
"fmt"

cltypes "github.com/akash-network/akash-api/go/node/client/types"
sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -42,7 +43,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 49 in x/provider/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/provider/client/cli/tx.go#L48-L49 

Added lines #L48 - L49 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down Expand Up @@ -92,7 +98,12 @@
return err
}

cl, err := aclient.DiscoverClient(ctx, cctx, cmd.Flags())
opts, err := cltypes.ClientOptionsFromFlags(cmd.Flags())
if err != nil {
return err
}

Check warning on line 104 in x/provider/client/cli/tx.go

View check run for this annotation

Codecov / codecov/patch

x/provider/client/cli/tx.go#L103-L104 

Added lines #L103 - L104 were not covered by tests

cl, err := aclient.DiscoverClient(ctx, cctx, opts...)
if err != nil {
return err
}
Expand Down
Loading