Skip to content

Commit e1f1fa2

Browse files
RogerKSIRogerKSI
committed
cleanup
1 parent 9f12afa commit e1f1fa2

File tree

12 files changed

+148
-144
lines changed

12 files changed

+148
-144
lines changed

‎pkg/grant/grant.go‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
package grant
2+
3+
import (
4+
"time"
5+
6+
"github.com/cosmos/cosmos-sdk/client"
7+
"github.com/cosmos/cosmos-sdk/client/tx"
8+
sdk "github.com/cosmos/cosmos-sdk/types"
9+
"github.com/cosmos/cosmos-sdk/x/authz"
10+
"github.com/spf13/cobra"
11+
)
12+
13+
// AddGranteeCmd returns a command to add a grantee to a granter.
14+
func AddGranteeCmd(msgGrants []string, flagExpiration string) func(cmd *cobra.Command, args []string) error {
15+
return func(cmd *cobra.Command, args []string) error {
16+
clientCtx, err := client.GetClientTxContext(cmd)
17+
if err != nil {
18+
return err
19+
}
20+
21+
exp, err := cmd.Flags().GetInt64(flagExpiration)
22+
if err != nil {
23+
return err
24+
}
25+
expTime := time.Unix(exp, 0)
26+
27+
granter := clientCtx.GetFromAddress()
28+
msgs := []sdk.Msg{}
29+
30+
for _, arg := range args {
31+
grantee, err := sdk.AccAddressFromBech32(arg)
32+
if err != nil {
33+
return err
34+
}
35+
36+
gMsgs, err := combineGrantMsgs(granter, grantee, msgGrants, &expTime)
37+
if err != nil {
38+
return err
39+
}
40+
msgs = append(msgs, gMsgs...)
41+
}
42+
43+
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgs...)
44+
}
45+
}
46+
47+
// RemoveGranteeCmd returns a command to remove a grantee from a granter.
48+
func RemoveGranteeCmd(msgRevokes []string) func(cmd *cobra.Command, args []string) error {
49+
return func(cmd *cobra.Command, args []string) error {
50+
clientCtx, err := client.GetClientTxContext(cmd)
51+
if err != nil {
52+
return err
53+
}
54+
55+
granter := clientCtx.GetFromAddress()
56+
msgs := []sdk.Msg{}
57+
58+
for _, arg := range args {
59+
grantee, err := sdk.AccAddressFromBech32(arg)
60+
if err != nil {
61+
return err
62+
}
63+
64+
rMsgs, err := combineRevokeMsgs(granter, grantee, msgRevokes)
65+
if err != nil {
66+
return err
67+
}
68+
msgs = append(msgs, rMsgs...)
69+
}
70+
71+
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgs...)
72+
}
73+
}
74+
75+
// combineGrantMsgs combines multiple grant messages into a single slice of messages.
76+
func combineGrantMsgs(
77+
granter sdk.AccAddress,
78+
grantee sdk.AccAddress,
79+
msgGrants []string,
80+
expiration *time.Time,
81+
) ([]sdk.Msg, error) {
82+
msgs := []sdk.Msg{}
83+
84+
for _, msgGrant := range msgGrants {
85+
msg, err := authz.NewMsgGrant(
86+
granter,
87+
grantee,
88+
authz.NewGenericAuthorization(msgGrant),
89+
expiration,
90+
)
91+
if err != nil {
92+
return nil, err
93+
}
94+
95+
if err = msg.ValidateBasic(); err != nil {
96+
return nil, err
97+
}
98+
99+
msgs = append(msgs, msg)
100+
}
101+
102+
return msgs, nil
103+
}
104+
105+
// combineRevokeMsgs combines multiple revoke messages into a single slice of messages.
106+
func combineRevokeMsgs(granter sdk.AccAddress, grantee sdk.AccAddress, msgRevokes []string) ([]sdk.Msg, error) {
107+
msgs := []sdk.Msg{}
108+
109+
for _, msgRevoke := range msgRevokes {
110+
msg := authz.NewMsgRevoke(
111+
granter,
112+
grantee,
113+
msgRevoke,
114+
)
115+
116+
if err := msg.ValidateBasic(); err != nil {
117+
return nil, err
118+
}
119+
120+
msgs = append(msgs, &msg)
121+
}
122+
123+
return msgs, nil
124+
}

‎x/feeds/client/cli/tx.go‎

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/cosmos/cosmos-sdk/version"
1414
"github.com/spf13/cobra"
1515

16+
"github.com/bandprotocol/chain/v2/pkg/grant"
1617
"github.com/bandprotocol/chain/v2/x/feeds/types"
1718
)
1819

@@ -114,37 +115,7 @@ $ %s tx feeds add-grantees band1p40yh3zkmhcv0ecqp3mcazy83sa57rgjp07dun band1m5lq
114115
version.AppName,
115116
),
116117
),
117-
RunE: func(cmd *cobra.Command, args []string) error {
118-
clientCtx, err := client.GetClientTxContext(cmd)
119-
if err != nil {
120-
return err
121-
}
122-
123-
exp, err := cmd.Flags().GetInt64(flagExpiration)
124-
if err != nil {
125-
return err
126-
}
127-
expTime := time.Unix(exp, 0)
128-
129-
granter := clientCtx.GetFromAddress()
130-
var msgs []sdk.Msg
131-
132-
for _, arg := range args {
133-
grantee, err := sdk.AccAddressFromBech32(arg)
134-
if err != nil {
135-
return err
136-
}
137-
138-
gMsgs, err := combineGrantMsgs(granter, grantee, getGrantMsgTypes(), &expTime)
139-
if err != nil {
140-
return err
141-
}
142-
143-
msgs = append(msgs, gMsgs...)
144-
}
145-
146-
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgs...)
147-
},
118+
RunE: grant.AddGranteeCmd(getGrantMsgTypes(), flagExpiration),
148119
}
149120

