Skip to content

Commit 9af7d28

Browse files
committed
Merge branch 'fix/feeabs-codec' of github.com:burnt-labs/xion into fix/feeabs-codec
2 parents 689397c + 29938d1 commit 9af7d28

File tree

4 files changed

+163
-149
lines changed

4 files changed

+163
-149
lines changed

x/jwk/client/cli/cli_test.go

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"strings"
88
"testing"
99

10-
rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock"
11-
1210
"github.com/spf13/cobra"
1311
"github.com/stretchr/testify/require"
1412

13+
rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock"
14+
1515
"github.com/cosmos/cosmos-sdk/client"
1616
"github.com/cosmos/cosmos-sdk/client/flags"
1717
"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -125,12 +125,14 @@ func TestConvertPemToJSONCases(t *testing.T) {
125125
// Invalid content
126126
tmpInvalid, _ := os.CreateTemp("", "bad*.pem")
127127
defer os.Remove(tmpInvalid.Name())
128-
tmpInvalid.WriteString("not a pem")
128+
_, err = tmpInvalid.WriteString("not a pem")
129+
require.NoError(t, err)
129130
tmpInvalid.Close()
130131
_, err = clitestutil.ExecTestCLICmd(ctx, cli.CmdConvertPemToJSON(), []string{tmpInvalid.Name()})
131132
require.Error(t, err)
132133

133134
// Valid PEM (RSA public key) one & algorithm branch
135+
// nolint: goconst
134136
validPEM := `-----BEGIN PUBLIC KEY-----
135137
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjR+4XbCgepL6/I7KLqUJ
136138
m3sUNwcCCLJDMiIZbHS3duf7oYdOtVeAykP4ga6cmJZZE+1+TiiXZArXwOx6fO1N
@@ -142,7 +144,8 @@ AwIDAQAB
142144
-----END PUBLIC KEY-----`
143145
tmpValid, _ := os.CreateTemp("", "valid*.pem")
144146
defer os.Remove(tmpValid.Name())
145-
tmpValid.WriteString(validPEM)
147+
_, err = tmpValid.WriteString(validPEM)
148+
require.NoError(t, err)
146149
tmpValid.Close()
147150

148151
out, err := clitestutil.ExecTestCLICmd(ctx, cli.CmdConvertPemToJSON(), []string{tmpValid.Name()})
@@ -303,7 +306,8 @@ iTo7Tu6KPAqv7D7gS2XpJFbZiItSs3m9+9Ue6GnvHw/GW2ZZaVtszggXIw==
303306
-----END PUBLIC KEY-----`
304307
tmpEC, _ := os.CreateTemp("", "ec*.pem")
305308
defer os.Remove(tmpEC.Name())
306-
tmpEC.WriteString(ecPEM)
309+
_, err := tmpEC.WriteString(ecPEM)
310+
require.NoError(t, err)
307311
tmpEC.Close()
308312

309313
out, err := clitestutil.ExecTestCLICmd(ctx, cli.CmdConvertPemToJSON(), []string{tmpEC.Name()})
@@ -432,7 +436,8 @@ AwIDAQAB
432436
-----END PUBLIC KEY-----`
433437
tmpValid, _ := os.CreateTemp("", "test*.pem")
434438
defer os.Remove(tmpValid.Name())
435-
tmpValid.WriteString(validPEM)
439+
_, err := tmpValid.WriteString(validPEM)
440+
require.NoError(t, err)
436441
tmpValid.Close()
437442

438443
// With empty context, may succeed with parsing but fail on output
@@ -508,16 +513,20 @@ func TestUpdateAudienceAdditionalPaths(t *testing.T) {
508513

509514
// Test with flags - should use default admin when new-admin is empty
510515
args := []string{"aud", "key"}
511-
cmd.Flags().Set("new-admin", "") // Empty admin should use default
512-
cmd.Flags().Set("new-aud", "new-aud")
516+
err := cmd.Flags().Set("new-admin", "") // Empty admin should use default
517+
require.NoError(t, err)
518+
err = cmd.Flags().Set("new-aud", "new-aud")
519+
require.NoError(t, err)
513520
// This should fail because the mock context doesn't provide a valid from address
514-
_, err := clitestutil.ExecTestCLICmd(ctx, cmd, args)
521+
_, err = clitestutil.ExecTestCLICmd(ctx, cmd, args)
515522
require.Error(t, err) // Expecting error due to invalid address
516523

517524
// Test with explicit new-admin
518525
cmd2 := cli.CmdUpdateAudience()
519-
cmd2.Flags().Set("new-admin", "cosmos1testadmin")
520-
cmd2.Flags().Set("new-aud", "new-aud")
526+
err = cmd2.Flags().Set("new-admin", "cosmos1testadmin")
527+
require.NoError(t, err)
528+
err = cmd2.Flags().Set("new-aud", "new-aud")
529+
require.NoError(t, err)
521530
_, err = clitestutil.ExecTestCLICmd(ctx, cmd2, args)
522531
require.Error(t, err) // Still expecting error due to invalid bech32 format
523532
}
@@ -544,8 +553,9 @@ func TestQueryCommandsFullCoverage(t *testing.T) {
544553
listCmd := cli.CmdListAudience()
545554

546555
// Test with page-key
547-
listCmd.Flags().Set("page-key", "test-key")
548-
_, err := clitestutil.ExecTestCLICmd(ctx, listCmd, []string{})
556+
err := listCmd.Flags().Set("page-key", "test-key")
557+
require.NoError(t, err)
558+
_, err = clitestutil.ExecTestCLICmd(ctx, listCmd, []string{})
549559
require.NoError(t, err)
550560

551561
// Test params command
@@ -579,10 +589,12 @@ func TestListAudiencePaginationError(t *testing.T) {
579589

580590
// Set invalid pagination values that should cause ReadPageRequest to fail
581591
// Use both page and page-key which should be mutually exclusive
582-
cmd.Flags().Set("page", "1")
583-
cmd.Flags().Set("page-key", "somekey")
592+
err := cmd.Flags().Set("page", "1")
593+
require.NoError(t, err)
594+
err = cmd.Flags().Set("page-key", "somekey")
595+
require.NoError(t, err)
584596

585-
_, err := clitestutil.ExecTestCLICmd(ctx, cmd, []string{})
597+
_, err = clitestutil.ExecTestCLICmd(ctx, cmd, []string{})
586598
// The pagination test may not fail with negative limit, so let's check any pagination error
587599
if err != nil {
588600
// Good, we got an error from pagination validation
@@ -625,8 +637,10 @@ func TestTxContextErrors(t *testing.T) {
625637

626638
// Test CmdUpdateAudience with empty context
627639
updateCmd := cli.CmdUpdateAudience()
628-
updateCmd.Flags().Set("new-admin", "cosmos1test")
629-
updateCmd.Flags().Set("new-aud", "new-aud")
640+
err = updateCmd.Flags().Set("new-admin", "cosmos1test")
641+
require.NoError(t, err)
642+
err = updateCmd.Flags().Set("new-aud", "new-aud")
643+
require.NoError(t, err)
630644
_, err = clitestutil.ExecTestCLICmd(emptyCtx, updateCmd, []string{"aud", "key"})
631645
require.Error(t, err) // Should fail with tx context error
632646

0 commit comments

Comments
 (0)