Skip to content

feat: check latest block if no arg in q block and q block-results (backport #21084) #21110

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

Merged
tac0turtle merged 2 commits into from
Jul 30, 2024
Merged

feat: check latest block if no arg in q block and q block-results (backport #21084) #21110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b5920c
feat: check latest block if no arg in `q block` and `q block-results`…
julienrbrt Jul 29, 2024
ecdc559
'fix conflicts`
tac0turtle Jul 30, 2024
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
26 changes: 0 additions & 26 deletions schema/module_schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ func TestModuleSchema_Validate(t *testing.T) {
},
{
name: "same enum",
<<<<<<< HEAD
moduleSchema: ModuleSchema{
ObjectTypes: []ObjectType{
{
Expand All @@ -138,31 +137,6 @@ func TestModuleSchema_Validate(t *testing.T) {
Name: "enum1",
Values: []string{"a", "b"},
},
=======
objectTypes: []ObjectType{
{
Name: "object1",
KeyFields: []Field{
{
Name: "k",
Kind: EnumKind,
EnumType: EnumType{
Name: "enum1",
Values: []string{"a", "b"},
},
},
},
},
{
Name: "object2",
KeyFields: []Field{
{
Name: "k",
Kind: EnumKind,
EnumType: EnumType{
Name: "enum1",
Values: []string{"a", "b"},
>>>>>>> 5c90246b3 (feat(log): remove core dependency and update core interface to be dependency free (#21045))
},
},
},
Expand Down
60 changes: 32 additions & 28 deletions server/cmt_cmds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,32 +226,45 @@ $ %s query block --%s=%s <hash>
`,
version.AppName, auth.FlagType, auth.TypeHeight,
version.AppName, auth.FlagType, auth.TypeHash)),
Args: cobra.ExactArgs(1),
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientQueryContext(cmd)
if err != nil {
return err
}

typ, _ := cmd.Flags().GetString(auth.FlagType)
if len(args) == 0 {
// do not break default v0.50 behavior of block hash
// if no args are provided, set the type to height
typ = auth.TypeHeight
}

switch typ {
case auth.TypeHeight:

if args[0] == "" {
return fmt.Errorf("argument should be a block height")
var (
err error
height int64
)
heightStr := ""
if len(args) > 0 {
heightStr = args[0]
}

// optional height
var height *int64
if len(args) > 0 {
height, err = parseOptionalHeight(args[0])
if heightStr == "" {
cmd.Println("Falling back to latest block height:")
height, err = rpc.GetChainHeight(clientCtx)
if err != nil {
return fmt.Errorf("failed to get chain height: %w", err)
}
} else {
height, err = strconv.ParseInt(heightStr, 10, 64)
if err != nil {
return err
return fmt.Errorf("failed to parse block height: %w", err)
}
}

output, err := rpc.GetBlockByHeight(clientCtx, height)
output, err := rpc.GetBlockByHeight(clientCtx, &height)
if err != nil {
return err
}
Expand Down Expand Up @@ -311,15 +324,21 @@ func QueryBlockResultsCmd() *cobra.Command {
}

// optional height
var height *int64
var height int64
if len(args) > 0 {
height, err = parseOptionalHeight(args[0])
height, err = strconv.ParseInt(args[0], 10, 64)
if err != nil {
return err
}
} else {
cmd.Println("Falling back to latest block height:")
height, err = rpc.GetChainHeight(clientCtx)
if err != nil {
return fmt.Errorf("failed to get chain height: %w", err)
}
}

blockRes, err := node.BlockResults(context.Background(), height)
blockRes, err := node.BlockResults(context.Background(), &height)
if err != nil {
return err
}
Expand All @@ -341,21 +360,6 @@ func QueryBlockResultsCmd() *cobra.Command {
return cmd
}

func parseOptionalHeight(heightStr string) (*int64, error) {
h, err := strconv.Atoi(heightStr)
if err != nil {
return nil, err
}

if h == 0 {
return nil, nil
}

tmp := int64(h)

return &tmp, nil
}

func BootstrapStateCmd[T types.Application](appCreator types.AppCreator[T]) *cobra.Command {
cmd := &cobra.Command{
Use: "bootstrap-state",
Expand Down