150121
cmd.Flags().
@@ -173,30 +144,7 @@ $ %s tx feeds remove-grantees band1p40yh3zkmhcv0ecqp3mcazy83sa57rgjp07dun band1m
173144
version.AppName,
174145
),
175146
),
176-
RunE: func(cmd *cobra.Command, args []string) error {
177-
clientCtx, err := client.GetClientTxContext(cmd)
178-
if err != nil {
179-
return err
180-
}
181-
182-
granter := clientCtx.GetFromAddress()
183-
var msgs []sdk.Msg
184-
185-
for _, arg := range args {
186-
grantee, err := sdk.AccAddressFromBech32(arg)
187-
if err != nil {
188-
return err
189-
}
190-
191-
rMsgs, err := combineRevokeMsgs(granter, grantee, getGrantMsgTypes())
192-
if err != nil {
193-
return err
194-
}
195-
196-
msgs = append(msgs, rMsgs...)
197-
}
198-
return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msgs...)
199-
},
147+
RunE: grant.RemoveGranteeCmd(getGrantMsgTypes()),
200148
}
201149

202150
flags.AddTxFlagsToCmd(cmd)

‎x/feeds/client/cli/utils.go‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎x/feeds/keeper/hooks.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ func (h Hooks) BeforeDelegationRemoved(ctx sdk.Context, delAddr sdk.AccAddress,
6767
if power > delegated.Int64() {
6868
return types.ErrUnableToUndelegate
6969
}
70+
7071
return nil
7172
}
7273

@@ -76,6 +77,7 @@ func (h Hooks) AfterDelegationModified(ctx sdk.Context, delAddr sdk.AccAddress,
7677
if power > delegated {
7778
return types.ErrUnableToUndelegate
7879
}
80+
7981
return nil
8082
}
8183

‎x/feeds/keeper/keeper_feed.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import (
77
)
88

99
// GetSupportedFeeds gets the current supported feeds.
10-
func (k Keeper) GetSupportedFeeds(ctx sdk.Context) (oc types.SupportedFeeds) {
10+
func (k Keeper) GetSupportedFeeds(ctx sdk.Context) (sp types.SupportedFeeds) {
1111
bz := ctx.KVStore(k.storeKey).Get(types.SupportedFeedsStoreKey)
1212
if bz == nil {
13-
return oc
13+
return sp
1414
}
1515

16-
k.cdc.MustUnmarshal(bz, &oc)
16+
k.cdc.MustUnmarshal(bz, &sp)
1717

18-
return oc
18+
return sp
1919
}
2020

2121
// SetSupportedFeeds sets new supported feeds to the store.

‎x/feeds/keeper/keeper_params.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ func (k Keeper) SetParams(ctx sdk.Context, p types.Params) error {
1313
}
1414

1515
ctx.KVStore(k.storeKey).Set(types.ParamsKey, k.cdc.MustMarshal(&p))
16+
1617
return nil
1718
}
1819

@@ -24,5 +25,6 @@ func (k Keeper) GetParams(ctx sdk.Context) (p types.Params) {
2425
}
2526

2627
k.cdc.MustUnmarshal(bz, &p)
28+
2729
return p
2830
}

‎x/feeds/keeper/keeper_price.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ func (k Keeper) CalculatePrice(
162162
}
163163

164164
totalPower, availablePower, _, unsupportedPower := types.CalculatePricesPowers(priceFeedInfos)
165+
165166
// If more than half of the total have unsupported price status, it returns an unsupported price status.
166167
if unsupportedPower > totalPower/2 {
167168
return types.Price{
@@ -171,6 +172,7 @@ func (k Keeper) CalculatePrice(
171172
Timestamp: ctx.BlockTime().Unix(),
172173
}, nil
173174
}
175+
174176
// If less than half of total have available price status, it returns an unavailable price status.
175177
if availablePower < totalPower/2 {
176178
return types.Price{
@@ -245,6 +247,7 @@ func (k Keeper) SetValidatorPrices(ctx sdk.Context, valPrices []types.ValidatorP
245247
return err
246248
}
247249
}
250+
248251
return nil
249252
}
250253

‎x/feeds/keeper/keeper_price_service.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import (
77
)
88

99
// GetPriceService gets the current price service.
10-
func (k Keeper) GetPriceService(ctx sdk.Context) (oc types.PriceService) {
10+
func (k Keeper) GetPriceService(ctx sdk.Context) (ps types.PriceService) {
1111
bz := ctx.KVStore(k.storeKey).Get(types.PriceServiceStoreKey)
1212
if bz == nil {
13-
return oc
13+
return ps
1414
}
1515

16-
k.cdc.MustUnmarshal(bz, &oc)
16+
k.cdc.MustUnmarshal(bz, &ps)
1717

18-
return oc
18+
return ps
1919
}
2020

2121
// SetPriceService sets new price service to the store.
@@ -25,5 +25,6 @@ func (k Keeper) SetPriceService(ctx sdk.Context, ps types.PriceService) error {
2525
}
2626

2727
ctx.KVStore(k.storeKey).Set(types.PriceServiceStoreKey, k.cdc.MustMarshal(&ps))
28+
2829
return nil
2930
}

‎x/feeds/keeper/price.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ func (k Keeper) ValidateSubmitPricesRequest(
3030
req.Timestamp,
3131
)
3232
}
33+
3334
return nil
3435
}
3536

0 commit comments

Comments
 (0)