From fcc85ec5202e85ebb2e8cedf613254eebe317244 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Sun, 28 Aug 2022 02:32:06 +0000 Subject: [PATCH] add bid arr in auction type --- docs/static/openapi.yml | 57 +++++++++++--- proto/cosmostest/auction.proto | 6 +- .../cosmostest.cosmostest/module/rest.ts | 17 ++++- .../cosmos/base/query/v1beta1/pagination.ts | 30 +++++++- .../module/types/cosmostest/auction.ts | 32 +++++--- x/cosmostest/types/auction.pb.go | 76 +++++++++++++------ 6 files changed, 166 insertions(+), 52 deletions(-) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index f070dbc..d11165b 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -20144,8 +20144,14 @@ paths: description: type: string bids: - type: integer - format: int64 + type: array + items: + type: object + properties: + owner: + type: string + amount: + type: string highestBid: type: integer format: int64 @@ -20273,8 +20279,14 @@ paths: description: type: string bids: - type: integer - format: int64 + type: array + items: + type: object + properties: + owner: + type: string + amount: + type: string highestBid: type: integer format: int64 @@ -47405,11 +47417,24 @@ definitions: description: type: string bids: - type: integer - format: int64 + type: array + items: + type: object + properties: + owner: + type: string + amount: + type: string highestBid: type: integer format: int64 + cosmostest.cosmostest.Bid: + type: object + properties: + owner: + type: string + amount: + type: string cosmostest.cosmostest.MsgNewAuctionResponse: type: object properties: @@ -47439,8 +47464,14 @@ definitions: description: type: string bids: - type: integer - format: int64 + type: array + items: + type: object + properties: + owner: + type: string + amount: + type: string highestBid: type: integer format: int64 @@ -47482,8 +47513,14 @@ definitions: description: type: string bids: - type: integer - format: int64 + type: array + items: + type: object + properties: + owner: + type: string + amount: + type: string highestBid: type: integer format: int64 diff --git a/proto/cosmostest/auction.proto b/proto/cosmostest/auction.proto index 7cc24be..cde0e2f 100644 --- a/proto/cosmostest/auction.proto +++ b/proto/cosmostest/auction.proto @@ -3,11 +3,13 @@ package cosmostest.cosmostest; option go_package = "cosmos-test/x/cosmostest/types"; +import "cosmostest/bid.proto"; + message Auction { string index = 1; string name = 2; string description = 3; - uint32 bids = 4; - uint32 highestBid = 5; + repeated Bid bids = 4; + uint32 highestBid = 5; // INDEX of highest bid } diff --git a/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/rest.ts b/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/rest.ts index 1011d5d..fb8b81f 100644 --- a/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/rest.ts +++ b/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/rest.ts @@ -13,14 +13,17 @@ export interface CosmostestAuction { index?: string; name?: string; description?: string; - - /** @format int64 */ - bids?: number; + bids?: CosmostestBid[]; /** @format int64 */ highestBid?: number; } +export interface CosmostestBid { + owner?: string; + amount?: string; +} + export interface CosmostestMsgNewAuctionResponse { auctionId?: string; } @@ -114,6 +117,13 @@ export interface V1Beta1PageRequest { * is set. */ count_total?: boolean; + + /** + * reverse is set to true if results are to be returned in the descending order. + * + * Since: cosmos-sdk 0.43 + */ + reverse?: boolean; } /** @@ -343,6 +353,7 @@ export class Api extends HttpClient diff --git a/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmos/base/query/v1beta1/pagination.ts b/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmos/base/query/v1beta1/pagination.ts index 0bc568f..9c87ac0 100644 --- a/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmos/base/query/v1beta1/pagination.ts +++ b/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmos/base/query/v1beta1/pagination.ts @@ -38,6 +38,12 @@ export interface PageRequest { * is set. */ count_total: boolean; + /** + * reverse is set to true if results are to be returned in the descending order. + * + * Since: cosmos-sdk 0.43 + */ + reverse: boolean; } /** @@ -62,7 +68,12 @@ export interface PageResponse { total: number; } -const basePageRequest: object = { offset: 0, limit: 0, count_total: false }; +const basePageRequest: object = { + offset: 0, + limit: 0, + count_total: false, + reverse: false, +}; export const PageRequest = { encode(message: PageRequest, writer: Writer = Writer.create()): Writer { @@ -78,6 +89,9 @@ export const PageRequest = { if (message.count_total === true) { writer.uint32(32).bool(message.count_total); } + if (message.reverse === true) { + writer.uint32(40).bool(message.reverse); + } return writer; }, @@ -100,6 +114,9 @@ export const PageRequest = { case 4: message.count_total = reader.bool(); break; + case 5: + message.reverse = reader.bool(); + break; default: reader.skipType(tag & 7); break; @@ -128,6 +145,11 @@ export const PageRequest = { } else { message.count_total = false; } + if (object.reverse !== undefined && object.reverse !== null) { + message.reverse = Boolean(object.reverse); + } else { + message.reverse = false; + } return message; }, @@ -141,6 +163,7 @@ export const PageRequest = { message.limit !== undefined && (obj.limit = message.limit); message.count_total !== undefined && (obj.count_total = message.count_total); + message.reverse !== undefined && (obj.reverse = message.reverse); return obj; }, @@ -166,6 +189,11 @@ export const PageRequest = { } else { message.count_total = false; } + if (object.reverse !== undefined && object.reverse !== null) { + message.reverse = object.reverse; + } else { + message.reverse = false; + } return message; }, }; diff --git a/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmostest/auction.ts b/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmostest/auction.ts index df7f88d..d80ebf6 100644 --- a/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmostest/auction.ts +++ b/vue/src/store/generated/cosmos-test/cosmostest.cosmostest/module/types/cosmostest/auction.ts @@ -1,4 +1,5 @@ /* eslint-disable */ +import { Bid } from "../cosmostest/bid"; import { Writer, Reader } from "protobufjs/minimal"; export const protobufPackage = "cosmostest.cosmostest"; @@ -7,7 +8,8 @@ export interface Auction { index: string; name: string; description: string; - bids: number; + bids: Bid[]; + /** INDEX of highest bid */ highestBid: number; } @@ -15,7 +17,6 @@ const baseAuction: object = { index: "", name: "", description: "", - bids: 0, highestBid: 0, }; @@ -30,8 +31,8 @@ export const Auction = { if (message.description !== "") { writer.uint32(26).string(message.description); } - if (message.bids !== 0) { - writer.uint32(32).uint32(message.bids); + for (const v of message.bids) { + Bid.encode(v!, writer.uint32(34).fork()).ldelim(); } if (message.highestBid !== 0) { writer.uint32(40).uint32(message.highestBid); @@ -43,6 +44,7 @@ export const Auction = { const reader = input instanceof Uint8Array ? new Reader(input) : input; let end = length === undefined ? reader.len : reader.pos + length; const message = { ...baseAuction } as Auction; + message.bids = []; while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { @@ -56,7 +58,7 @@ export const Auction = { message.description = reader.string(); break; case 4: - message.bids = reader.uint32(); + message.bids.push(Bid.decode(reader, reader.uint32())); break; case 5: message.highestBid = reader.uint32(); @@ -71,6 +73,7 @@ export const Auction = { fromJSON(object: any): Auction { const message = { ...baseAuction } as Auction; + message.bids = []; if (object.index !== undefined && object.index !== null) { message.index = String(object.index); } else { @@ -87,9 +90,9 @@ export const Auction = { message.description = ""; } if (object.bids !== undefined && object.bids !== null) { - message.bids = Number(object.bids); - } else { - message.bids = 0; + for (const e of object.bids) { + message.bids.push(Bid.fromJSON(e)); + } } if (object.highestBid !== undefined && object.highestBid !== null) { message.highestBid = Number(object.highestBid); @@ -105,13 +108,18 @@ export const Auction = { message.name !== undefined && (obj.name = message.name); message.description !== undefined && (obj.description = message.description); - message.bids !== undefined && (obj.bids = message.bids); + if (message.bids) { + obj.bids = message.bids.map((e) => (e ? Bid.toJSON(e) : undefined)); + } else { + obj.bids = []; + } message.highestBid !== undefined && (obj.highestBid = message.highestBid); return obj; }, fromPartial(object: DeepPartial): Auction { const message = { ...baseAuction } as Auction; + message.bids = []; if (object.index !== undefined && object.index !== null) { message.index = object.index; } else { @@ -128,9 +136,9 @@ export const Auction = { message.description = ""; } if (object.bids !== undefined && object.bids !== null) { - message.bids = object.bids; - } else { - message.bids = 0; + for (const e of object.bids) { + message.bids.push(Bid.fromPartial(e)); + } } if (object.highestBid !== undefined && object.highestBid !== null) { message.highestBid = object.highestBid; diff --git a/x/cosmostest/types/auction.pb.go b/x/cosmostest/types/auction.pb.go index dfcb60c..89f7ecf 100644 --- a/x/cosmostest/types/auction.pb.go +++ b/x/cosmostest/types/auction.pb.go @@ -26,7 +26,7 @@ type Auction struct { Index string `protobuf:"bytes,1,opt,name=index,proto3" json:"index,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` - Bids uint32 `protobuf:"varint,4,opt,name=bids,proto3" json:"bids,omitempty"` + Bids []*Bid `protobuf:"bytes,4,rep,name=bids,proto3" json:"bids,omitempty"` HighestBid uint32 `protobuf:"varint,5,opt,name=highestBid,proto3" json:"highestBid,omitempty"` } @@ -84,11 +84,11 @@ func (m *Auction) GetDescription() string { return "" } -func (m *Auction) GetBids() uint32 { +func (m *Auction) GetBids() []*Bid { if m != nil { return m.Bids } - return 0 + return nil } func (m *Auction) GetHighestBid() uint32 { @@ -105,20 +105,21 @@ func init() { func init() { proto.RegisterFile("cosmostest/auction.proto", fileDescriptor_631f6f59914101d9) } var fileDescriptor_631f6f59914101d9 = []byte{ - // 199 bytes of a gzipped FileDescriptorProto + // 223 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0x2e, 0x49, 0x2d, 0x2e, 0xd1, 0x4f, 0x2c, 0x4d, 0x2e, 0xc9, 0xcc, 0xcf, 0xd3, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, 0xc8, 0xe8, 0x21, 0x98, 0x4a, 0x9d, 0x8c, 0x5c, 0xec, - 0x8e, 0x10, 0x85, 0x42, 0x22, 0x5c, 0xac, 0x99, 0x79, 0x29, 0xa9, 0x15, 0x12, 0x8c, 0x0a, 0x8c, - 0x1a, 0x9c, 0x41, 0x10, 0x8e, 0x90, 0x10, 0x17, 0x4b, 0x5e, 0x62, 0x6e, 0xaa, 0x04, 0x13, 0x58, - 0x10, 0xcc, 0x16, 0x52, 0xe0, 0xe2, 0x4e, 0x49, 0x2d, 0x4e, 0x2e, 0xca, 0x2c, 0x00, 0x69, 0x94, - 0x60, 0x06, 0x4b, 0x21, 0x0b, 0x81, 0x74, 0x25, 0x65, 0xa6, 0x14, 0x4b, 0xb0, 0x28, 0x30, 0x6a, - 0xf0, 0x06, 0x81, 0xd9, 0x42, 0x72, 0x5c, 0x5c, 0x19, 0x99, 0xe9, 0x19, 0xa9, 0xc5, 0x25, 0x4e, - 0x99, 0x29, 0x12, 0xac, 0x60, 0x19, 0x24, 0x11, 0x27, 0x8b, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, - 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, - 0x3c, 0x96, 0x63, 0x88, 0x92, 0x83, 0xb8, 0x58, 0x17, 0xec, 0xaf, 0x0a, 0x7d, 0x24, 0x4f, 0x96, - 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xfd, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x5d, - 0x4d, 0x67, 0xcb, 0xff, 0x00, 0x00, 0x00, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, 0xc8, 0xe8, 0x21, 0x98, 0x52, 0x22, 0x48, 0x1a, 0x92, + 0x32, 0x53, 0x20, 0x8a, 0x95, 0x96, 0x32, 0x72, 0xb1, 0x3b, 0x42, 0xb4, 0x0b, 0x89, 0x70, 0xb1, + 0x66, 0xe6, 0xa5, 0xa4, 0x56, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x41, 0x38, 0x42, 0x42, + 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9, 0x12, 0x4c, 0x60, 0x41, 0x30, 0x5b, 0x48, 0x81, 0x8b, 0x3b, + 0x25, 0xb5, 0x38, 0xb9, 0x28, 0xb3, 0x00, 0xa4, 0x51, 0x82, 0x19, 0x2c, 0x85, 0x2c, 0x24, 0xa4, + 0xc7, 0xc5, 0x92, 0x94, 0x99, 0x52, 0x2c, 0xc1, 0xa2, 0xc0, 0xac, 0xc1, 0x6d, 0x24, 0xa5, 0x87, + 0xd5, 0x4d, 0x7a, 0x4e, 0x99, 0x29, 0x41, 0x60, 0x75, 0x42, 0x72, 0x5c, 0x5c, 0x19, 0x99, 0xe9, + 0x19, 0xa9, 0xc5, 0x25, 0x4e, 0x99, 0x29, 0x12, 0xac, 0x0a, 0x8c, 0x1a, 0xbc, 0x41, 0x48, 0x22, + 0x4e, 0x16, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, + 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x25, 0x07, 0x31, 0x4f, + 0x17, 0xec, 0xb1, 0x0a, 0x7d, 0x24, 0x5f, 0x96, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x3d, + 0x6a, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x60, 0x55, 0x70, 0xca, 0x31, 0x01, 0x00, 0x00, } func (m *Auction) Marshal() (dAtA []byte, err error) { @@ -146,10 +147,19 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - if m.Bids != 0 { - i = encodeVarintAuction(dAtA, i, uint64(m.Bids)) - i-- - dAtA[i] = 0x20 + if len(m.Bids) > 0 { + for iNdEx := len(m.Bids) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bids[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintAuction(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } } if len(m.Description) > 0 { i -= len(m.Description) @@ -204,8 +214,11 @@ func (m *Auction) Size() (n int) { if l > 0 { n += 1 + l + sovAuction(uint64(l)) } - if m.Bids != 0 { - n += 1 + sovAuction(uint64(m.Bids)) + if len(m.Bids) > 0 { + for _, e := range m.Bids { + l = e.Size() + n += 1 + l + sovAuction(uint64(l)) + } } if m.HighestBid != 0 { n += 1 + sovAuction(uint64(m.HighestBid)) @@ -345,10 +358,10 @@ func (m *Auction) Unmarshal(dAtA []byte) error { m.Description = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: - if wireType != 0 { + if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Bids", wireType) } - m.Bids = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowAuction @@ -358,11 +371,26 @@ func (m *Auction) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Bids |= uint32(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthAuction + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthAuction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Bids = append(m.Bids, &Bid{}) + if err := m.Bids[len(m.Bids)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field HighestBid", wireType)