Skip to content

Commit ea514b3

Browse files
authored
Merge branch 'rc9/v0.46.0' into fix_attributekey
2 parents 87a51b8 + b845d33 commit ea514b3

File tree

13 files changed

+44
-14
lines changed

13 files changed

+44
-14
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
4444
### Bug Fixes
4545
* (x/foundation) [\#772](https://github.com/line/lbm-sdk/pull/772) export x/foundation pool
4646
* (baseapp) [\#781](https://github.com/line/lbm-sdk/pull/781) implement method `SetOption()` in baseapp
47+
* (global) [\#782](https://github.com/line/lbm-sdk/pull/782) add unhandled return error handling
4748
* (x/collection,token) [\#784](https://github.com/line/lbm-sdk/pull/784) make field key matching in x/token & x/collection case-sensitive
4849

4950
### Breaking Changes

baseapp/grpcserver.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ func (app *BaseApp) RegisterGRPCServer(server gogogrpc.Server) {
6161
grpcCtx = context.WithValue(grpcCtx, sdk.SdkContextKey, sdkCtx)
6262

6363
md = metadata.Pairs(grpctypes.GRPCBlockHeightHeader, strconv.FormatInt(height, 10))
64-
grpc.SetHeader(grpcCtx, md)
64+
if err = grpc.SetHeader(grpcCtx, md); err != nil {
65+
return nil, err
66+
}
6567

6668
return handler(grpcCtx, req)
6769
}

server/start.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ is performed. Note, when enabled, gRPC will also be automatically enabled.
112112

113113
// Bind flags to the Context's Viper so the app construction can set
114114
// options accordingly.
115-
serverCtx.Viper.BindPFlags(cmd.Flags())
115+
if err := serverCtx.Viper.BindPFlags(cmd.Flags()); err != nil {
116+
return err
117+
}
116118

117119
_, err := GetPruningOptionsFromFlags(serverCtx.Viper)
118120
return err

server/util.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,12 @@ func InterceptConfigsPreRunHandler(cmd *cobra.Command, customAppConfigTemplate s
120120
basename := path.Base(executableName)
121121

122122
// Configure the viper instance
123-
serverCtx.Viper.BindPFlags(cmd.Flags())
124-
serverCtx.Viper.BindPFlags(cmd.PersistentFlags())
123+
if err = serverCtx.Viper.BindPFlags(cmd.Flags()); err != nil {
124+
return err
125+
}
126+
if err = serverCtx.Viper.BindPFlags(cmd.PersistentFlags()); err != nil {
127+
return err
128+
}
125129
serverCtx.Viper.SetEnvPrefix(basename)
126130
serverCtx.Viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
127131
serverCtx.Viper.AutomaticEnv()

x/auth/client/rest/query.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,10 @@ func QueryTxsRequestHandlerFn(clientCtx client.Context) http.HandlerFunc {
103103
}
104104

105105
for _, txRes := range searchResult.Txs {
106-
packStdTxResponse(w, clientCtx, txRes)
106+
if err = packStdTxResponse(w, clientCtx, txRes); err != nil {
107+
// Error is already returned by packStdTxResponse.
108+
return
109+
}
107110
}
108111

109112
err = checkAminoMarshalError(clientCtx, searchResult, "/cosmos/tx/v1beta1/txs")

x/bank/client/cli/tx.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ func NewSendTxCmd() *cobra.Command {
3333
ignored as it is implied from [from_key_or_address].`,
3434
Args: cobra.ExactArgs(3),
3535
RunE: func(cmd *cobra.Command, args []string) error {
36-
cmd.Flags().Set(flags.FlagFrom, args[0])
36+
if err := cmd.Flags().Set(flags.FlagFrom, args[0]); err != nil {
37+
return err
38+
}
3739
clientCtx, err := client.GetClientTxContext(cmd)
3840
if err != nil {
3941
return err

x/feegrant/client/cli/tx.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ Examples:
6464
Args: cobra.ExactArgs(2),
6565
RunE: func(cmd *cobra.Command, args []string) error {
6666

67-
cmd.Flags().Set(flags.FlagFrom, args[0])
67+
if err := cmd.Flags().Set(flags.FlagFrom, args[0]); err != nil {
68+
return err
69+
}
6870
clientCtx, err := client.GetClientTxContext(cmd)
6971
if err != nil {
7072
return err
@@ -195,7 +197,9 @@ Example:
195197
),
196198
Args: cobra.ExactArgs(2),
197199
RunE: func(cmd *cobra.Command, args []string) error {
198-
cmd.Flags().Set(flags.FlagFrom, args[0])
200+
if err := cmd.Flags().Set(flags.FlagFrom, args[0]); err != nil {
201+
return err
202+
}
199203
clientCtx, err := client.GetClientTxContext(cmd)
200204
if err != nil {
201205
return err

x/foundation/keeper/member.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ func validateMetadata(metadata string, config foundation.Config) error {
1616

1717
func (k Keeper) UpdateDecisionPolicy(ctx sdk.Context, policy foundation.DecisionPolicy) error {
1818
info := k.GetFoundationInfo(ctx)
19-
info.SetDecisionPolicy(policy)
19+
if err := info.SetDecisionPolicy(policy); err != nil {
20+
return err
21+
}
2022
info.Version++
2123
k.SetFoundationInfo(ctx, info)
2224

x/slashing/genesis.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, stakingKeeper types.Stak
1616
if err != nil {
1717
panic(err)
1818
}
19-
keeper.AddPubkey(ctx, consPk)
19+
if err = keeper.AddPubkey(ctx, consPk); err != nil {
20+
panic(err)
21+
}
2022
return false
2123
},
2224
)

x/slashing/keeper/hooks.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ func (k Keeper) AfterValidatorCreated(ctx sdk.Context, valAddr sdk.ValAddress) e
3232
if err != nil {
3333
return err
3434
}
35-
k.AddPubkey(ctx, consPk)
35+
if err = k.AddPubkey(ctx, consPk); err != nil {
36+
return err
37+
}
3638

3739
return nil
3840
}

x/staking/genesis.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ func InitGenesis(
3939
keeper.SetValidator(ctx, validator)
4040

4141
// Manually set indices for the first time
42-
keeper.SetValidatorByConsAddr(ctx, validator)
42+
if err := keeper.SetValidatorByConsAddr(ctx, validator); err != nil {
43+
panic(err)
44+
}
4345
keeper.SetValidatorByPowerIndex(ctx, validator)
4446

4547
// Call the creation hook if not exported

x/staking/keeper/msg_server.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ func (k msgServer) CreateValidator(goCtx context.Context, msg *types.MsgCreateVa
9292
validator.MinSelfDelegation = msg.MinSelfDelegation
9393

9494
k.SetValidator(ctx, validator)
95-
k.SetValidatorByConsAddr(ctx, validator)
95+
if err = k.SetValidatorByConsAddr(ctx, validator); err != nil {
96+
return nil, err
97+
}
9698
k.SetNewValidatorByPowerIndex(ctx, validator)
9799

98100
// call the after-creation hook

x/wasm/client/cli/query.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,9 @@ func withPageKeyDecoded(flagSet *flag.FlagSet) *flag.FlagSet {
538538
if err != nil {
539539
panic(err.Error())
540540
}
541-
flagSet.Set(flags.FlagPageKey, string(raw))
541+
if err = flagSet.Set(flags.FlagPageKey, string(raw)); err != nil {
542+
panic(err.Error())
543+
}
542544
return flagSet
543545
}
544546

0 commit comments

Comments
 (0)