Skip to content
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

chore: format proto files #17445

Merged
merged 4 commits into from
Aug 18, 2023
Merged

chore: format proto files #17445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c819046
format proto files
tac0turtle Aug 18, 2023
63631b7
Merge branch 'main' into marko/format_proto
tac0turtle Aug 18, 2023
3a13f9a
few more
tac0turtle Aug 18, 2023
118c922
bump proto-builder version, format in protoc-gen script
tac0turtle Aug 18, 2023
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ lint-fix:
### Protobuf ###
###############################################################################

protoVer=0.13.5
protoVer=0.14.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

Expand Down
6 changes: 3 additions & 3 deletions api/cosmos/autocli/v1/options.pulsar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/cosmos/gov/v1/gov.pulsar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/tendermint/abci/types.pulsar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions baseapp/testutil/messages.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ option go_package = "github.com/cosmos/cosmos-sdk/baseapp/testutil";
message MsgCounter {
option (cosmos.msg.v1.signer) = "signer";

int64 counter = 1;
bool fail_on_handler = 2;
string signer = 3;
int64 counter = 1;
bool fail_on_handler = 2;
string signer = 3;
}

message MsgCounter2 {
option (cosmos.msg.v1.signer) = "signer";

int64 counter = 1;
bool fail_on_handler = 2;
string signer = 3;
int64 counter = 1;
bool fail_on_handler = 2;
string signer = 3;
}

message MsgCreateCounterResponse {}
Expand Down
2 changes: 1 addition & 1 deletion client/v2/internal/testpb/msg.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ message MsgRequest {
string deprecated_field = 30;
string shorthand_deprecated_field = 31;
bool hidden_bool = 32;
string a_validator_address = 33 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"];
string a_validator_address = 33 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"];
}

message MsgResponse {
Expand Down
12 changes: 6 additions & 6 deletions client/v2/internal/testpb/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ message EchoRequest {
string positional2 = 28;
repeated cosmos.base.v1beta1.Coin positional3_varargs = 29;

string deprecated_field = 30;
string shorthand_deprecated_field = 31;
bool hidden_bool = 32;
map<string, string> map_string_string = 33;
map<string, uint32> map_string_uint32 = 34;
map<string, cosmos.base.v1beta1.Coin> map_string_coin = 35;
string deprecated_field = 30;
string shorthand_deprecated_field = 31;
bool hidden_bool = 32;
map<string, string> map_string_string = 33;
map<string, uint32> map_string_uint32 = 34;
map<string, cosmos.base.v1beta1.Coin> map_string_coin = 35;
string a_validator_address = 36 [(cosmos_proto.scalar) = "cosmos.ValidatorAddressString"];
string a_consensus_address = 37 [(cosmos_proto.scalar) = "cosmos.ConsensusAddressString"];
}
Expand Down
15 changes: 7 additions & 8 deletions orm/internal/testpb/bank_query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ message ListBalanceRequest {
// denom specifies the value of the Denom index key to use in the query.
Denom denom = 2;
}

message AddressDenom {
// address is the value of the address field in the index.
// It can be omitted to query for all valid values of that field in this segment of the index.
Expand All @@ -51,14 +51,14 @@ message ListBalanceRequest {
// It can be omitted to query for all valid values of that field in this segment of the index.
optional string denom = 2;
}

message Denom {
// denom is the value of the denom field in the index.
// It can be omitted to query for all valid values of that field in this segment of the index.
optional string denom = 1;
}
}

// query specifies the type of query - either a prefix or range query.
oneof query {
// prefix_query specifies the index key value to use for the prefix query.
Expand All @@ -68,7 +68,7 @@ message ListBalanceRequest {
}
// pagination specifies optional pagination parameters.
cosmos.base.query.v1beta1.PageRequest pagination = 3;

// RangeQuery specifies the from/to index keys for a range query.
message RangeQuery {
// from is the index key to use for the start of the range query.
Expand Down Expand Up @@ -110,14 +110,14 @@ message ListSupplyRequest {
// denom specifies the value of the Denom index key to use in the query.
Denom denom = 1;
}

message Denom {
// denom is the value of the denom field in the index.
// It can be omitted to query for all valid values of that field in this segment of the index.
optional string denom = 1;
}
}

// query specifies the type of query - either a prefix or range query.
oneof query {
// prefix_query specifies the index key value to use for the prefix query.
Expand All @@ -127,7 +127,7 @@ message ListSupplyRequest {
}
// pagination specifies optional pagination parameters.
cosmos.base.query.v1beta1.PageRequest pagination = 3;

// RangeQuery specifies the from/to index keys for a range query.
message RangeQuery {
// from is the index key to use for the start of the range query.
Expand All @@ -147,4 +147,3 @@ message ListSupplyResponse {
// pagination is the pagination response.
cosmos.base.query.v1beta1.PageResponse pagination = 2;
}

Loading