Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-03-30 15:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve get-distribution CLI output and error handling (#279)

Browse Source 
* refactor: rename variable

Signed-off-by: Julian Strobl <jmastr@mailbox.org>
This commit is contained in:
Julian Strobl 2024-01-16 09:11:44 +01:00 committed by GitHub
parent 6d7a5f1acb
commit 525d6a8da6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 163 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/static/openapi.yml vendored
View File

@ -47148,7 +47148,7 @@ paths:
format: int64
tags:
- Query
/planetmint/planetmint-go/dao/get_distribution/{lastPopHeight}:
/planetmint/planetmint-go/dao/get_distribution/{height}:
get:
summary: Queries a list of GetDistribution items.
operationId: PlanetmintgoDaoGetDistribution
@ -47206,7 +47206,7 @@ paths:
type: string
additionalProperties: {}
parameters:
- name: lastPopHeight
- name: height
in: path
required: true
type: string

4
proto/planetmintgo/dao/query.proto
View File

@ -61,7 +61,7 @@ service Query {
// Queries a list of GetDistribution items.
rpc GetDistribution (QueryGetDistributionRequest) returns (QueryGetDistributionResponse) {
option (google.api.http).get = "/planetmint/planetmint-go/dao/get_distribution/{lastPopHeight}";
option (google.api.http).get = "/planetmint/planetmint-go/dao/get_distribution/{height}";
}
}
@ -132,7 +132,7 @@ message QueryChallengesResponse {
}
message QueryGetDistributionRequest {
int64 lastPopHeight = 1;
int64 height = 1;
}
message QueryGetDistributionResponse {

50
tests/e2e/dao/asset_distribution_suite.go
View File

@ -1,6 +1,7 @@
package dao
import (
"fmt"
"math"
"strconv"
@ -9,6 +10,7 @@ import (
"github.com/planetmint/planetmint-go/testutil/network"
"github.com/planetmint/planetmint-go/testutil/sample"
daocli "github.com/planetmint/planetmint-go/x/dao/client/cli"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
)
@ -50,17 +52,55 @@ func (s *AssetDistributionE2ETestSuite) TestAssetDistribution() {
// wait so that we see exactly on reissuance/distribution round, e.g.
// wait = ceil((10 - 5) / 2) = ceil(2.5) = 3
wait := int(math.Ceil((float64(conf.ReissuanceEpochs) - float64(conf.DistributionOffset)) / 2.0))
height := conf.ReissuanceEpochs + conf.DistributionOffset + wait
for {
latestHeight, err = s.network.WaitForHeight(latestHeight + 1)
s.Require().NoError(err)
if latestHeight == int64(conf.ReissuanceEpochs+conf.DistributionOffset+wait) {
if latestHeight == int64(height) {
break
}
}
_, err = clitestutil.ExecTestCLICmd(val.ClientCtx, daocli.CmdGetDistribution(), []string{
strconv.Itoa(conf.ReissuanceEpochs + conf.DistributionOffset),
})
s.Require().NoError(err)
testCases := []struct {
name string
requestHeight int
expectedErr string
}{
{
"request height too low",
conf.DistributionOffset,
fmt.Sprintf("distribution wrong height: must be equal to or greater then %d",
conf.ReissuanceEpochs+conf.DistributionOffset),
},
{
"wrong request height",
height,
fmt.Sprintf("distribution wrong height: must equal to (n * %d) + %d, where n = 1, 2, 3, and so on",
conf.ReissuanceEpochs, conf.DistributionOffset),
},
{
"request height too high",
2*conf.ReissuanceEpochs + conf.DistributionOffset,
fmt.Sprintf("height %d must be less than or equal to the current blockchain height %d",
2*conf.ReissuanceEpochs+conf.DistributionOffset, height),
},
{
"valid distribution request",
conf.ReissuanceEpochs + conf.DistributionOffset,
"",
},
}
for _, tc := range testCases {
_, err = clitestutil.ExecTestCLICmd(val.ClientCtx, daocli.CmdGetDistribution(), []string{
strconv.Itoa(tc.requestHeight),
})
if tc.expectedErr == "" {
s.Require().NoError(err)
} else {
s.Require().Error(err)
assert.Equal(s.T(), tc.expectedErr, err.Error())
}
}
}

34
x/dao/client/cli/query_get_distribution.go
View File

@ -1,10 +1,13 @@
package cli
import (
"fmt"
"strconv"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/rpc"
"github.com/planetmint/planetmint-go/config"
"github.com/planetmint/planetmint-go/x/dao/types"
"github.com/spf13/cast"
"github.com/spf13/cobra"
@ -14,11 +17,12 @@ var _ = strconv.Itoa(0)
func CmdGetDistribution() *cobra.Command {
cmd := &cobra.Command{
Use: "get-distribution [block-height]",
Short: "Query get_distribution",
Use: "get-distribution [height]",
Short: "Query for distributions by height",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) (err error) {
reqLastPopHeight, err := cast.ToInt64E(args[0])
conf := config.GetConfig()
requestHeight, err := cast.ToInt64E(args[0])
if err != nil {
return err
}
@ -28,11 +32,31 @@ func CmdGetDistribution() *cobra.Command {
return err
}
latestHeight, err := rpc.GetChainHeight(clientCtx)
if err != nil {
return err
}
if requestHeight > latestHeight {
err = fmt.Errorf("height %d must be less than or equal to the current blockchain height %d",
requestHeight, latestHeight)
return err
}
if requestHeight < (int64(conf.ReissuanceEpochs) + int64(conf.DistributionOffset)) {
err = fmt.Errorf("%w: must be equal to or greater then %d",
types.ErrDistributionWrongHeight, conf.ReissuanceEpochs+conf.DistributionOffset)
return err
}
if requestHeight%int64(conf.ReissuanceEpochs) != int64(conf.DistributionOffset) {
err = fmt.Errorf("%w: must equal to (n * %d) + %d, where n = 1, 2, 3, and so on",
types.ErrDistributionWrongHeight, conf.ReissuanceEpochs, conf.DistributionOffset)
return err
}
queryClient := types.NewQueryClient(clientCtx)
params := &types.QueryGetDistributionRequest{
LastPopHeight: reqLastPopHeight,
Height: requestHeight,
}
res, err := queryClient.GetDistribution(cmd.Context(), params)

4
x/dao/keeper/distribution.go
View File

@ -16,9 +16,9 @@ func (k Keeper) StoreDistributionOrder(ctx sdk.Context, distributionOrder types.
store.Set(util.SerializeInt64(distributionOrder.LastPop), appendValue)
}
func (k Keeper) LookupDistributionOrder(ctx sdk.Context, lastPopHeight int64) (val types.DistributionOrder, found bool) {
func (k Keeper) LookupDistributionOrder(ctx sdk.Context, height int64) (val types.DistributionOrder, found bool) {
store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.DistributionKey))
distributionOrder := store.Get(util.SerializeInt64(lastPopHeight))
distributionOrder := store.Get(util.SerializeInt64(height))
if distributionOrder == nil {
return val, false
}

2
x/dao/keeper/query_get_distribution.go
View File

@ -16,7 +16,7 @@ func (k Keeper) GetDistribution(goCtx context.Context, req *types.QueryGetDistri
ctx := sdk.UnwrapSDKContext(goCtx)
distribution, found := k.LookupDistributionOrder(ctx, req.GetLastPopHeight())
distribution, found := k.LookupDistributionOrder(ctx, req.GetHeight())
if !found {
return nil, status.Error(codes.NotFound, "distribution not found")
}

1
x/dao/types/errors.go
View File

@ -25,4 +25,5 @@ var (
ErrResolvingStagedClaims = errorsmod.Register(ModuleName, 16, "resolving staged claims failed")
ErrReissuanceTxIDMissing = errorsmod.Register(ModuleName, 17, "reissuance has no transaction id")
ErrRestrictedMsg = errorsmod.Register(ModuleName, 18, "restricted validator msg")
ErrDistributionWrongHeight = errorsmod.Register(ModuleName, 19, "distribution wrong height")
)

145
x/dao/types/query.pb.go
View File

@ -659,7 +659,7 @@ func (m *QueryChallengesResponse) GetPagination() *query.PageResponse {
}
type QueryGetDistributionRequest struct {
LastPopHeight int64 `protobuf:"varint,1,opt,name=lastPopHeight,proto3" json:"lastPopHeight,omitempty"`
Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"`
}
func (m *QueryGetDistributionRequest) Reset() { *m = QueryGetDistributionRequest{} }
@ -695,9 +695,9 @@ func (m *QueryGetDistributionRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryGetDistributionRequest proto.InternalMessageInfo
func (m *QueryGetDistributionRequest) GetLastPopHeight() int64 {
func (m *QueryGetDistributionRequest) GetHeight() int64 {
if m != nil {
return m.LastPopHeight
return m.Height
}
return 0
}
@ -768,69 +768,68 @@ func init() {
func init() { proto.RegisterFile("planetmintgo/dao/query.proto", fileDescriptor_07bad0eeb5b27724) }
var fileDescriptor_07bad0eeb5b27724 = []byte{
// 986 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4d, 0x6f, 0x1b, 0x45,
0x18, 0xc7, 0xb3, 0x6d, 0x09, 0xca, 0xe3, 0x54, 0xc0, 0xd0, 0x06, 0xb3, 0x49, 0x4c, 0xba, 0x09,
0x90, 0xb8, 0xed, 0x6e, 0xeb, 0x46, 0xe5, 0x45, 0x2d, 0x2f, 0x2e, 0x4a, 0xda, 0x43, 0x45, 0xd8,
0x03, 0x87, 0x5e, 0xcc, 0xd8, 0x1e, 0xed, 0xae, 0xb0, 0x77, 0xdc, 0x9d, 0x35, 0x22, 0xb2, 0x72,
0xe1, 0xc6, 0x0d, 0xa9, 0x5f, 0x80, 0x0b, 0x08, 0x71, 0x40, 0x1c, 0x39, 0x20, 0xce, 0x3d, 0x56,
0xe2, 0xc2, 0x09, 0xa1, 0x04, 0x89, 0xaf, 0x81, 0x76, 0xf6, 0x59, 0xef, 0xac, 0xc7, 0xeb, 0xb8,
0x52, 0x2e, 0xd6, 0xee, 0xcc, 0xf3, 0xf2, 0x9b, 0xff, 0xec, 0xfc, 0xc7, 0xb0, 0x36, 0xe8, 0xd1,
0x90, 0xc5, 0xfd, 0x20, 0x8c, 0x3d, 0xee, 0x74, 0x29, 0x77, 0x1e, 0x0f, 0x59, 0x74, 0x68, 0x0f,
0x22, 0x1e, 0x73, 0xf2, 0xb2, 0x3a, 0x6b, 0x77, 0x29, 0x37, 0x2f, 0x79, 0xdc, 0xe3, 0x72, 0xd2,
0x49, 0x9e, 0xd2, 0x38, 0x73, 0xcd, 0xe3, 0xdc, 0xeb, 0x31, 0x87, 0x0e, 0x02, 0x87, 0x86, 0x21,
0x8f, 0x69, 0x1c, 0xf0, 0x50, 0xe0, 0x6c, 0xbd, 0xc3, 0x45, 0x9f, 0x0b, 0xa7, 0x4d, 0x05, 0x4b,
0xcb, 0x3b, 0x5f, 0xdd, 0x6c, 0xb3, 0x98, 0xde, 0x74, 0x06, 0xd4, 0x0b, 0x42, 0x19, 0x8c, 0xb1,
0xeb, 0x1a, 0xcf, 0x80, 0x46, 0xb4, 0x9f, 0x95, 0xda, 0xd4, 0xa6, 0x93, 0xc7, 0x56, 0xc4, 0x1e,
0x0f, 0x99, 0x88, 0x31, 0x68, 0x6b, 0x66, 0x50, 0x56, 0xea, 0x8a, 0x16, 0x15, 0xb1, 0x40, 0x88,
0x21, 0x0d, 0x3b, 0x0c, 0x43, 0x36, 0xb4, 0x90, 0x8e, 0x4f, 0x7b, 0x3d, 0x16, 0x7a, 0x59, 0xc4,
0x2b, 0xb4, 0x1f, 0x84, 0xdc, 0x91, 0xbf, 0x38, 0xb4, 0xa3, 0x25, 0x75, 0x03, 0x11, 0x47, 0x41,
0x7b, 0x98, 0x2c, 0xb3, 0xc5, 0xa3, 0x2e, 0x8b, 0xd2, 0x50, 0xeb, 0x12, 0x90, 0xcf, 0x12, 0x39,
0x0e, 0xe4, 0x12, 0xdd, 0x94, 0xcf, 0x7a, 0x08, 0xaf, 0x16, 0x46, 0xc5, 0x80, 0x87, 0x82, 0x91,
0xdb, 0xb0, 0x98, 0x4a, 0x51, 0x35, 0x36, 0x8c, 0xed, 0x4a, 0xa3, 0x6a, 0x4f, 0x6e, 0x8e, 0x9d,
0x66, 0x34, 0x2f, 0x3c, 0xfd, 0xfb, 0x8d, 0x05, 0x17, 0xa3, 0xad, 0x77, 0xe0, 0x8a, 0x2c, 0xb7,
0xcf, 0xe2, 0x87, 0x41, 0x18, 0x63, 0x17, 0xd1, 0x3c, 0xbc, 0x4f, 0x85, 0x8f, 0x6f, 0x84, 0xc0,
0x05, 0x9f, 0x0a, 0x5f, 0x96, 0x5e, 0x72, 0xe5, 0xb3, 0xc5, 0xc0, 0x9a, 0x95, 0x88, 0x58, 0x1f,
0x42, 0xa5, 0x9f, 0xcf, 0x22, 0xdb, 0xba, 0xce, 0xa6, 0x94, 0x70, 0xd5, 0x0c, 0xeb, 0x2e, 0xf2,
0x15, 0x7b, 0x7c, 0xdc, 0xed, 0x46, 0x4c, 0x64, 0x9a, 0x90, 0x2a, 0xbc, 0x48, 0xd3, 0x11, 0x44,
0xcc, 0x5e, 0x2d, 0x1f, 0x29, 0x4b, 0xd2, 0x91, 0xb2, 0x09, 0xcb, 0x4a, 0xcf, 0x4c, 0xc2, 0xda,
0x4c, 0x4c, 0xe1, 0x16, 0x72, 0xac, 0xbb, 0xf0, 0x7a, 0xa6, 0x87, 0x3b, 0xfe, 0x52, 0x32, 0xc0,
0x0d, 0xa8, 0xb4, 0x7b, 0xbc, 0xf3, 0xe5, 0x7d, 0x16, 0x78, 0x7e, 0x2a, 0xc3, 0x79, 0x57, 0x1d,
0xb2, 0x1e, 0x81, 0x39, 0x2d, 0x1d, 0x01, 0xef, 0x00, 0xe4, 0x9f, 0x1f, 0xe2, 0xad, 0xe9, 0x78,
0x4a, 0xa6, 0x12, 0x6f, 0x51, 0x78, 0x4d, 0xd6, 0xce, 0xa7, 0xc7, 0xca, 0xed, 0x01, 0xe4, 0x87,
0x0c, 0x0b, 0xbf, 0x65, 0xa7, 0x27, 0xd2, 0x4e, 0x4e, 0xa4, 0x9d, 0x1e, 0x78, 0x3c, 0x91, 0xf6,
0x01, 0xf5, 0xb2, 0x45, 0xb9, 0x4a, 0xa6, 0xf5, 0x8b, 0x01, 0x55, 0xbd, 0x07, 0xd2, 0x3f, 0x80,
0x4a, 0x4e, 0x93, 0xa8, 0x7b, 0xfe, 0x34, 0xfc, 0xe6, 0x52, 0xf2, 0x91, 0xfe, 0xf4, 0xdf, 0xaf,
0x75, 0xc3, 0x55, 0x73, 0xc9, 0x7e, 0x81, 0xf7, 0x9c, 0xe4, 0x7d, 0xfb, 0x54, 0xde, 0x94, 0xa3,
0x00, 0xdc, 0x40, 0xde, 0x7d, 0x16, 0xdf, 0xcb, 0x4e, 0x6d, 0x26, 0xca, 0x0a, 0x2c, 0xfa, 0xea,
0x46, 0xe1, 0x9b, 0xf5, 0x79, 0xbe, 0xc5, 0x4a, 0x0e, 0x2e, 0xf2, 0x3d, 0x58, 0x1a, 0x1f, 0x7f,
0x14, 0x72, 0x55, 0x5f, 0x62, 0x9e, 0x97, 0x47, 0x5b, 0x5f, 0xc0, 0x8a, 0xac, 0x3b, 0x9e, 0x3c,
0xf3, 0xed, 0xf9, 0xd9, 0xc0, 0x4f, 0x40, 0x6d, 0x81, 0xe0, 0x7b, 0x00, 0x63, 0x94, 0x6c, 0x73,
0x66, 0x91, 0xab, 0x7b, 0xa3, 0x64, 0x9e, 0xdd, 0xd6, 0xdc, 0x83, 0xd5, 0x4c, 0xe6, 0x4f, 0x14,
0x6f, 0xcc, 0x34, 0xd9, 0x82, 0x8b, 0x3d, 0x2a, 0xe2, 0x03, 0x3e, 0x28, 0x9c, 0xa6, 0xe2, 0xa0,
0xe5, 0xc1, 0xda, 0xf4, 0x22, 0xb8, 0xea, 0x7d, 0x58, 0x56, 0x8d, 0x17, 0xb5, 0xdd, 0xd4, 0xd7,
0xad, 0x66, 0x7f, 0x9a, 0xb8, 0xb3, 0x5b, 0x48, 0x6c, 0xfc, 0x08, 0xf0, 0x82, 0xec, 0x44, 0x86,
0xb0, 0x98, 0x5a, 0x2c, 0xd9, 0xd2, 0xcb, 0xe8, 0x4e, 0x6e, 0xbe, 0x79, 0x4a, 0x54, 0x4a, 0x6a,
0xd5, 0xbe, 0xf9, 0xf3, 0xdf, 0x27, 0xe7, 0xaa, 0x64, 0xc5, 0xc9, 0xc3, 0x95, 0xab, 0x8f, 0xfc,
0x6e, 0xc0, 0xe5, 0xa9, 0x26, 0x4c, 0x6e, 0x95, 0x34, 0x98, 0xe5, 0xf5, 0xe6, 0xee, 0xf3, 0x25,
0x21, 0xe4, 0xbb, 0x12, 0xb2, 0x41, 0x6e, 0x4c, 0x42, 0x7a, 0x2c, 0x6e, 0x15, 0xee, 0xd7, 0x56,
0xfb, 0xb0, 0x95, 0x5c, 0x20, 0xce, 0x28, 0xf9, 0x3d, 0x22, 0x7f, 0x18, 0x70, 0x79, 0xaa, 0x3b,
0x97, 0xe2, 0xcf, 0xba, 0x0a, 0x4a, 0xf1, 0x67, 0x5e, 0x00, 0xd6, 0xfb, 0x12, 0x7f, 0x97, 0x34,
0x26, 0xf1, 0x35, 0x74, 0xbc, 0x58, 0x9c, 0x11, 0x3e, 0x1c, 0x91, 0xef, 0x0d, 0xb8, 0x58, 0x70,
0x6d, 0x72, 0xb5, 0x5c, 0x42, 0xed, 0x6a, 0x30, 0xaf, 0xcd, 0x17, 0x8c, 0xa0, 0xbb, 0x12, 0xd4,
0x26, 0xd7, 0xa6, 0xe9, 0x9c, 0x1b, 0xa5, 0x33, 0x52, 0xee, 0x96, 0x23, 0xf2, 0xad, 0x01, 0x15,
0xc5, 0x98, 0xc9, 0x4e, 0x49, 0x4f, 0xfd, 0x82, 0x30, 0xeb, 0xf3, 0x84, 0x22, 0xdc, 0xa6, 0x84,
0x5b, 0x27, 0xab, 0x93, 0x70, 0xaa, 0x83, 0xff, 0x60, 0xc0, 0xb2, 0x6a, 0xa0, 0xa4, 0x5e, 0x2e,
0xc0, 0xa4, 0x33, 0x9b, 0x57, 0xe7, 0x8a, 0x45, 0x9c, 0x3b, 0x12, 0xe7, 0x36, 0xd9, 0x55, 0x71,
0xf2, 0xc7, 0xeb, 0xf8, 0xff, 0x2b, 0x51, 0x6e, 0x6c, 0x63, 0xce, 0xc8, 0x47, 0xcd, 0x9e, 0x18,
0x00, 0xb9, 0x5b, 0x92, 0xed, 0x92, 0xce, 0x9a, 0x67, 0x9b, 0x3b, 0x73, 0x44, 0x22, 0xe1, 0x0d,
0x49, 0x58, 0x27, 0xdb, 0xb3, 0x09, 0x15, 0x93, 0xfd, 0xcd, 0x80, 0x97, 0x26, 0x2c, 0x8d, 0x5c,
0x2f, 0x17, 0x65, 0x8a, 0x7f, 0x9a, 0xf6, 0xbc, 0xe1, 0x08, 0xb9, 0x27, 0x21, 0x3f, 0x22, 0x1f,
0x9c, 0x2e, 0xa3, 0x6a, 0x8c, 0xce, 0xa8, 0x60, 0xc8, 0x47, 0xcd, 0x07, 0x4f, 0x8f, 0x6b, 0xc6,
0xb3, 0xe3, 0x9a, 0xf1, 0xcf, 0x71, 0xcd, 0xf8, 0xee, 0xa4, 0xb6, 0xf0, 0xec, 0xa4, 0xb6, 0xf0,
0xd7, 0x49, 0x6d, 0xe1, 0x91, 0xe3, 0x05, 0xb1, 0x3f, 0x6c, 0xdb, 0x1d, 0xde, 0x2f, 0xef, 0xf1,
0xb5, 0xec, 0x12, 0x1f, 0x0e, 0x98, 0x68, 0x2f, 0xca, 0x3f, 0xc8, 0xb7, 0xfe, 0x0f, 0x00, 0x00,
0xff, 0xff, 0xd8, 0x6a, 0x48, 0x5f, 0x9f, 0x0c, 0x00, 0x00,
// 969 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4f, 0x8f, 0xdb, 0x44,
0x18, 0xc6, 0xd7, 0x6d, 0x59, 0xb4, 0x6f, 0x16, 0x01, 0x43, 0xbb, 0x04, 0xef, 0x6e, 0xd8, 0x7a,
0x0b, 0xec, 0xa6, 0xad, 0xdd, 0xa6, 0x4b, 0x4b, 0x51, 0xab, 0x8a, 0x80, 0xba, 0xed, 0xa1, 0xa2,
0xf8, 0xc0, 0xa1, 0x97, 0x30, 0x49, 0x46, 0xb6, 0x45, 0xe2, 0x49, 0x3d, 0x0e, 0x62, 0xb5, 0xda,
0x0b, 0x37, 0x6e, 0x48, 0xfd, 0x00, 0x70, 0x41, 0x42, 0x1c, 0x10, 0xdc, 0x11, 0xe7, 0x1e, 0x2b,
0x71, 0xe1, 0x84, 0xd0, 0x2e, 0x12, 0x5f, 0x03, 0x79, 0xfc, 0x3a, 0x1e, 0x67, 0x62, 0x27, 0x95,
0x7a, 0x89, 0xc6, 0x9e, 0xf7, 0xcf, 0x6f, 0x9e, 0xf1, 0x3c, 0x13, 0xd8, 0x18, 0x0d, 0x68, 0xc8,
0xe2, 0x61, 0x10, 0xc6, 0x1e, 0x77, 0xfa, 0x94, 0x3b, 0x8f, 0xc7, 0x2c, 0x3a, 0xb0, 0x47, 0x11,
0x8f, 0x39, 0x79, 0x4d, 0x9d, 0xb5, 0xfb, 0x94, 0x9b, 0x67, 0x3d, 0xee, 0x71, 0x39, 0xe9, 0x24,
0xa3, 0x34, 0xce, 0xdc, 0xf0, 0x38, 0xf7, 0x06, 0xcc, 0xa1, 0xa3, 0xc0, 0xa1, 0x61, 0xc8, 0x63,
0x1a, 0x07, 0x3c, 0x14, 0x38, 0xdb, 0xec, 0x71, 0x31, 0xe4, 0xc2, 0xe9, 0x52, 0xc1, 0xd2, 0xf2,
0xce, 0x57, 0x57, 0xbb, 0x2c, 0xa6, 0x57, 0x9d, 0x11, 0xf5, 0x82, 0x50, 0x06, 0x63, 0xec, 0xa6,
0xc6, 0x33, 0xa2, 0x11, 0x1d, 0x66, 0xa5, 0xb6, 0xb5, 0xe9, 0x64, 0xd8, 0x89, 0xd8, 0xe3, 0x31,
0x13, 0x31, 0x06, 0x5d, 0xa8, 0x0c, 0xca, 0x4a, 0x9d, 0xd7, 0xa2, 0x22, 0x16, 0x08, 0x31, 0xa6,
0x61, 0x8f, 0x61, 0xc8, 0x96, 0x16, 0xd2, 0xf3, 0xe9, 0x60, 0xc0, 0x42, 0x2f, 0x8b, 0x78, 0x9d,
0x0e, 0x83, 0x90, 0x3b, 0xf2, 0x17, 0x5f, 0xed, 0x6a, 0x49, 0xfd, 0x40, 0xc4, 0x51, 0xd0, 0x1d,
0x27, 0xcb, 0xec, 0xf0, 0xa8, 0xcf, 0xa2, 0x34, 0xd4, 0x3a, 0x0b, 0xe4, 0xb3, 0x44, 0x8e, 0x87,
0x72, 0x89, 0x6e, 0xca, 0x67, 0x3d, 0x80, 0x37, 0x0a, 0x6f, 0xc5, 0x88, 0x87, 0x82, 0x91, 0xeb,
0xb0, 0x9c, 0x4a, 0x51, 0x37, 0xb6, 0x8c, 0x9d, 0x5a, 0xab, 0x6e, 0x4f, 0x6f, 0x8e, 0x9d, 0x66,
0xb4, 0xcf, 0x3c, 0xfd, 0xfb, 0xed, 0x25, 0x17, 0xa3, 0xad, 0x1b, 0x70, 0x5e, 0x96, 0xdb, 0x67,
0xf1, 0x83, 0x20, 0x8c, 0xb1, 0x8b, 0x68, 0x1f, 0xdc, 0xa3, 0xc2, 0xc7, 0x27, 0x42, 0xe0, 0x8c,
0x4f, 0x85, 0x2f, 0x4b, 0xaf, 0xb8, 0x72, 0x6c, 0x31, 0xb0, 0xaa, 0x12, 0x11, 0xeb, 0x0e, 0xd4,
0x86, 0xf9, 0x2c, 0xb2, 0x6d, 0xea, 0x6c, 0x4a, 0x09, 0x57, 0xcd, 0xb0, 0x6e, 0x23, 0x5f, 0xb1,
0xc7, 0x47, 0xfd, 0x7e, 0xc4, 0x44, 0xa6, 0x09, 0xa9, 0xc3, 0xcb, 0x34, 0x7d, 0x83, 0x88, 0xd9,
0xa3, 0xe5, 0x23, 0x65, 0x49, 0x3a, 0x52, 0xb6, 0x61, 0x55, 0xe9, 0x99, 0x49, 0xd8, 0xa8, 0xc4,
0x14, 0x6e, 0x21, 0xc7, 0xba, 0x0d, 0x6f, 0x65, 0x7a, 0xb8, 0x93, 0x2f, 0x25, 0x03, 0xdc, 0x82,
0x5a, 0x77, 0xc0, 0x7b, 0x5f, 0xde, 0x63, 0x81, 0xe7, 0xa7, 0x32, 0x9c, 0x76, 0xd5, 0x57, 0xd6,
0x23, 0x30, 0x67, 0xa5, 0x23, 0xe0, 0x2d, 0x80, 0xfc, 0xf3, 0x43, 0xbc, 0x0d, 0x1d, 0x4f, 0xc9,
0x54, 0xe2, 0x2d, 0x0a, 0x6f, 0xca, 0xda, 0xf9, 0xf4, 0x44, 0xb9, 0xbb, 0x00, 0xf9, 0x21, 0xc3,
0xc2, 0xef, 0xda, 0xe9, 0x89, 0xb4, 0x93, 0x13, 0x69, 0xa7, 0x07, 0x1e, 0x4f, 0xa4, 0xfd, 0x90,
0x7a, 0xd9, 0xa2, 0x5c, 0x25, 0xd3, 0xfa, 0xc5, 0x80, 0xba, 0xde, 0x03, 0xe9, 0xef, 0x43, 0x2d,
0xa7, 0x49, 0xd4, 0x3d, 0x3d, 0x0f, 0xbf, 0xbd, 0x92, 0x7c, 0xa4, 0x3f, 0xfd, 0xf7, 0x6b, 0xd3,
0x70, 0xd5, 0x5c, 0xb2, 0x5f, 0xe0, 0x3d, 0x25, 0x79, 0xdf, 0x9b, 0xcb, 0x9b, 0x72, 0x14, 0x80,
0x5b, 0xc8, 0xbb, 0xcf, 0xe2, 0x8f, 0xb3, 0x53, 0x9b, 0x89, 0xb2, 0x06, 0xcb, 0xbe, 0xba, 0x51,
0xf8, 0x64, 0x7d, 0x9e, 0x6f, 0xb1, 0x92, 0x83, 0x8b, 0xbc, 0x09, 0x2b, 0x93, 0xe3, 0x8f, 0x42,
0xae, 0xeb, 0x4b, 0xcc, 0xf3, 0xf2, 0x68, 0xeb, 0x0b, 0x58, 0x93, 0x75, 0x27, 0x93, 0x2f, 0x7c,
0x7b, 0x7e, 0x36, 0xf0, 0x13, 0x50, 0x5b, 0x20, 0xf8, 0x5d, 0x80, 0x09, 0x4a, 0xb6, 0x39, 0x55,
0xe4, 0xea, 0xde, 0x28, 0x99, 0x2f, 0x6e, 0x6b, 0xde, 0x87, 0xf5, 0x4c, 0xe6, 0x4f, 0x14, 0x6f,
0x9c, 0xb7, 0x3b, 0x1e, 0x6c, 0xcc, 0x4e, 0xc3, 0x75, 0xee, 0xc3, 0xaa, 0x6a, 0xb5, 0xa8, 0xe6,
0xb6, 0xbe, 0x52, 0x35, 0xfb, 0xd3, 0xc4, 0x8f, 0xdd, 0x42, 0x62, 0xeb, 0x7b, 0x80, 0x97, 0x64,
0x27, 0x32, 0x86, 0xe5, 0xd4, 0x54, 0xc9, 0x05, 0xbd, 0x8c, 0xee, 0xdd, 0xe6, 0x3b, 0x73, 0xa2,
0x52, 0x52, 0xab, 0xf1, 0xcd, 0x9f, 0xff, 0x3e, 0x39, 0x55, 0x27, 0x6b, 0x4e, 0x1e, 0xae, 0x5c,
0x76, 0xe4, 0x77, 0x03, 0xce, 0xcd, 0xb4, 0x5d, 0x72, 0xad, 0xa4, 0x41, 0x95, 0xbb, 0x9b, 0x7b,
0xcf, 0x97, 0x84, 0x90, 0x1f, 0x48, 0xc8, 0x16, 0xb9, 0x32, 0x0d, 0xe9, 0xb1, 0xb8, 0x53, 0xb8,
0x51, 0x3b, 0xdd, 0x83, 0x4e, 0x72, 0x65, 0x38, 0x87, 0xc9, 0xef, 0x11, 0xf9, 0xc3, 0x80, 0x73,
0x33, 0xfd, 0xb8, 0x14, 0xbf, 0xca, 0xfc, 0x4b, 0xf1, 0x2b, 0x2d, 0xdf, 0xfa, 0x50, 0xe2, 0xef,
0x91, 0xd6, 0x34, 0xbe, 0x86, 0x8e, 0x57, 0x89, 0x73, 0x88, 0x83, 0x23, 0xf2, 0x83, 0x01, 0xaf,
0x14, 0x7c, 0x9a, 0x5c, 0x2c, 0x97, 0x50, 0xbb, 0x0c, 0xcc, 0x4b, 0x8b, 0x05, 0x23, 0xe8, 0x9e,
0x04, 0xb5, 0xc9, 0xa5, 0x59, 0x3a, 0xe7, 0xd6, 0xe8, 0x1c, 0x2a, 0xb7, 0xc9, 0x11, 0xf9, 0xd6,
0x80, 0x9a, 0x62, 0xc5, 0x64, 0xb7, 0xa4, 0xa7, 0x7e, 0x25, 0x98, 0xcd, 0x45, 0x42, 0x11, 0x6e,
0x5b, 0xc2, 0x6d, 0x92, 0xf5, 0x69, 0x38, 0xd5, 0xb3, 0x7f, 0x34, 0x60, 0x55, 0xb5, 0x4c, 0xd2,
0x2c, 0x17, 0x60, 0xda, 0x8b, 0xcd, 0x8b, 0x0b, 0xc5, 0x22, 0xce, 0x2d, 0x89, 0x73, 0x9d, 0xec,
0xa9, 0x38, 0xf9, 0xf0, 0x32, 0xfe, 0xe3, 0x4a, 0x94, 0x9b, 0x18, 0x97, 0x73, 0xe8, 0xa3, 0x66,
0x4f, 0x0c, 0x80, 0xdc, 0x1f, 0xc9, 0x4e, 0x49, 0x67, 0xcd, 0xa5, 0xcd, 0xdd, 0x05, 0x22, 0x91,
0xf0, 0x8a, 0x24, 0x6c, 0x92, 0x9d, 0x6a, 0x42, 0xc5, 0x56, 0x7f, 0x33, 0xe0, 0xd5, 0x29, 0x4b,
0x23, 0x97, 0xcb, 0x45, 0x99, 0xe1, 0x98, 0xa6, 0xbd, 0x68, 0x38, 0x42, 0xde, 0x91, 0x90, 0x37,
0xc9, 0x8d, 0xf9, 0x32, 0xaa, 0xc6, 0x38, 0x51, 0xb2, 0x7d, 0xff, 0xe9, 0x71, 0xc3, 0x78, 0x76,
0xdc, 0x30, 0xfe, 0x39, 0x6e, 0x18, 0xdf, 0x9d, 0x34, 0x96, 0x9e, 0x9d, 0x34, 0x96, 0xfe, 0x3a,
0x69, 0x2c, 0x3d, 0x72, 0xbc, 0x20, 0xf6, 0xc7, 0x5d, 0xbb, 0xc7, 0x87, 0xe5, 0xc5, 0xbf, 0x96,
0xe5, 0xe3, 0x83, 0x11, 0x13, 0xdd, 0x65, 0xf9, 0x5f, 0xf8, 0xda, 0xff, 0x01, 0x00, 0x00, 0xff,
0xff, 0x38, 0x68, 0x51, 0x55, 0x8a, 0x0c, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -1681,8 +1680,8 @@ func (m *QueryGetDistributionRequest) MarshalToSizedBuffer(dAtA []byte) (int, er
_ = i
var l int
_ = l
if m.LastPopHeight != 0 {
i = encodeVarintQuery(dAtA, i, uint64(m.LastPopHeight))
if m.Height != 0 {
i = encodeVarintQuery(dAtA, i, uint64(m.Height))
i--
dAtA[i] = 0x8
}
@ -1927,8 +1926,8 @@ func (m *QueryGetDistributionRequest) Size() (n int) {
}
var l int
_ = l
if m.LastPopHeight != 0 {
n += 1 + sovQuery(uint64(m.LastPopHeight))
if m.Height != 0 {
n += 1 + sovQuery(uint64(m.Height))
}
return n
}
@ -3174,9 +3173,9 @@ func (m *QueryGetDistributionRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field LastPopHeight", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType)
}
m.LastPopHeight = 0
m.Height = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowQuery
@ -3186,7 +3185,7 @@ func (m *QueryGetDistributionRequest) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.LastPopHeight |= int64(b&0x7F) << shift
m.Height |= int64(b&0x7F) << shift
if b < 0x80 {
break
}

18
x/dao/types/query.pb.gw.go
View File

@ -350,15 +350,15 @@ func request_Query_GetDistribution_0(ctx context.Context, marshaler runtime.Mars
_ = err
)
val, ok = pathParams["lastPopHeight"]
val, ok = pathParams["height"]
if !ok {
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "lastPopHeight")
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "height")
}
protoReq.LastPopHeight, err = runtime.Int64(val)
protoReq.Height, err = runtime.Int64(val)
if err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "lastPopHeight", err)
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "height", err)
}
msg, err := client.GetDistribution(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
@ -377,15 +377,15 @@ func local_request_Query_GetDistribution_0(ctx context.Context, marshaler runtim
_ = err
)
val, ok = pathParams["lastPopHeight"]
val, ok = pathParams["height"]
if !ok {
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "lastPopHeight")
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "height")
}
protoReq.LastPopHeight, err = runtime.Int64(val)
protoReq.Height, err = runtime.Int64(val)
if err != nil {
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "lastPopHeight", err)
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "height", err)
}
msg, err := server.GetDistribution(ctx, &protoReq)
@ -802,7 +802,7 @@ var (
pattern_Query_Challenges_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"planetmint", "planetmint-go", "dao", "challenges"}, "", runtime.AssumeColonVerbOpt(true)))
pattern_Query_GetDistribution_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"planetmint", "planetmint-go", "dao", "get_distribution", "lastPopHeight"}, "", runtime.AssumeColonVerbOpt(true)))
pattern_Query_GetDistribution_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"planetmint", "planetmint-go", "dao", "get_distribution", "height"}, "", runtime.AssumeColonVerbOpt(true)))
)
var (