fix: validate validator addresses in update-validator-auths proposal #411
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Package rest provides HTTP types and primitives for REST | ||
|
There was a problem hiding this comment. import rest.go from cosmos-sdk |
||
| // requests validation and responses handling. | ||
| package rest | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "net/http" | ||
| ) | ||
|
|
||
| // GetRequest defines a wrapper around an HTTP GET request with a provided URL. | ||
| // An error is returned if the request or reading the body fails. | ||
| func GetRequest(url string) ([]byte, error) { | ||
| res, err := http.Get(url) // nolint:gosec | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer res.Body.Close() | ||
|
|
||
| body, err := ioutil.ReadAll(res.Body) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return body, nil | ||
| } | ||
|
|
||
| // PostRequest defines a wrapper around an HTTP POST request with a provided URL and data. | ||
| // An error is returned if the request or reading the body fails. | ||
| func PostRequest(url string, contentType string, data []byte) ([]byte, error) { | ||
| res, err := http.Post(url, contentType, bytes.NewBuffer(data)) // nolint:gosec | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error while sending post request: %w", err) | ||
| } | ||
| defer res.Body.Close() | ||
|
|
||
| bz, err := ioutil.ReadAll(res.Body) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error reading response body: %w", err) | ||
| } | ||
|
|
||
| return bz, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,24 +11,24 @@ import ( | |
| "github.com/line/lbm-sdk/x/consortium/types" | ||
| ) | ||
|
|
||
| // NewQueryCmd returns the parent command for all x/consortium CLi query commands. | ||
| func NewQueryCmd() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: types.ModuleName, | ||
| Short: "Querying commands for the consortium module", | ||
| } | ||
|
|
||
| cmd.AddCommand( | ||
| NewQueryCmdParams(), | ||
| NewQueryCmdValidatorAuth(), | ||
| NewQueryCmdValidatorAuths(), | ||
|
Comment on lines
-22
to
+24
There was a problem hiding this comment. Why did you change the name with prefix There was a problem hiding this comment. I think it's a matter of choice. You can use both of New and Get, then they would mean creating a new command instance and get a command instance, respectively. An example of New: An example of Get: It is interesting that they are both in the same module. |
||
| ) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| // NewQueryCmdParams returns the query consortium parameters command. | ||
| func NewQueryCmdParams() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "params", | ||
| Short: "Query consortium params", | ||
|
|
@@ -56,27 +56,27 @@ func GetParamsCmd() *cobra.Command { | |
| return cmd | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. reposition the two functions |
||
| // NewQueryCmdValidatorAuth returns validator authorization by consortium | ||
| func NewQueryCmdValidatorAuth() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "validator-auth [validator-address]", | ||
| Short: "Query validator authorization", | ||
| Long: "Gets validator authorization by consortium", | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| clientCtx, err := client.GetClientQueryContext(cmd) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| queryClient := types.NewQueryClient(clientCtx) | ||
|
|
||
| valAddr := args[0] | ||
| if err = sdk.ValidateValAddress(valAddr); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| params := types.QueryValidatorAuthRequest{ValidatorAddress: valAddr} | ||
| res, err := queryClient.ValidatorAuth(context.Background(), ¶ms) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -86,32 +86,31 @@ func GetValidatorAuthsCmd() *cobra.Command { | |
| } | ||
|
|
||
| flags.AddQueryFlagsToCmd(cmd) | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| // NewQueryCmdValidatorAuths returns validator authorizations by consortium | ||
| func NewQueryCmdValidatorAuths() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "validator-auths", | ||
| Short: "Query validator authorizations", | ||
| Long: "Gets validator authorizations by consortium", | ||
| Args: cobra.NoArgs, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| clientCtx, err := client.GetClientQueryContext(cmd) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| queryClient := types.NewQueryClient(clientCtx) | ||
|
|
||
| pageReq, err := client.ReadPageRequest(cmd.Flags()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| params := types.QueryValidatorAuthsRequest{Pagination: pageReq} | ||
| res, err := queryClient.ValidatorAuths(context.Background(), ¶ms) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -121,6 +120,7 @@ func GetValidatorAuthCmd() *cobra.Command { | |
| } | ||
|
|
||
| flags.AddQueryFlagsToCmd(cmd) | ||
| flags.AddPaginationFlagsToCmd(cmd, "validator auths") | ||
|
|
||
| return cmd | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // +build norace | ||
|
|
||
| package testutil | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/suite" | ||
|
|
||
| "github.com/line/lbm-sdk/testutil/network" | ||
| ) | ||
|
|
||
| func TestIntegrationTestSuite(t *testing.T) { | ||
| cfg := network.DefaultConfig() | ||
| cfg.NumValidators = 1 | ||
| suite.Run(t, NewIntegrationTestSuite(cfg)) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reposition the two functions