From f25190d43b9403481fd4837441a348cd9981c13c Mon Sep 17 00:00:00 2001 From: Geoff Lee Date: Fri, 12 Jul 2024 18:31:23 +0900 Subject: [PATCH] Fix/proto lint (#98) * fix proto-lint and fill out some comments as stub * run proto-all * make codecov ignore pulsar --- .codecov.yml | 1 + Makefile | 2 +- api/opinit/opchild/v1/types.pulsar.go | 1 + api/opinit/ophost/v1/genesis.pulsar.go | 1 + api/opinit/ophost/v1/query.pulsar.go | 2 ++ proto/opinit/opchild/v1/types.proto | 1 + proto/opinit/ophost/v1/genesis.proto | 1 + proto/opinit/ophost/v1/query.proto | 4 +++- x/opchild/types/types.pb.go | 1 + x/ophost/types/genesis.pb.go | 1 + x/ophost/types/query.pb.go | 2 ++ 11 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index b30a2e9e..6135d585 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -29,6 +29,7 @@ ignore: - "custom/" - "**/cli" - "**/rest" + - "**/*.pulsar.go" - "**/*.pb.go" - "**/*.pb.gw.go" - "**/test_utils.go" diff --git a/Makefile b/Makefile index b83338a0..268092f8 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ proto-format: @$(protoImage) find ./proto -name "*.proto" -exec clang-format -i {} \; proto-lint: - @$(protoImage) buf lint --error-format=json + @$(protoImage) buf lint --error-format=json ./proto proto-check-breaking: @$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main diff --git a/api/opinit/opchild/v1/types.pulsar.go b/api/opinit/opchild/v1/types.pulsar.go index 74887de6..da1735a5 100644 --- a/api/opinit/opchild/v1/types.pulsar.go +++ b/api/opinit/opchild/v1/types.pulsar.go @@ -4130,6 +4130,7 @@ func (x *PendingDeposits) GetCoins() []*v1beta1.Coin { return nil } +// CoinsWrapper defines the set of coins. type CoinsWrapper struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/opinit/ophost/v1/genesis.pulsar.go b/api/opinit/ophost/v1/genesis.pulsar.go index 63deb2b9..f5a91f1c 100644 --- a/api/opinit/ophost/v1/genesis.pulsar.go +++ b/api/opinit/ophost/v1/genesis.pulsar.go @@ -2402,6 +2402,7 @@ func (x *Bridge) GetBatchInfos() []*BatchInfoWithOutput { return nil } +// WrappedOutput defines a wrapped output containing its index and proposal. type WrappedOutput struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/opinit/ophost/v1/query.pulsar.go b/api/opinit/ophost/v1/query.pulsar.go index a724f958..9bd826cd 100644 --- a/api/opinit/ophost/v1/query.pulsar.go +++ b/api/opinit/ophost/v1/query.pulsar.go @@ -10677,6 +10677,7 @@ func (x *QueryTokenPairsResponse) GetPagination() *v1beta1.PageResponse { return nil } +// QueryLastFinalizedOutputRequest is request type for the Query/LastFinalizedOutput RPC method. type QueryLastFinalizedOutputRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -10712,6 +10713,7 @@ func (x *QueryLastFinalizedOutputRequest) GetBridgeId() uint64 { return 0 } +// QueryLastFinalizedOutputResponse is response type for the Query/LastFinalizedOutput RPC method type QueryLastFinalizedOutputResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/proto/opinit/opchild/v1/types.proto b/proto/opinit/opchild/v1/types.proto index 075bb475..b040c420 100644 --- a/proto/opinit/opchild/v1/types.proto +++ b/proto/opinit/opchild/v1/types.proto @@ -114,6 +114,7 @@ message PendingDeposits { ]; } +// CoinsWrapper defines the set of coins. message CoinsWrapper { repeated cosmos.base.v1beta1.Coin coins = 1 [ (gogoproto.nullable) = false, diff --git a/proto/opinit/ophost/v1/genesis.proto b/proto/opinit/ophost/v1/genesis.proto index 84801599..1a2275ee 100644 --- a/proto/opinit/ophost/v1/genesis.proto +++ b/proto/opinit/ophost/v1/genesis.proto @@ -38,6 +38,7 @@ message Bridge { repeated BatchInfoWithOutput batch_infos = 8 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } +// WrappedOutput defines a wrapped output containing its index and proposal. message WrappedOutput { uint64 output_index = 1; Output output_proposal = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; diff --git a/proto/opinit/ophost/v1/query.proto b/proto/opinit/ophost/v1/query.proto index dc359508..646b42d5 100644 --- a/proto/opinit/ophost/v1/query.proto +++ b/proto/opinit/ophost/v1/query.proto @@ -150,10 +150,12 @@ message QueryTokenPairsResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } +// QueryLastFinalizedOutputRequest is request type for the Query/LastFinalizedOutput RPC method. message QueryLastFinalizedOutputRequest { uint64 bridge_id = 1; } +// QueryLastFinalizedOutputResponse is response type for the Query/LastFinalizedOutput RPC method message QueryLastFinalizedOutputResponse { uint64 output_index = 1; Output output_proposal = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; @@ -174,7 +176,7 @@ message QueryOutputProposalResponse { // QueryOutputProposalsRequest is response type for the Query/OutputProposals RPC method message QueryOutputProposalsRequest { - uint64 bridge_id = 1; + uint64 bridge_id = 1; // pagination defines the pagination in the request. cosmos.base.query.v1beta1.PageRequest pagination = 3; } diff --git a/x/opchild/types/types.pb.go b/x/opchild/types/types.pb.go index 03c9579a..18aad6a8 100644 --- a/x/opchild/types/types.pb.go +++ b/x/opchild/types/types.pb.go @@ -290,6 +290,7 @@ func (m *PendingDeposits) XXX_DiscardUnknown() { var xxx_messageInfo_PendingDeposits proto.InternalMessageInfo +// CoinsWrapper defines the set of coins. type CoinsWrapper struct { Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=coins,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"coins"` } diff --git a/x/ophost/types/genesis.pb.go b/x/ophost/types/genesis.pb.go index 721175f1..67b8ab42 100644 --- a/x/ophost/types/genesis.pb.go +++ b/x/ophost/types/genesis.pb.go @@ -196,6 +196,7 @@ func (m *Bridge) GetBatchInfos() []BatchInfoWithOutput { return nil } +// WrappedOutput defines a wrapped output containing its index and proposal. type WrappedOutput struct { OutputIndex uint64 `protobuf:"varint,1,opt,name=output_index,json=outputIndex,proto3" json:"output_index,omitempty"` OutputProposal Output `protobuf:"bytes,2,opt,name=output_proposal,json=outputProposal,proto3" json:"output_proposal"` diff --git a/x/ophost/types/query.pb.go b/x/ophost/types/query.pb.go index bbcea246..8a8714d2 100644 --- a/x/ophost/types/query.pb.go +++ b/x/ophost/types/query.pb.go @@ -528,6 +528,7 @@ func (m *QueryTokenPairsResponse) GetPagination() *query.PageResponse { return nil } +// QueryLastFinalizedOutputRequest is request type for the Query/LastFinalizedOutput RPC method. type QueryLastFinalizedOutputRequest struct { BridgeId uint64 `protobuf:"varint,1,opt,name=bridge_id,json=bridgeId,proto3" json:"bridge_id,omitempty"` } @@ -572,6 +573,7 @@ func (m *QueryLastFinalizedOutputRequest) GetBridgeId() uint64 { return 0 } +// QueryLastFinalizedOutputResponse is response type for the Query/LastFinalizedOutput RPC method type QueryLastFinalizedOutputResponse struct { OutputIndex uint64 `protobuf:"varint,1,opt,name=output_index,json=outputIndex,proto3" json:"output_index,omitempty"` OutputProposal Output `protobuf:"bytes,2,opt,name=output_proposal,json=outputProposal,proto3" json:"output_proposal"`