From 9dbae4106beeec44ada6d44800ac846d7aa967ca Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Fri, 18 Nov 2022 19:09:51 +0700 Subject: [PATCH 1/8] Update Makefile (#13920) golangci-lint now runs gofumpt when run with --fix, so we no longer need the gofumpt line here. Also bumped to latest golangci-lint. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2ebc5bd99c0c..e7ff9b1508b6 100644 --- a/Makefile +++ b/Makefile @@ -338,7 +338,7 @@ benchmark: ############################################################################### golangci_lint_cmd=golangci-lint -golangci_version=v1.50.0 +golangci_version=v1.50.1 lint: @echo "--> Running linter" @@ -353,9 +353,7 @@ lint-fix: .PHONY: lint lint-fix format: - @go install mvdan.cc/gofumpt@latest @go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version) - find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -path "./client/docs/statik/statik.go" -not -path "./tests/mocks/*" -not -name "*.pb.go" -not -name "*.pb.gw.go" -not -name "*.pulsar.go" -not -path "./crypto/keys/secp256k1/*" | xargs gofumpt -w -l $(golangci_lint_cmd) run --fix .PHONY: format From 3c565b1fd6aa916511d7e9f6c63f9ab0524476a2 Mon Sep 17 00:00:00 2001 From: Ruslan Akhtariev <46343690+RusAkh@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:38:05 +0500 Subject: [PATCH 2/8] chore: fix `make proto-all` (#13883) --- orm/internal/codegen/query.go | 10 +- orm/internal/testpb/bank.cosmos_orm.go | 1 - orm/internal/testpb/bank.pb.go | 2 +- orm/internal/testpb/bank_query.pb.go | 78 ++--- orm/internal/testpb/bank_query.proto | 4 +- orm/internal/testpb/bank_query_grpc.pb.go | 108 +++---- orm/internal/testpb/test_schema.cosmos_orm.go | 1 - orm/internal/testpb/test_schema.pb.go | 3 +- orm/internal/testpb/test_schema_query.pb.go | 265 ++++++++--------- orm/internal/testpb/test_schema_query.proto | 4 +- .../testpb/test_schema_query_grpc.pb.go | 269 +++++++++--------- 11 files changed, 380 insertions(+), 365 deletions(-) diff --git a/orm/internal/codegen/query.go b/orm/internal/codegen/query.go index 0af7980aa3a0..7797ef8d1e52 100644 --- a/orm/internal/codegen/query.go +++ b/orm/internal/codegen/query.go @@ -27,8 +27,8 @@ type queryProtoGen struct { func (g queryProtoGen) gen() error { g.imports[g.Desc.Path()] = true - g.svc.F("// %s queries the state of the tables specified by %s.", g.queryServiceName(), g.Desc.Path()) - g.svc.F("service %s {", g.queryServiceName()) + g.svc.F("// %sService queries the state of the tables specified by %s.", g.queryServiceName(), g.Desc.Path()) + g.svc.F("service %sService {", g.queryServiceName()) g.svc.Indent() for _, msg := range g.Messages { tableDesc := proto.GetExtension(msg.Desc.Options(), ormv1.E_Table).(*ormv1.TableDescriptor) @@ -84,7 +84,7 @@ func (g queryProtoGen) gen() error { func (g queryProtoGen) genTableRPCMethods(msg *protogen.Message, desc *ormv1.TableDescriptor) error { name := msg.Desc.Name() g.svc.F("// Get queries the %s table by its primary key.", name) - g.svc.F("rpc Get%s (Get%sRequest) returns (Get%sResponse) {}", name, name, name) // TODO grpc gateway + g.svc.F("rpc Get%s(Get%sRequest) returns (Get%sResponse) {}", name, name, name) // TODO grpc gateway g.startRequestType("Get%sRequest", name) g.msgs.Indent() @@ -118,7 +118,7 @@ func (g queryProtoGen) genTableRPCMethods(msg *protogen.Message, desc *ormv1.Tab fieldsCamel := fieldsToCamelCase(idx.Fields) methodName := fmt.Sprintf("Get%sBy%s", name, fieldsCamel) g.svc.F("// %s queries the %s table by its %s index", methodName, name, fieldsCamel) - g.svc.F("rpc %s (%sRequest) returns (%sResponse) {}", methodName, methodName, methodName) // TODO grpc gateway + g.svc.F("rpc %s(%sRequest) returns (%sResponse) {}", methodName, methodName, methodName) // TODO grpc gateway g.startRequestType("%sRequest", methodName) g.msgs.Indent() @@ -144,7 +144,7 @@ func (g queryProtoGen) genTableRPCMethods(msg *protogen.Message, desc *ormv1.Tab g.imports["cosmos/base/query/v1beta1/pagination.proto"] = true g.svc.F("// List%s queries the %s table using prefix and range queries against defined indexes.", name, name) - g.svc.F("rpc List%s (List%sRequest) returns (List%sResponse) {}", name, name, name) // TODO grpc gateway + g.svc.F("rpc List%s(List%sRequest) returns (List%sResponse) {}", name, name, name) // TODO grpc gateway g.startRequestType("List%sRequest", name) g.msgs.Indent() g.msgs.F("// IndexKey specifies the value of an index key to use in prefix and range queries.") diff --git a/orm/internal/testpb/bank.cosmos_orm.go b/orm/internal/testpb/bank.cosmos_orm.go index 51a36e5b8035..0635179c20e8 100644 --- a/orm/internal/testpb/bank.cosmos_orm.go +++ b/orm/internal/testpb/bank.cosmos_orm.go @@ -4,7 +4,6 @@ package testpb import ( context "context" - ormlist "github.com/cosmos/cosmos-sdk/orm/model/ormlist" ormtable "github.com/cosmos/cosmos-sdk/orm/model/ormtable" ormerrors "github.com/cosmos/cosmos-sdk/orm/types/ormerrors" diff --git a/orm/internal/testpb/bank.pb.go b/orm/internal/testpb/bank.pb.go index e9d8ba52ae83..83ef85f5c8fa 100644 --- a/orm/internal/testpb/bank.pb.go +++ b/orm/internal/testpb/bank.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: testpb/bank.proto diff --git a/orm/internal/testpb/bank_query.pb.go b/orm/internal/testpb/bank_query.pb.go index e919044cef90..487235337cf9 100644 --- a/orm/internal/testpb/bank_query.pb.go +++ b/orm/internal/testpb/bank_query.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: testpb/bank_query.proto @@ -139,6 +139,7 @@ type ListBalanceRequest struct { // query specifies the type of query - either a prefix or range query. // // Types that are assignable to Query: + // // *ListBalanceRequest_PrefixQuery // *ListBalanceRequest_RangeQuery_ Query isListBalanceRequest_Query `protobuf_oneof:"query"` @@ -389,6 +390,7 @@ type ListSupplyRequest struct { // query specifies the type of query - either a prefix or range query. // // Types that are assignable to Query: + // // *ListSupplyRequest_PrefixQuery // *ListSupplyRequest_RangeQuery_ Query isListSupplyRequest_Query `protobuf_oneof:"query"` @@ -541,6 +543,7 @@ type ListBalanceRequest_IndexKey struct { // key specifies the index key value. // // Types that are assignable to Key: + // // *ListBalanceRequest_IndexKey_AddressDenom_ // *ListBalanceRequest_IndexKey_Denom_ Key isListBalanceRequest_IndexKey_Key `protobuf_oneof:"key"` @@ -795,6 +798,7 @@ type ListSupplyRequest_IndexKey struct { // key specifies the index key value. // // Types that are assignable to Key: + // // *ListSupplyRequest_IndexKey_Denom_ Key isListSupplyRequest_IndexKey_Key `protobuf_oneof:"key"` } @@ -1081,35 +1085,35 @@ var file_testpb_bank_query_proto_rawDesc = []byte{ 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0xa7, 0x02, 0x0a, 0x09, 0x42, 0x61, 0x6e, 0x6b, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x12, 0x45, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, - 0x63, 0x65, 0x12, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x42, - 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x48, 0x0a, 0x0b, 0x4c, - 0x69, 0x73, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x1a, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, - 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x53, 0x75, 0x70, 0x70, - 0x6c, 0x79, 0x12, 0x18, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, - 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x74, - 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x45, 0x0a, 0x0a, 0x4c, 0x69, 0x73, - 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, - 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0xae, 0x02, 0x0a, 0x10, 0x42, 0x61, 0x6e, 0x6b, 0x51, + 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x45, 0x0a, 0x0a, 0x47, + 0x65, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, + 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x48, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, + 0x65, 0x12, 0x1a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, + 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x6c, 0x61, 0x6e, + 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x09, + 0x47, 0x65, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x42, 0x86, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x42, - 0x0e, 0x42, 0x61, 0x6e, 0x6b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, - 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, - 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, - 0x6f, 0x72, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, - 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, - 0x70, 0x62, 0xca, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xe2, 0x02, 0x12, 0x54, 0x65, - 0x73, 0x74, 0x70, 0x62, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0xea, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x12, 0x45, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x19, + 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x75, 0x70, 0x70, + 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x86, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x42, 0x0e, 0x42, 0x61, 0x6e, 0x6b, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x6f, 0x72, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, + 0xaa, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xca, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, + 0x70, 0x62, 0xe2, 0x02, 0x12, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1166,14 +1170,14 @@ var file_testpb_bank_query_proto_depIdxs = []int32{ 14, // 16: testpb.ListSupplyRequest.IndexKey.denom:type_name -> testpb.ListSupplyRequest.IndexKey.Denom 12, // 17: testpb.ListSupplyRequest.RangeQuery.from:type_name -> testpb.ListSupplyRequest.IndexKey 12, // 18: testpb.ListSupplyRequest.RangeQuery.to:type_name -> testpb.ListSupplyRequest.IndexKey - 0, // 19: testpb.BankQuery.GetBalance:input_type -> testpb.GetBalanceRequest - 2, // 20: testpb.BankQuery.ListBalance:input_type -> testpb.ListBalanceRequest - 4, // 21: testpb.BankQuery.GetSupply:input_type -> testpb.GetSupplyRequest - 6, // 22: testpb.BankQuery.ListSupply:input_type -> testpb.ListSupplyRequest - 1, // 23: testpb.BankQuery.GetBalance:output_type -> testpb.GetBalanceResponse - 3, // 24: testpb.BankQuery.ListBalance:output_type -> testpb.ListBalanceResponse - 5, // 25: testpb.BankQuery.GetSupply:output_type -> testpb.GetSupplyResponse - 7, // 26: testpb.BankQuery.ListSupply:output_type -> testpb.ListSupplyResponse + 0, // 19: testpb.BankQueryService.GetBalance:input_type -> testpb.GetBalanceRequest + 2, // 20: testpb.BankQueryService.ListBalance:input_type -> testpb.ListBalanceRequest + 4, // 21: testpb.BankQueryService.GetSupply:input_type -> testpb.GetSupplyRequest + 6, // 22: testpb.BankQueryService.ListSupply:input_type -> testpb.ListSupplyRequest + 1, // 23: testpb.BankQueryService.GetBalance:output_type -> testpb.GetBalanceResponse + 3, // 24: testpb.BankQueryService.ListBalance:output_type -> testpb.ListBalanceResponse + 5, // 25: testpb.BankQueryService.GetSupply:output_type -> testpb.GetSupplyResponse + 7, // 26: testpb.BankQueryService.ListSupply:output_type -> testpb.ListSupplyResponse 23, // [23:27] is the sub-list for method output_type 19, // [19:23] is the sub-list for method input_type 19, // [19:19] is the sub-list for extension type_name diff --git a/orm/internal/testpb/bank_query.proto b/orm/internal/testpb/bank_query.proto index 1941ca6ac6dd..6335d52eaf58 100644 --- a/orm/internal/testpb/bank_query.proto +++ b/orm/internal/testpb/bank_query.proto @@ -5,8 +5,8 @@ package testpb; import "cosmos/base/query/v1beta1/pagination.proto"; import "testpb/bank.proto"; -// BankQuery queries the state of the tables specified by testpb/bank.proto. -service BankQuery { +// BankQueryService queries the state of the tables specified by testpb/bank.proto. +service BankQueryService { // Get queries the Balance table by its primary key. rpc GetBalance(GetBalanceRequest) returns (GetBalanceResponse) {} // ListBalance queries the Balance table using prefix and range queries against defined indexes. diff --git a/orm/internal/testpb/bank_query_grpc.pb.go b/orm/internal/testpb/bank_query_grpc.pb.go index 026bed3f832c..c0ca78701544 100644 --- a/orm/internal/testpb/bank_query_grpc.pb.go +++ b/orm/internal/testpb/bank_query_grpc.pb.go @@ -18,10 +18,10 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -// BankQueryClient is the client API for BankQuery service. +// BankQueryServiceClient is the client API for BankQueryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -type BankQueryClient interface { +type BankQueryServiceClient interface { // Get queries the Balance table by its primary key. GetBalance(ctx context.Context, in *GetBalanceRequest, opts ...grpc.CallOption) (*GetBalanceResponse, error) // ListBalance queries the Balance table using prefix and range queries against defined indexes. @@ -32,54 +32,54 @@ type BankQueryClient interface { ListSupply(ctx context.Context, in *ListSupplyRequest, opts ...grpc.CallOption) (*ListSupplyResponse, error) } -type bankQueryClient struct { +type bankQueryServiceClient struct { cc grpc.ClientConnInterface } -func NewBankQueryClient(cc grpc.ClientConnInterface) BankQueryClient { - return &bankQueryClient{cc} +func NewBankQueryServiceClient(cc grpc.ClientConnInterface) BankQueryServiceClient { + return &bankQueryServiceClient{cc} } -func (c *bankQueryClient) GetBalance(ctx context.Context, in *GetBalanceRequest, opts ...grpc.CallOption) (*GetBalanceResponse, error) { +func (c *bankQueryServiceClient) GetBalance(ctx context.Context, in *GetBalanceRequest, opts ...grpc.CallOption) (*GetBalanceResponse, error) { out := new(GetBalanceResponse) - err := c.cc.Invoke(ctx, "/testpb.BankQuery/GetBalance", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.BankQueryService/GetBalance", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *bankQueryClient) ListBalance(ctx context.Context, in *ListBalanceRequest, opts ...grpc.CallOption) (*ListBalanceResponse, error) { +func (c *bankQueryServiceClient) ListBalance(ctx context.Context, in *ListBalanceRequest, opts ...grpc.CallOption) (*ListBalanceResponse, error) { out := new(ListBalanceResponse) - err := c.cc.Invoke(ctx, "/testpb.BankQuery/ListBalance", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.BankQueryService/ListBalance", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *bankQueryClient) GetSupply(ctx context.Context, in *GetSupplyRequest, opts ...grpc.CallOption) (*GetSupplyResponse, error) { +func (c *bankQueryServiceClient) GetSupply(ctx context.Context, in *GetSupplyRequest, opts ...grpc.CallOption) (*GetSupplyResponse, error) { out := new(GetSupplyResponse) - err := c.cc.Invoke(ctx, "/testpb.BankQuery/GetSupply", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.BankQueryService/GetSupply", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *bankQueryClient) ListSupply(ctx context.Context, in *ListSupplyRequest, opts ...grpc.CallOption) (*ListSupplyResponse, error) { +func (c *bankQueryServiceClient) ListSupply(ctx context.Context, in *ListSupplyRequest, opts ...grpc.CallOption) (*ListSupplyResponse, error) { out := new(ListSupplyResponse) - err := c.cc.Invoke(ctx, "/testpb.BankQuery/ListSupply", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.BankQueryService/ListSupply", in, out, opts...) if err != nil { return nil, err } return out, nil } -// BankQueryServer is the server API for BankQuery service. -// All implementations must embed UnimplementedBankQueryServer +// BankQueryServiceServer is the server API for BankQueryService service. +// All implementations must embed UnimplementedBankQueryServiceServer // for forward compatibility -type BankQueryServer interface { +type BankQueryServiceServer interface { // Get queries the Balance table by its primary key. GetBalance(context.Context, *GetBalanceRequest) (*GetBalanceResponse, error) // ListBalance queries the Balance table using prefix and range queries against defined indexes. @@ -88,132 +88,132 @@ type BankQueryServer interface { GetSupply(context.Context, *GetSupplyRequest) (*GetSupplyResponse, error) // ListSupply queries the Supply table using prefix and range queries against defined indexes. ListSupply(context.Context, *ListSupplyRequest) (*ListSupplyResponse, error) - mustEmbedUnimplementedBankQueryServer() + mustEmbedUnimplementedBankQueryServiceServer() } -// UnimplementedBankQueryServer must be embedded to have forward compatible implementations. -type UnimplementedBankQueryServer struct { +// UnimplementedBankQueryServiceServer must be embedded to have forward compatible implementations. +type UnimplementedBankQueryServiceServer struct { } -func (UnimplementedBankQueryServer) GetBalance(context.Context, *GetBalanceRequest) (*GetBalanceResponse, error) { +func (UnimplementedBankQueryServiceServer) GetBalance(context.Context, *GetBalanceRequest) (*GetBalanceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetBalance not implemented") } -func (UnimplementedBankQueryServer) ListBalance(context.Context, *ListBalanceRequest) (*ListBalanceResponse, error) { +func (UnimplementedBankQueryServiceServer) ListBalance(context.Context, *ListBalanceRequest) (*ListBalanceResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListBalance not implemented") } -func (UnimplementedBankQueryServer) GetSupply(context.Context, *GetSupplyRequest) (*GetSupplyResponse, error) { +func (UnimplementedBankQueryServiceServer) GetSupply(context.Context, *GetSupplyRequest) (*GetSupplyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetSupply not implemented") } -func (UnimplementedBankQueryServer) ListSupply(context.Context, *ListSupplyRequest) (*ListSupplyResponse, error) { +func (UnimplementedBankQueryServiceServer) ListSupply(context.Context, *ListSupplyRequest) (*ListSupplyResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListSupply not implemented") } -func (UnimplementedBankQueryServer) mustEmbedUnimplementedBankQueryServer() {} +func (UnimplementedBankQueryServiceServer) mustEmbedUnimplementedBankQueryServiceServer() {} -// UnsafeBankQueryServer may be embedded to opt out of forward compatibility for this service. -// Use of this interface is not recommended, as added methods to BankQueryServer will +// UnsafeBankQueryServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to BankQueryServiceServer will // result in compilation errors. -type UnsafeBankQueryServer interface { - mustEmbedUnimplementedBankQueryServer() +type UnsafeBankQueryServiceServer interface { + mustEmbedUnimplementedBankQueryServiceServer() } -func RegisterBankQueryServer(s grpc.ServiceRegistrar, srv BankQueryServer) { - s.RegisterService(&BankQuery_ServiceDesc, srv) +func RegisterBankQueryServiceServer(s grpc.ServiceRegistrar, srv BankQueryServiceServer) { + s.RegisterService(&BankQueryService_ServiceDesc, srv) } -func _BankQuery_GetBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _BankQueryService_GetBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetBalanceRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(BankQueryServer).GetBalance(ctx, in) + return srv.(BankQueryServiceServer).GetBalance(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.BankQuery/GetBalance", + FullMethod: "/testpb.BankQueryService/GetBalance", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BankQueryServer).GetBalance(ctx, req.(*GetBalanceRequest)) + return srv.(BankQueryServiceServer).GetBalance(ctx, req.(*GetBalanceRequest)) } return interceptor(ctx, in, info, handler) } -func _BankQuery_ListBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _BankQueryService_ListBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListBalanceRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(BankQueryServer).ListBalance(ctx, in) + return srv.(BankQueryServiceServer).ListBalance(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.BankQuery/ListBalance", + FullMethod: "/testpb.BankQueryService/ListBalance", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BankQueryServer).ListBalance(ctx, req.(*ListBalanceRequest)) + return srv.(BankQueryServiceServer).ListBalance(ctx, req.(*ListBalanceRequest)) } return interceptor(ctx, in, info, handler) } -func _BankQuery_GetSupply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _BankQueryService_GetSupply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetSupplyRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(BankQueryServer).GetSupply(ctx, in) + return srv.(BankQueryServiceServer).GetSupply(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.BankQuery/GetSupply", + FullMethod: "/testpb.BankQueryService/GetSupply", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BankQueryServer).GetSupply(ctx, req.(*GetSupplyRequest)) + return srv.(BankQueryServiceServer).GetSupply(ctx, req.(*GetSupplyRequest)) } return interceptor(ctx, in, info, handler) } -func _BankQuery_ListSupply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _BankQueryService_ListSupply_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListSupplyRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(BankQueryServer).ListSupply(ctx, in) + return srv.(BankQueryServiceServer).ListSupply(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.BankQuery/ListSupply", + FullMethod: "/testpb.BankQueryService/ListSupply", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BankQueryServer).ListSupply(ctx, req.(*ListSupplyRequest)) + return srv.(BankQueryServiceServer).ListSupply(ctx, req.(*ListSupplyRequest)) } return interceptor(ctx, in, info, handler) } -// BankQuery_ServiceDesc is the grpc.ServiceDesc for BankQuery service. +// BankQueryService_ServiceDesc is the grpc.ServiceDesc for BankQueryService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) -var BankQuery_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "testpb.BankQuery", - HandlerType: (*BankQueryServer)(nil), +var BankQueryService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "testpb.BankQueryService", + HandlerType: (*BankQueryServiceServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "GetBalance", - Handler: _BankQuery_GetBalance_Handler, + Handler: _BankQueryService_GetBalance_Handler, }, { MethodName: "ListBalance", - Handler: _BankQuery_ListBalance_Handler, + Handler: _BankQueryService_ListBalance_Handler, }, { MethodName: "GetSupply", - Handler: _BankQuery_GetSupply_Handler, + Handler: _BankQueryService_GetSupply_Handler, }, { MethodName: "ListSupply", - Handler: _BankQuery_ListSupply_Handler, + Handler: _BankQueryService_ListSupply_Handler, }, }, Streams: []grpc.StreamDesc{}, diff --git a/orm/internal/testpb/test_schema.cosmos_orm.go b/orm/internal/testpb/test_schema.cosmos_orm.go index 0306c97c8c56..a5cf2a6fbd11 100644 --- a/orm/internal/testpb/test_schema.cosmos_orm.go +++ b/orm/internal/testpb/test_schema.cosmos_orm.go @@ -4,7 +4,6 @@ package testpb import ( context "context" - ormlist "github.com/cosmos/cosmos-sdk/orm/model/ormlist" ormtable "github.com/cosmos/cosmos-sdk/orm/model/ormtable" ormerrors "github.com/cosmos/cosmos-sdk/orm/types/ormerrors" diff --git a/orm/internal/testpb/test_schema.pb.go b/orm/internal/testpb/test_schema.pb.go index 4f98d3208c47..8dc30bfc36e4 100644 --- a/orm/internal/testpb/test_schema.pb.go +++ b/orm/internal/testpb/test_schema.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: testpb/test_schema.proto @@ -105,6 +105,7 @@ type ExampleTable struct { Map map[string]uint32 `protobuf:"bytes,18,rep,name=map,proto3" json:"map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` Msg *ExampleTable_ExampleMessage `protobuf:"bytes,19,opt,name=msg,proto3" json:"msg,omitempty"` // Types that are assignable to Sum: + // // *ExampleTable_Oneof Sum isExampleTable_Sum `protobuf_oneof:"sum"` } diff --git a/orm/internal/testpb/test_schema_query.pb.go b/orm/internal/testpb/test_schema_query.pb.go index 0bded19f12a5..484624eb6492 100644 --- a/orm/internal/testpb/test_schema_query.pb.go +++ b/orm/internal/testpb/test_schema_query.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.27.1 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: testpb/test_schema_query.proto @@ -253,6 +253,7 @@ type ListExampleTableRequest struct { // query specifies the type of query - either a prefix or range query. // // Types that are assignable to Query: + // // *ListExampleTableRequest_PrefixQuery // *ListExampleTableRequest_RangeQuery_ Query isListExampleTableRequest_Query `protobuf_oneof:"query"` @@ -599,6 +600,7 @@ type ListExampleAutoIncrementTableRequest struct { // query specifies the type of query - either a prefix or range query. // // Types that are assignable to Query: + // // *ListExampleAutoIncrementTableRequest_PrefixQuery // *ListExampleAutoIncrementTableRequest_RangeQuery_ Query isListExampleAutoIncrementTableRequest_Query `protobuf_oneof:"query"` @@ -938,6 +940,7 @@ type ListExampleTimestampRequest struct { // query specifies the type of query - either a prefix or range query. // // Types that are assignable to Query: + // // *ListExampleTimestampRequest_PrefixQuery // *ListExampleTimestampRequest_RangeQuery_ Query isListExampleTimestampRequest_Query `protobuf_oneof:"query"` @@ -1284,6 +1287,7 @@ type ListSimpleExampleRequest struct { // query specifies the type of query - either a prefix or range query. // // Types that are assignable to Query: + // // *ListSimpleExampleRequest_PrefixQuery // *ListSimpleExampleRequest_RangeQuery_ Query isListSimpleExampleRequest_Query `protobuf_oneof:"query"` @@ -1534,6 +1538,7 @@ type ListExampleAutoIncFieldNameRequest struct { // query specifies the type of query - either a prefix or range query. // // Types that are assignable to Query: + // // *ListExampleAutoIncFieldNameRequest_PrefixQuery // *ListExampleAutoIncFieldNameRequest_RangeQuery_ Query isListExampleAutoIncFieldNameRequest_Query `protobuf_oneof:"query"` @@ -1686,6 +1691,7 @@ type ListExampleTableRequest_IndexKey struct { // key specifies the index key value. // // Types that are assignable to Key: + // // *ListExampleTableRequest_IndexKey_U_32I_64Str // *ListExampleTableRequest_IndexKey_U_64Str // *ListExampleTableRequest_IndexKey_StrU_32 @@ -2108,6 +2114,7 @@ type ListExampleAutoIncrementTableRequest_IndexKey struct { // key specifies the index key value. // // Types that are assignable to Key: + // // *ListExampleAutoIncrementTableRequest_IndexKey_Id_ // *ListExampleAutoIncrementTableRequest_IndexKey_X_ Key isListExampleAutoIncrementTableRequest_IndexKey_Key `protobuf_oneof:"key"` @@ -2354,6 +2361,7 @@ type ListExampleTimestampRequest_IndexKey struct { // key specifies the index key value. // // Types that are assignable to Key: + // // *ListExampleTimestampRequest_IndexKey_Id_ // *ListExampleTimestampRequest_IndexKey_Ts_ Key isListExampleTimestampRequest_IndexKey_Key `protobuf_oneof:"key"` @@ -2598,6 +2606,7 @@ type ListSimpleExampleRequest_IndexKey struct { // key specifies the index key value. // // Types that are assignable to Key: + // // *ListSimpleExampleRequest_IndexKey_Name_ // *ListSimpleExampleRequest_IndexKey_Unique_ Key isListSimpleExampleRequest_IndexKey_Key `protobuf_oneof:"key"` @@ -2842,6 +2851,7 @@ type ListExampleAutoIncFieldNameRequest_IndexKey struct { // key specifies the index key value. // // Types that are assignable to Key: + // // *ListExampleAutoIncFieldNameRequest_IndexKey_Foo_ Key isListExampleAutoIncFieldNameRequest_IndexKey_Key `protobuf_oneof:"key"` } @@ -3384,111 +3394,112 @@ var file_testpb_test_schema_query_proto_rawDesc = []byte{ 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x32, 0xf2, 0x0b, 0x0a, 0x0f, 0x54, 0x65, 0x73, 0x74, 0x53, 0x63, 0x68, 0x65, - 0x6d, 0x61, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x54, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x45, 0x78, - 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1e, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, - 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x74, 0x65, 0x73, - 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, - 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, - 0x17, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, - 0x42, 0x79, 0x55, 0x36, 0x34, 0x53, 0x74, 0x72, 0x12, 0x26, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, - 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, - 0x65, 0x42, 0x79, 0x55, 0x36, 0x34, 0x53, 0x74, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x27, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, - 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x79, 0x55, 0x36, 0x34, 0x53, 0x74, - 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x10, 0x4c, - 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, - 0x1f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, - 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x20, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, + 0x69, 0x6f, 0x6e, 0x32, 0xf9, 0x0b, 0x0a, 0x16, 0x54, 0x65, 0x73, 0x74, 0x53, 0x63, 0x68, 0x65, + 0x6d, 0x61, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x54, + 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, + 0x65, 0x12, 0x1e, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, + 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, - 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, - 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, - 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x2c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, - 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x84, 0x01, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, - 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, - 0x6c, 0x65, 0x42, 0x79, 0x58, 0x12, 0x2e, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, - 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, - 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x79, 0x58, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, + 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x79, 0x55, 0x36, 0x34, 0x53, 0x74, 0x72, 0x12, + 0x26, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, + 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x79, 0x55, 0x36, 0x34, 0x53, 0x74, 0x72, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, + 0x42, 0x79, 0x55, 0x36, 0x34, 0x53, 0x74, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x57, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, + 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x61, 0x62, 0x6c, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, - 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x79, 0x58, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7e, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, + 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2b, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, + 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, + 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, + 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x1f, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, - 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x2c, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, + 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x79, 0x58, 0x12, 0x2e, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, + 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, + 0x6c, 0x65, 0x42, 0x79, 0x58, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, + 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, + 0x6c, 0x65, 0x42, 0x79, 0x58, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x7e, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, - 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, - 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x45, - 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x74, 0x6f, 0x6e, 0x12, - 0x22, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x74, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, - 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x74, 0x6f, 0x6e, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x13, 0x47, 0x65, - 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x12, 0x22, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, + 0x12, 0x2c, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, + 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2d, + 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, + 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, + 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, + 0x60, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x69, 0x6e, + 0x67, 0x6c, 0x65, 0x74, 0x6f, 0x6e, 0x12, 0x22, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, + 0x74, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x74, 0x65, 0x73, + 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x69, + 0x6e, 0x67, 0x6c, 0x65, 0x74, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x12, 0x60, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x22, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, + 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, + 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, + 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x23, 0x2e, 0x74, 0x65, + 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, + 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x24, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, - 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x14, - 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, - 0x74, 0x61, 0x6d, 0x70, 0x12, 0x23, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x54, 0x69, - 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x57, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, - 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, - 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, + 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x1f, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, + 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, + 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x12, 0x6f, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, + 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x42, 0x79, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x12, 0x27, 0x2e, + 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, + 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x42, 0x79, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6f, 0x0a, 0x18, 0x47, 0x65, - 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x42, 0x79, - 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x12, 0x27, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, - 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, - 0x42, 0x79, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x28, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6d, 0x70, - 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x42, 0x79, 0x55, 0x6e, 0x69, 0x71, 0x75, - 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5a, 0x0a, 0x11, 0x4c, - 0x69, 0x73, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, - 0x12, 0x20, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x69, - 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x45, 0x78, - 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, - 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, - 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, - 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x2a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, + 0x42, 0x79, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x12, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, + 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x20, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, 0x6d, 0x70, + 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x74, 0x65, 0x73, 0x74, + 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x78, 0x61, + 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, + 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, + 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x2e, 0x74, + 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, + 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, + 0x2e, 0x47, 0x65, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, + 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, - 0x0a, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, - 0x6f, 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x2e, - 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, - 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2b, 0x2e, 0x74, 0x65, 0x73, 0x74, - 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, - 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x8c, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, - 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x42, 0x14, 0x54, 0x65, 0x73, 0x74, 0x53, 0x63, 0x68, - 0x65, 0x6d, 0x61, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, - 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x6f, 0x72, - 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, - 0x62, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, - 0xca, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xe2, 0x02, 0x12, 0x54, 0x65, 0x73, 0x74, - 0x70, 0x62, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, - 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2a, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, + 0x73, 0x74, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, + 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x2b, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x45, 0x78, + 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x49, 0x6e, 0x63, 0x46, 0x69, 0x65, 0x6c, + 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, + 0x8c, 0x01, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0x42, 0x14, + 0x54, 0x65, 0x73, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, + 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, + 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x6f, 0x72, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x62, 0xa2, 0x02, 0x03, 0x54, 0x58, 0x58, 0xaa, 0x02, + 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0xca, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, + 0xe2, 0x02, 0x12, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x06, 0x54, 0x65, 0x73, 0x74, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -3621,34 +3632,34 @@ var file_testpb_test_schema_query_proto_depIdxs = []int32{ 48, // 53: testpb.ListExampleAutoIncFieldNameRequest.IndexKey.foo:type_name -> testpb.ListExampleAutoIncFieldNameRequest.IndexKey.Foo 46, // 54: testpb.ListExampleAutoIncFieldNameRequest.RangeQuery.from:type_name -> testpb.ListExampleAutoIncFieldNameRequest.IndexKey 46, // 55: testpb.ListExampleAutoIncFieldNameRequest.RangeQuery.to:type_name -> testpb.ListExampleAutoIncFieldNameRequest.IndexKey - 0, // 56: testpb.TestSchemaQuery.GetExampleTable:input_type -> testpb.GetExampleTableRequest - 2, // 57: testpb.TestSchemaQuery.GetExampleTableByU64Str:input_type -> testpb.GetExampleTableByU64StrRequest - 4, // 58: testpb.TestSchemaQuery.ListExampleTable:input_type -> testpb.ListExampleTableRequest - 6, // 59: testpb.TestSchemaQuery.GetExampleAutoIncrementTable:input_type -> testpb.GetExampleAutoIncrementTableRequest - 8, // 60: testpb.TestSchemaQuery.GetExampleAutoIncrementTableByX:input_type -> testpb.GetExampleAutoIncrementTableByXRequest - 10, // 61: testpb.TestSchemaQuery.ListExampleAutoIncrementTable:input_type -> testpb.ListExampleAutoIncrementTableRequest - 12, // 62: testpb.TestSchemaQuery.GetExampleSingleton:input_type -> testpb.GetExampleSingletonRequest - 14, // 63: testpb.TestSchemaQuery.GetExampleTimestamp:input_type -> testpb.GetExampleTimestampRequest - 16, // 64: testpb.TestSchemaQuery.ListExampleTimestamp:input_type -> testpb.ListExampleTimestampRequest - 18, // 65: testpb.TestSchemaQuery.GetSimpleExample:input_type -> testpb.GetSimpleExampleRequest - 20, // 66: testpb.TestSchemaQuery.GetSimpleExampleByUnique:input_type -> testpb.GetSimpleExampleByUniqueRequest - 22, // 67: testpb.TestSchemaQuery.ListSimpleExample:input_type -> testpb.ListSimpleExampleRequest - 24, // 68: testpb.TestSchemaQuery.GetExampleAutoIncFieldName:input_type -> testpb.GetExampleAutoIncFieldNameRequest - 26, // 69: testpb.TestSchemaQuery.ListExampleAutoIncFieldName:input_type -> testpb.ListExampleAutoIncFieldNameRequest - 1, // 70: testpb.TestSchemaQuery.GetExampleTable:output_type -> testpb.GetExampleTableResponse - 3, // 71: testpb.TestSchemaQuery.GetExampleTableByU64Str:output_type -> testpb.GetExampleTableByU64StrResponse - 5, // 72: testpb.TestSchemaQuery.ListExampleTable:output_type -> testpb.ListExampleTableResponse - 7, // 73: testpb.TestSchemaQuery.GetExampleAutoIncrementTable:output_type -> testpb.GetExampleAutoIncrementTableResponse - 9, // 74: testpb.TestSchemaQuery.GetExampleAutoIncrementTableByX:output_type -> testpb.GetExampleAutoIncrementTableByXResponse - 11, // 75: testpb.TestSchemaQuery.ListExampleAutoIncrementTable:output_type -> testpb.ListExampleAutoIncrementTableResponse - 13, // 76: testpb.TestSchemaQuery.GetExampleSingleton:output_type -> testpb.GetExampleSingletonResponse - 15, // 77: testpb.TestSchemaQuery.GetExampleTimestamp:output_type -> testpb.GetExampleTimestampResponse - 17, // 78: testpb.TestSchemaQuery.ListExampleTimestamp:output_type -> testpb.ListExampleTimestampResponse - 19, // 79: testpb.TestSchemaQuery.GetSimpleExample:output_type -> testpb.GetSimpleExampleResponse - 21, // 80: testpb.TestSchemaQuery.GetSimpleExampleByUnique:output_type -> testpb.GetSimpleExampleByUniqueResponse - 23, // 81: testpb.TestSchemaQuery.ListSimpleExample:output_type -> testpb.ListSimpleExampleResponse - 25, // 82: testpb.TestSchemaQuery.GetExampleAutoIncFieldName:output_type -> testpb.GetExampleAutoIncFieldNameResponse - 27, // 83: testpb.TestSchemaQuery.ListExampleAutoIncFieldName:output_type -> testpb.ListExampleAutoIncFieldNameResponse + 0, // 56: testpb.TestSchemaQueryService.GetExampleTable:input_type -> testpb.GetExampleTableRequest + 2, // 57: testpb.TestSchemaQueryService.GetExampleTableByU64Str:input_type -> testpb.GetExampleTableByU64StrRequest + 4, // 58: testpb.TestSchemaQueryService.ListExampleTable:input_type -> testpb.ListExampleTableRequest + 6, // 59: testpb.TestSchemaQueryService.GetExampleAutoIncrementTable:input_type -> testpb.GetExampleAutoIncrementTableRequest + 8, // 60: testpb.TestSchemaQueryService.GetExampleAutoIncrementTableByX:input_type -> testpb.GetExampleAutoIncrementTableByXRequest + 10, // 61: testpb.TestSchemaQueryService.ListExampleAutoIncrementTable:input_type -> testpb.ListExampleAutoIncrementTableRequest + 12, // 62: testpb.TestSchemaQueryService.GetExampleSingleton:input_type -> testpb.GetExampleSingletonRequest + 14, // 63: testpb.TestSchemaQueryService.GetExampleTimestamp:input_type -> testpb.GetExampleTimestampRequest + 16, // 64: testpb.TestSchemaQueryService.ListExampleTimestamp:input_type -> testpb.ListExampleTimestampRequest + 18, // 65: testpb.TestSchemaQueryService.GetSimpleExample:input_type -> testpb.GetSimpleExampleRequest + 20, // 66: testpb.TestSchemaQueryService.GetSimpleExampleByUnique:input_type -> testpb.GetSimpleExampleByUniqueRequest + 22, // 67: testpb.TestSchemaQueryService.ListSimpleExample:input_type -> testpb.ListSimpleExampleRequest + 24, // 68: testpb.TestSchemaQueryService.GetExampleAutoIncFieldName:input_type -> testpb.GetExampleAutoIncFieldNameRequest + 26, // 69: testpb.TestSchemaQueryService.ListExampleAutoIncFieldName:input_type -> testpb.ListExampleAutoIncFieldNameRequest + 1, // 70: testpb.TestSchemaQueryService.GetExampleTable:output_type -> testpb.GetExampleTableResponse + 3, // 71: testpb.TestSchemaQueryService.GetExampleTableByU64Str:output_type -> testpb.GetExampleTableByU64StrResponse + 5, // 72: testpb.TestSchemaQueryService.ListExampleTable:output_type -> testpb.ListExampleTableResponse + 7, // 73: testpb.TestSchemaQueryService.GetExampleAutoIncrementTable:output_type -> testpb.GetExampleAutoIncrementTableResponse + 9, // 74: testpb.TestSchemaQueryService.GetExampleAutoIncrementTableByX:output_type -> testpb.GetExampleAutoIncrementTableByXResponse + 11, // 75: testpb.TestSchemaQueryService.ListExampleAutoIncrementTable:output_type -> testpb.ListExampleAutoIncrementTableResponse + 13, // 76: testpb.TestSchemaQueryService.GetExampleSingleton:output_type -> testpb.GetExampleSingletonResponse + 15, // 77: testpb.TestSchemaQueryService.GetExampleTimestamp:output_type -> testpb.GetExampleTimestampResponse + 17, // 78: testpb.TestSchemaQueryService.ListExampleTimestamp:output_type -> testpb.ListExampleTimestampResponse + 19, // 79: testpb.TestSchemaQueryService.GetSimpleExample:output_type -> testpb.GetSimpleExampleResponse + 21, // 80: testpb.TestSchemaQueryService.GetSimpleExampleByUnique:output_type -> testpb.GetSimpleExampleByUniqueResponse + 23, // 81: testpb.TestSchemaQueryService.ListSimpleExample:output_type -> testpb.ListSimpleExampleResponse + 25, // 82: testpb.TestSchemaQueryService.GetExampleAutoIncFieldName:output_type -> testpb.GetExampleAutoIncFieldNameResponse + 27, // 83: testpb.TestSchemaQueryService.ListExampleAutoIncFieldName:output_type -> testpb.ListExampleAutoIncFieldNameResponse 70, // [70:84] is the sub-list for method output_type 56, // [56:70] is the sub-list for method input_type 56, // [56:56] is the sub-list for extension type_name diff --git a/orm/internal/testpb/test_schema_query.proto b/orm/internal/testpb/test_schema_query.proto index 9fa07209540c..c6f79a59f717 100644 --- a/orm/internal/testpb/test_schema_query.proto +++ b/orm/internal/testpb/test_schema_query.proto @@ -6,8 +6,8 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "google/protobuf/timestamp.proto"; import "testpb/test_schema.proto"; -// TestSchemaQuery queries the state of the tables specified by testpb/test_schema.proto. -service TestSchemaQuery { +// TestSchemaQueryService queries the state of the tables specified by testpb/test_schema.proto. +service TestSchemaQueryService { // Get queries the ExampleTable table by its primary key. rpc GetExampleTable(GetExampleTableRequest) returns (GetExampleTableResponse) {} // GetExampleTableByU64Str queries the ExampleTable table by its U64Str index diff --git a/orm/internal/testpb/test_schema_query_grpc.pb.go b/orm/internal/testpb/test_schema_query_grpc.pb.go index 73a6002aa35b..61f5da6fb11c 100644 --- a/orm/internal/testpb/test_schema_query_grpc.pb.go +++ b/orm/internal/testpb/test_schema_query_grpc.pb.go @@ -18,10 +18,10 @@ import ( // Requires gRPC-Go v1.32.0 or later. const _ = grpc.SupportPackageIsVersion7 -// TestSchemaQueryClient is the client API for TestSchemaQuery service. +// TestSchemaQueryServiceClient is the client API for TestSchemaQueryService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -type TestSchemaQueryClient interface { +type TestSchemaQueryServiceClient interface { // Get queries the ExampleTable table by its primary key. GetExampleTable(ctx context.Context, in *GetExampleTableRequest, opts ...grpc.CallOption) (*GetExampleTableResponse, error) // GetExampleTableByU64Str queries the ExampleTable table by its U64Str index @@ -52,144 +52,144 @@ type TestSchemaQueryClient interface { ListExampleAutoIncFieldName(ctx context.Context, in *ListExampleAutoIncFieldNameRequest, opts ...grpc.CallOption) (*ListExampleAutoIncFieldNameResponse, error) } -type testSchemaQueryClient struct { +type testSchemaQueryServiceClient struct { cc grpc.ClientConnInterface } -func NewTestSchemaQueryClient(cc grpc.ClientConnInterface) TestSchemaQueryClient { - return &testSchemaQueryClient{cc} +func NewTestSchemaQueryServiceClient(cc grpc.ClientConnInterface) TestSchemaQueryServiceClient { + return &testSchemaQueryServiceClient{cc} } -func (c *testSchemaQueryClient) GetExampleTable(ctx context.Context, in *GetExampleTableRequest, opts ...grpc.CallOption) (*GetExampleTableResponse, error) { +func (c *testSchemaQueryServiceClient) GetExampleTable(ctx context.Context, in *GetExampleTableRequest, opts ...grpc.CallOption) (*GetExampleTableResponse, error) { out := new(GetExampleTableResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetExampleTable", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetExampleTable", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetExampleTableByU64Str(ctx context.Context, in *GetExampleTableByU64StrRequest, opts ...grpc.CallOption) (*GetExampleTableByU64StrResponse, error) { +func (c *testSchemaQueryServiceClient) GetExampleTableByU64Str(ctx context.Context, in *GetExampleTableByU64StrRequest, opts ...grpc.CallOption) (*GetExampleTableByU64StrResponse, error) { out := new(GetExampleTableByU64StrResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetExampleTableByU64Str", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetExampleTableByU64Str", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) ListExampleTable(ctx context.Context, in *ListExampleTableRequest, opts ...grpc.CallOption) (*ListExampleTableResponse, error) { +func (c *testSchemaQueryServiceClient) ListExampleTable(ctx context.Context, in *ListExampleTableRequest, opts ...grpc.CallOption) (*ListExampleTableResponse, error) { out := new(ListExampleTableResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/ListExampleTable", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/ListExampleTable", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetExampleAutoIncrementTable(ctx context.Context, in *GetExampleAutoIncrementTableRequest, opts ...grpc.CallOption) (*GetExampleAutoIncrementTableResponse, error) { +func (c *testSchemaQueryServiceClient) GetExampleAutoIncrementTable(ctx context.Context, in *GetExampleAutoIncrementTableRequest, opts ...grpc.CallOption) (*GetExampleAutoIncrementTableResponse, error) { out := new(GetExampleAutoIncrementTableResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetExampleAutoIncrementTable", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetExampleAutoIncrementTable", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetExampleAutoIncrementTableByX(ctx context.Context, in *GetExampleAutoIncrementTableByXRequest, opts ...grpc.CallOption) (*GetExampleAutoIncrementTableByXResponse, error) { +func (c *testSchemaQueryServiceClient) GetExampleAutoIncrementTableByX(ctx context.Context, in *GetExampleAutoIncrementTableByXRequest, opts ...grpc.CallOption) (*GetExampleAutoIncrementTableByXResponse, error) { out := new(GetExampleAutoIncrementTableByXResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetExampleAutoIncrementTableByX", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetExampleAutoIncrementTableByX", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) ListExampleAutoIncrementTable(ctx context.Context, in *ListExampleAutoIncrementTableRequest, opts ...grpc.CallOption) (*ListExampleAutoIncrementTableResponse, error) { +func (c *testSchemaQueryServiceClient) ListExampleAutoIncrementTable(ctx context.Context, in *ListExampleAutoIncrementTableRequest, opts ...grpc.CallOption) (*ListExampleAutoIncrementTableResponse, error) { out := new(ListExampleAutoIncrementTableResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/ListExampleAutoIncrementTable", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/ListExampleAutoIncrementTable", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetExampleSingleton(ctx context.Context, in *GetExampleSingletonRequest, opts ...grpc.CallOption) (*GetExampleSingletonResponse, error) { +func (c *testSchemaQueryServiceClient) GetExampleSingleton(ctx context.Context, in *GetExampleSingletonRequest, opts ...grpc.CallOption) (*GetExampleSingletonResponse, error) { out := new(GetExampleSingletonResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetExampleSingleton", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetExampleSingleton", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetExampleTimestamp(ctx context.Context, in *GetExampleTimestampRequest, opts ...grpc.CallOption) (*GetExampleTimestampResponse, error) { +func (c *testSchemaQueryServiceClient) GetExampleTimestamp(ctx context.Context, in *GetExampleTimestampRequest, opts ...grpc.CallOption) (*GetExampleTimestampResponse, error) { out := new(GetExampleTimestampResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetExampleTimestamp", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetExampleTimestamp", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) ListExampleTimestamp(ctx context.Context, in *ListExampleTimestampRequest, opts ...grpc.CallOption) (*ListExampleTimestampResponse, error) { +func (c *testSchemaQueryServiceClient) ListExampleTimestamp(ctx context.Context, in *ListExampleTimestampRequest, opts ...grpc.CallOption) (*ListExampleTimestampResponse, error) { out := new(ListExampleTimestampResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/ListExampleTimestamp", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/ListExampleTimestamp", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetSimpleExample(ctx context.Context, in *GetSimpleExampleRequest, opts ...grpc.CallOption) (*GetSimpleExampleResponse, error) { +func (c *testSchemaQueryServiceClient) GetSimpleExample(ctx context.Context, in *GetSimpleExampleRequest, opts ...grpc.CallOption) (*GetSimpleExampleResponse, error) { out := new(GetSimpleExampleResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetSimpleExample", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetSimpleExample", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetSimpleExampleByUnique(ctx context.Context, in *GetSimpleExampleByUniqueRequest, opts ...grpc.CallOption) (*GetSimpleExampleByUniqueResponse, error) { +func (c *testSchemaQueryServiceClient) GetSimpleExampleByUnique(ctx context.Context, in *GetSimpleExampleByUniqueRequest, opts ...grpc.CallOption) (*GetSimpleExampleByUniqueResponse, error) { out := new(GetSimpleExampleByUniqueResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetSimpleExampleByUnique", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetSimpleExampleByUnique", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) ListSimpleExample(ctx context.Context, in *ListSimpleExampleRequest, opts ...grpc.CallOption) (*ListSimpleExampleResponse, error) { +func (c *testSchemaQueryServiceClient) ListSimpleExample(ctx context.Context, in *ListSimpleExampleRequest, opts ...grpc.CallOption) (*ListSimpleExampleResponse, error) { out := new(ListSimpleExampleResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/ListSimpleExample", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/ListSimpleExample", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) GetExampleAutoIncFieldName(ctx context.Context, in *GetExampleAutoIncFieldNameRequest, opts ...grpc.CallOption) (*GetExampleAutoIncFieldNameResponse, error) { +func (c *testSchemaQueryServiceClient) GetExampleAutoIncFieldName(ctx context.Context, in *GetExampleAutoIncFieldNameRequest, opts ...grpc.CallOption) (*GetExampleAutoIncFieldNameResponse, error) { out := new(GetExampleAutoIncFieldNameResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/GetExampleAutoIncFieldName", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/GetExampleAutoIncFieldName", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *testSchemaQueryClient) ListExampleAutoIncFieldName(ctx context.Context, in *ListExampleAutoIncFieldNameRequest, opts ...grpc.CallOption) (*ListExampleAutoIncFieldNameResponse, error) { +func (c *testSchemaQueryServiceClient) ListExampleAutoIncFieldName(ctx context.Context, in *ListExampleAutoIncFieldNameRequest, opts ...grpc.CallOption) (*ListExampleAutoIncFieldNameResponse, error) { out := new(ListExampleAutoIncFieldNameResponse) - err := c.cc.Invoke(ctx, "/testpb.TestSchemaQuery/ListExampleAutoIncFieldName", in, out, opts...) + err := c.cc.Invoke(ctx, "/testpb.TestSchemaQueryService/ListExampleAutoIncFieldName", in, out, opts...) if err != nil { return nil, err } return out, nil } -// TestSchemaQueryServer is the server API for TestSchemaQuery service. -// All implementations must embed UnimplementedTestSchemaQueryServer +// TestSchemaQueryServiceServer is the server API for TestSchemaQueryService service. +// All implementations must embed UnimplementedTestSchemaQueryServiceServer // for forward compatibility -type TestSchemaQueryServer interface { +type TestSchemaQueryServiceServer interface { // Get queries the ExampleTable table by its primary key. GetExampleTable(context.Context, *GetExampleTableRequest) (*GetExampleTableResponse, error) // GetExampleTableByU64Str queries the ExampleTable table by its U64Str index @@ -218,382 +218,383 @@ type TestSchemaQueryServer interface { GetExampleAutoIncFieldName(context.Context, *GetExampleAutoIncFieldNameRequest) (*GetExampleAutoIncFieldNameResponse, error) // ListExampleAutoIncFieldName queries the ExampleAutoIncFieldName table using prefix and range queries against defined indexes. ListExampleAutoIncFieldName(context.Context, *ListExampleAutoIncFieldNameRequest) (*ListExampleAutoIncFieldNameResponse, error) - mustEmbedUnimplementedTestSchemaQueryServer() + mustEmbedUnimplementedTestSchemaQueryServiceServer() } -// UnimplementedTestSchemaQueryServer must be embedded to have forward compatible implementations. -type UnimplementedTestSchemaQueryServer struct { +// UnimplementedTestSchemaQueryServiceServer must be embedded to have forward compatible implementations. +type UnimplementedTestSchemaQueryServiceServer struct { } -func (UnimplementedTestSchemaQueryServer) GetExampleTable(context.Context, *GetExampleTableRequest) (*GetExampleTableResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetExampleTable(context.Context, *GetExampleTableRequest) (*GetExampleTableResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExampleTable not implemented") } -func (UnimplementedTestSchemaQueryServer) GetExampleTableByU64Str(context.Context, *GetExampleTableByU64StrRequest) (*GetExampleTableByU64StrResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetExampleTableByU64Str(context.Context, *GetExampleTableByU64StrRequest) (*GetExampleTableByU64StrResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExampleTableByU64Str not implemented") } -func (UnimplementedTestSchemaQueryServer) ListExampleTable(context.Context, *ListExampleTableRequest) (*ListExampleTableResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) ListExampleTable(context.Context, *ListExampleTableRequest) (*ListExampleTableResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListExampleTable not implemented") } -func (UnimplementedTestSchemaQueryServer) GetExampleAutoIncrementTable(context.Context, *GetExampleAutoIncrementTableRequest) (*GetExampleAutoIncrementTableResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetExampleAutoIncrementTable(context.Context, *GetExampleAutoIncrementTableRequest) (*GetExampleAutoIncrementTableResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExampleAutoIncrementTable not implemented") } -func (UnimplementedTestSchemaQueryServer) GetExampleAutoIncrementTableByX(context.Context, *GetExampleAutoIncrementTableByXRequest) (*GetExampleAutoIncrementTableByXResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetExampleAutoIncrementTableByX(context.Context, *GetExampleAutoIncrementTableByXRequest) (*GetExampleAutoIncrementTableByXResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExampleAutoIncrementTableByX not implemented") } -func (UnimplementedTestSchemaQueryServer) ListExampleAutoIncrementTable(context.Context, *ListExampleAutoIncrementTableRequest) (*ListExampleAutoIncrementTableResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) ListExampleAutoIncrementTable(context.Context, *ListExampleAutoIncrementTableRequest) (*ListExampleAutoIncrementTableResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListExampleAutoIncrementTable not implemented") } -func (UnimplementedTestSchemaQueryServer) GetExampleSingleton(context.Context, *GetExampleSingletonRequest) (*GetExampleSingletonResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetExampleSingleton(context.Context, *GetExampleSingletonRequest) (*GetExampleSingletonResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExampleSingleton not implemented") } -func (UnimplementedTestSchemaQueryServer) GetExampleTimestamp(context.Context, *GetExampleTimestampRequest) (*GetExampleTimestampResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetExampleTimestamp(context.Context, *GetExampleTimestampRequest) (*GetExampleTimestampResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExampleTimestamp not implemented") } -func (UnimplementedTestSchemaQueryServer) ListExampleTimestamp(context.Context, *ListExampleTimestampRequest) (*ListExampleTimestampResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) ListExampleTimestamp(context.Context, *ListExampleTimestampRequest) (*ListExampleTimestampResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListExampleTimestamp not implemented") } -func (UnimplementedTestSchemaQueryServer) GetSimpleExample(context.Context, *GetSimpleExampleRequest) (*GetSimpleExampleResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetSimpleExample(context.Context, *GetSimpleExampleRequest) (*GetSimpleExampleResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetSimpleExample not implemented") } -func (UnimplementedTestSchemaQueryServer) GetSimpleExampleByUnique(context.Context, *GetSimpleExampleByUniqueRequest) (*GetSimpleExampleByUniqueResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetSimpleExampleByUnique(context.Context, *GetSimpleExampleByUniqueRequest) (*GetSimpleExampleByUniqueResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetSimpleExampleByUnique not implemented") } -func (UnimplementedTestSchemaQueryServer) ListSimpleExample(context.Context, *ListSimpleExampleRequest) (*ListSimpleExampleResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) ListSimpleExample(context.Context, *ListSimpleExampleRequest) (*ListSimpleExampleResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListSimpleExample not implemented") } -func (UnimplementedTestSchemaQueryServer) GetExampleAutoIncFieldName(context.Context, *GetExampleAutoIncFieldNameRequest) (*GetExampleAutoIncFieldNameResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) GetExampleAutoIncFieldName(context.Context, *GetExampleAutoIncFieldNameRequest) (*GetExampleAutoIncFieldNameResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetExampleAutoIncFieldName not implemented") } -func (UnimplementedTestSchemaQueryServer) ListExampleAutoIncFieldName(context.Context, *ListExampleAutoIncFieldNameRequest) (*ListExampleAutoIncFieldNameResponse, error) { +func (UnimplementedTestSchemaQueryServiceServer) ListExampleAutoIncFieldName(context.Context, *ListExampleAutoIncFieldNameRequest) (*ListExampleAutoIncFieldNameResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListExampleAutoIncFieldName not implemented") } -func (UnimplementedTestSchemaQueryServer) mustEmbedUnimplementedTestSchemaQueryServer() {} +func (UnimplementedTestSchemaQueryServiceServer) mustEmbedUnimplementedTestSchemaQueryServiceServer() { +} -// UnsafeTestSchemaQueryServer may be embedded to opt out of forward compatibility for this service. -// Use of this interface is not recommended, as added methods to TestSchemaQueryServer will +// UnsafeTestSchemaQueryServiceServer may be embedded to opt out of forward compatibility for this service. +// Use of this interface is not recommended, as added methods to TestSchemaQueryServiceServer will // result in compilation errors. -type UnsafeTestSchemaQueryServer interface { - mustEmbedUnimplementedTestSchemaQueryServer() +type UnsafeTestSchemaQueryServiceServer interface { + mustEmbedUnimplementedTestSchemaQueryServiceServer() } -func RegisterTestSchemaQueryServer(s grpc.ServiceRegistrar, srv TestSchemaQueryServer) { - s.RegisterService(&TestSchemaQuery_ServiceDesc, srv) +func RegisterTestSchemaQueryServiceServer(s grpc.ServiceRegistrar, srv TestSchemaQueryServiceServer) { + s.RegisterService(&TestSchemaQueryService_ServiceDesc, srv) } -func _TestSchemaQuery_GetExampleTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetExampleTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExampleTableRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetExampleTable(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetExampleTable(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetExampleTable", + FullMethod: "/testpb.TestSchemaQueryService/GetExampleTable", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetExampleTable(ctx, req.(*GetExampleTableRequest)) + return srv.(TestSchemaQueryServiceServer).GetExampleTable(ctx, req.(*GetExampleTableRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetExampleTableByU64Str_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetExampleTableByU64Str_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExampleTableByU64StrRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetExampleTableByU64Str(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetExampleTableByU64Str(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetExampleTableByU64Str", + FullMethod: "/testpb.TestSchemaQueryService/GetExampleTableByU64Str", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetExampleTableByU64Str(ctx, req.(*GetExampleTableByU64StrRequest)) + return srv.(TestSchemaQueryServiceServer).GetExampleTableByU64Str(ctx, req.(*GetExampleTableByU64StrRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_ListExampleTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_ListExampleTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListExampleTableRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).ListExampleTable(ctx, in) + return srv.(TestSchemaQueryServiceServer).ListExampleTable(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/ListExampleTable", + FullMethod: "/testpb.TestSchemaQueryService/ListExampleTable", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).ListExampleTable(ctx, req.(*ListExampleTableRequest)) + return srv.(TestSchemaQueryServiceServer).ListExampleTable(ctx, req.(*ListExampleTableRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetExampleAutoIncrementTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetExampleAutoIncrementTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExampleAutoIncrementTableRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetExampleAutoIncrementTable(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetExampleAutoIncrementTable(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetExampleAutoIncrementTable", + FullMethod: "/testpb.TestSchemaQueryService/GetExampleAutoIncrementTable", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetExampleAutoIncrementTable(ctx, req.(*GetExampleAutoIncrementTableRequest)) + return srv.(TestSchemaQueryServiceServer).GetExampleAutoIncrementTable(ctx, req.(*GetExampleAutoIncrementTableRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetExampleAutoIncrementTableByX_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetExampleAutoIncrementTableByX_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExampleAutoIncrementTableByXRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetExampleAutoIncrementTableByX(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetExampleAutoIncrementTableByX(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetExampleAutoIncrementTableByX", + FullMethod: "/testpb.TestSchemaQueryService/GetExampleAutoIncrementTableByX", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetExampleAutoIncrementTableByX(ctx, req.(*GetExampleAutoIncrementTableByXRequest)) + return srv.(TestSchemaQueryServiceServer).GetExampleAutoIncrementTableByX(ctx, req.(*GetExampleAutoIncrementTableByXRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_ListExampleAutoIncrementTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_ListExampleAutoIncrementTable_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListExampleAutoIncrementTableRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).ListExampleAutoIncrementTable(ctx, in) + return srv.(TestSchemaQueryServiceServer).ListExampleAutoIncrementTable(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/ListExampleAutoIncrementTable", + FullMethod: "/testpb.TestSchemaQueryService/ListExampleAutoIncrementTable", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).ListExampleAutoIncrementTable(ctx, req.(*ListExampleAutoIncrementTableRequest)) + return srv.(TestSchemaQueryServiceServer).ListExampleAutoIncrementTable(ctx, req.(*ListExampleAutoIncrementTableRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetExampleSingleton_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetExampleSingleton_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExampleSingletonRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetExampleSingleton(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetExampleSingleton(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetExampleSingleton", + FullMethod: "/testpb.TestSchemaQueryService/GetExampleSingleton", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetExampleSingleton(ctx, req.(*GetExampleSingletonRequest)) + return srv.(TestSchemaQueryServiceServer).GetExampleSingleton(ctx, req.(*GetExampleSingletonRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetExampleTimestamp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetExampleTimestamp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExampleTimestampRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetExampleTimestamp(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetExampleTimestamp(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetExampleTimestamp", + FullMethod: "/testpb.TestSchemaQueryService/GetExampleTimestamp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetExampleTimestamp(ctx, req.(*GetExampleTimestampRequest)) + return srv.(TestSchemaQueryServiceServer).GetExampleTimestamp(ctx, req.(*GetExampleTimestampRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_ListExampleTimestamp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_ListExampleTimestamp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListExampleTimestampRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).ListExampleTimestamp(ctx, in) + return srv.(TestSchemaQueryServiceServer).ListExampleTimestamp(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/ListExampleTimestamp", + FullMethod: "/testpb.TestSchemaQueryService/ListExampleTimestamp", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).ListExampleTimestamp(ctx, req.(*ListExampleTimestampRequest)) + return srv.(TestSchemaQueryServiceServer).ListExampleTimestamp(ctx, req.(*ListExampleTimestampRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetSimpleExample_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetSimpleExample_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetSimpleExampleRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetSimpleExample(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetSimpleExample(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetSimpleExample", + FullMethod: "/testpb.TestSchemaQueryService/GetSimpleExample", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetSimpleExample(ctx, req.(*GetSimpleExampleRequest)) + return srv.(TestSchemaQueryServiceServer).GetSimpleExample(ctx, req.(*GetSimpleExampleRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetSimpleExampleByUnique_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetSimpleExampleByUnique_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetSimpleExampleByUniqueRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetSimpleExampleByUnique(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetSimpleExampleByUnique(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetSimpleExampleByUnique", + FullMethod: "/testpb.TestSchemaQueryService/GetSimpleExampleByUnique", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetSimpleExampleByUnique(ctx, req.(*GetSimpleExampleByUniqueRequest)) + return srv.(TestSchemaQueryServiceServer).GetSimpleExampleByUnique(ctx, req.(*GetSimpleExampleByUniqueRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_ListSimpleExample_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_ListSimpleExample_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListSimpleExampleRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).ListSimpleExample(ctx, in) + return srv.(TestSchemaQueryServiceServer).ListSimpleExample(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/ListSimpleExample", + FullMethod: "/testpb.TestSchemaQueryService/ListSimpleExample", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).ListSimpleExample(ctx, req.(*ListSimpleExampleRequest)) + return srv.(TestSchemaQueryServiceServer).ListSimpleExample(ctx, req.(*ListSimpleExampleRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_GetExampleAutoIncFieldName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_GetExampleAutoIncFieldName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(GetExampleAutoIncFieldNameRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).GetExampleAutoIncFieldName(ctx, in) + return srv.(TestSchemaQueryServiceServer).GetExampleAutoIncFieldName(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/GetExampleAutoIncFieldName", + FullMethod: "/testpb.TestSchemaQueryService/GetExampleAutoIncFieldName", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).GetExampleAutoIncFieldName(ctx, req.(*GetExampleAutoIncFieldNameRequest)) + return srv.(TestSchemaQueryServiceServer).GetExampleAutoIncFieldName(ctx, req.(*GetExampleAutoIncFieldNameRequest)) } return interceptor(ctx, in, info, handler) } -func _TestSchemaQuery_ListExampleAutoIncFieldName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _TestSchemaQueryService_ListExampleAutoIncFieldName_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ListExampleAutoIncFieldNameRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(TestSchemaQueryServer).ListExampleAutoIncFieldName(ctx, in) + return srv.(TestSchemaQueryServiceServer).ListExampleAutoIncFieldName(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/testpb.TestSchemaQuery/ListExampleAutoIncFieldName", + FullMethod: "/testpb.TestSchemaQueryService/ListExampleAutoIncFieldName", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TestSchemaQueryServer).ListExampleAutoIncFieldName(ctx, req.(*ListExampleAutoIncFieldNameRequest)) + return srv.(TestSchemaQueryServiceServer).ListExampleAutoIncFieldName(ctx, req.(*ListExampleAutoIncFieldNameRequest)) } return interceptor(ctx, in, info, handler) } -// TestSchemaQuery_ServiceDesc is the grpc.ServiceDesc for TestSchemaQuery service. +// TestSchemaQueryService_ServiceDesc is the grpc.ServiceDesc for TestSchemaQueryService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) -var TestSchemaQuery_ServiceDesc = grpc.ServiceDesc{ - ServiceName: "testpb.TestSchemaQuery", - HandlerType: (*TestSchemaQueryServer)(nil), +var TestSchemaQueryService_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "testpb.TestSchemaQueryService", + HandlerType: (*TestSchemaQueryServiceServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "GetExampleTable", - Handler: _TestSchemaQuery_GetExampleTable_Handler, + Handler: _TestSchemaQueryService_GetExampleTable_Handler, }, { MethodName: "GetExampleTableByU64Str", - Handler: _TestSchemaQuery_GetExampleTableByU64Str_Handler, + Handler: _TestSchemaQueryService_GetExampleTableByU64Str_Handler, }, { MethodName: "ListExampleTable", - Handler: _TestSchemaQuery_ListExampleTable_Handler, + Handler: _TestSchemaQueryService_ListExampleTable_Handler, }, { MethodName: "GetExampleAutoIncrementTable", - Handler: _TestSchemaQuery_GetExampleAutoIncrementTable_Handler, + Handler: _TestSchemaQueryService_GetExampleAutoIncrementTable_Handler, }, { MethodName: "GetExampleAutoIncrementTableByX", - Handler: _TestSchemaQuery_GetExampleAutoIncrementTableByX_Handler, + Handler: _TestSchemaQueryService_GetExampleAutoIncrementTableByX_Handler, }, { MethodName: "ListExampleAutoIncrementTable", - Handler: _TestSchemaQuery_ListExampleAutoIncrementTable_Handler, + Handler: _TestSchemaQueryService_ListExampleAutoIncrementTable_Handler, }, { MethodName: "GetExampleSingleton", - Handler: _TestSchemaQuery_GetExampleSingleton_Handler, + Handler: _TestSchemaQueryService_GetExampleSingleton_Handler, }, { MethodName: "GetExampleTimestamp", - Handler: _TestSchemaQuery_GetExampleTimestamp_Handler, + Handler: _TestSchemaQueryService_GetExampleTimestamp_Handler, }, { MethodName: "ListExampleTimestamp", - Handler: _TestSchemaQuery_ListExampleTimestamp_Handler, + Handler: _TestSchemaQueryService_ListExampleTimestamp_Handler, }, { MethodName: "GetSimpleExample", - Handler: _TestSchemaQuery_GetSimpleExample_Handler, + Handler: _TestSchemaQueryService_GetSimpleExample_Handler, }, { MethodName: "GetSimpleExampleByUnique", - Handler: _TestSchemaQuery_GetSimpleExampleByUnique_Handler, + Handler: _TestSchemaQueryService_GetSimpleExampleByUnique_Handler, }, { MethodName: "ListSimpleExample", - Handler: _TestSchemaQuery_ListSimpleExample_Handler, + Handler: _TestSchemaQueryService_ListSimpleExample_Handler, }, { MethodName: "GetExampleAutoIncFieldName", - Handler: _TestSchemaQuery_GetExampleAutoIncFieldName_Handler, + Handler: _TestSchemaQueryService_GetExampleAutoIncFieldName_Handler, }, { MethodName: "ListExampleAutoIncFieldName", - Handler: _TestSchemaQuery_ListExampleAutoIncFieldName_Handler, + Handler: _TestSchemaQueryService_ListExampleAutoIncFieldName_Handler, }, }, Streams: []grpc.StreamDesc{}, From b425907b9598309247e6fe7dd17068058bbfcab0 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Fri, 18 Nov 2022 19:47:37 +0700 Subject: [PATCH 3/8] ci: add sonarcloud job (#11856) Co-authored-by: Julien Robert --- .github/workflows/test.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b8c6f7df6ce2..7b240fc9fbab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -171,6 +171,19 @@ jobs: file: ./coverage.txt if: env.GIT_DIFF + sonarcloud: + name: SonarCloud + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + test-rosetta: runs-on: ubuntu-latest timeout-minutes: 30 From eb4afa74baaa92deceebd4f92131f0f9d3e382b6 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 18 Nov 2022 16:14:49 +0100 Subject: [PATCH 4/8] ci: configure sonarcloud (#13921) --- .codecov.yml | 3 +++ .github/workflows/test.yml | 31 ++++++---------------------- README.md | 7 +++++-- server/export.go | 2 -- server/start.go | 2 -- server/tm_cmds.go | 2 -- server/util.go | 2 -- simapp/simd/cmd/testnet.go | 2 -- sonar-project.properties | 24 +++++++++++++++++++++ testutil/testdata/animal.go | 1 - x/auth/client/testutil/helpers.go | 2 -- x/auth/simulation/params.go | 2 -- x/bank/simulation/genesis.go | 2 -- x/bank/simulation/params.go | 2 -- x/capability/simulation/genesis.go | 2 -- x/capability/types/errors.go | 2 -- x/distribution/simulation/genesis.go | 2 -- x/distribution/simulation/params.go | 2 -- x/evidence/simulation/genesis.go | 2 -- x/evidence/types/errors.go | 1 - x/evidence/types/params.go | 2 -- x/genutil/collect.go | 2 -- x/genutil/types/types.go | 2 -- x/gov/keeper/invariants.go | 2 -- x/gov/module.go | 2 -- x/gov/simulation/genesis.go | 2 -- x/gov/simulation/params.go | 2 -- x/gov/types/v1/querier.go | 2 -- x/gov/types/v1beta1/querier.go | 2 -- x/mint/simulation/genesis.go | 2 -- x/mint/simulation/params.go | 2 -- x/slashing/simulation/genesis.go | 2 -- x/slashing/simulation/params.go | 2 -- x/slashing/types/querier.go | 2 -- x/staking/simulation/genesis.go | 2 -- x/staking/simulation/params.go | 2 -- 36 files changed, 38 insertions(+), 89 deletions(-) create mode 100644 sonar-project.properties diff --git a/.codecov.yml b/.codecov.yml index 63c053e74b20..97c516774b01 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -57,3 +57,6 @@ ignore: - "x/**/test_common.go" - "scripts/" - "contrib" + - "**/*.pb.gw.go" + - "**/*.pulsar.go" + - "tests/mocks/*.go" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b240fc9fbab..9f3fb504ca37 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -119,11 +119,13 @@ jobs: name: "${{ github.sha }}-${{ matrix.part }}-coverage" path: ./${{ matrix.part }}profile.out - upload-coverage-report: + repo-analysis: runs-on: ubuntu-latest needs: tests steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - uses: technote-space/get-diff-action@v6.1.1 with: PATTERNS: | @@ -154,35 +156,14 @@ jobs: - run: | cat ./*profile.out | grep -v "mode: atomic" >> coverage.txt if: env.GIT_DIFF - - name: filter out DONTCOVER - run: | - excludelist="$(find ./ -type f -name '*.go' | xargs grep -l 'DONTCOVER')" - excludelist+=" $(find ./ -type f -name '*.pb.go')" - excludelist+=" $(find ./ -type f -name '*.pb.gw.go')" - excludelist+=" $(find ./ -type f -path './tests/mocks/*.go')" - for filename in ${excludelist}; do - filename=$(echo $filename | sed 's/^./github.com\/cosmos\/cosmos-sdk/g') - echo "Excluding ${filename} from coverage report..." - sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt - done - if: env.GIT_DIFF - - uses: codecov/codecov-action@v3 - with: - file: ./coverage.txt - if: env.GIT_DIFF - - sonarcloud: - name: SonarCloud - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - uses: codecov/codecov-action@v3 + with: + file: ./coverage.txt test-rosetta: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 9796c49ea69d..bcaf45668e02 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,11 @@ Go report card - - Code Coverage + + Code Coverage + + + SonarCloud Analysis
diff --git a/server/export.go b/server/export.go index 0bdf518417e7..8739a55107ba 100644 --- a/server/export.go +++ b/server/export.go @@ -1,7 +1,5 @@ package server -// DONTCOVER - import ( "fmt" "os" diff --git a/server/start.go b/server/start.go index 3d70b9787f81..41fdaaaec1fd 100644 --- a/server/start.go +++ b/server/start.go @@ -1,7 +1,5 @@ package server -// DONTCOVER - import ( "errors" "fmt" diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 2dc1ddc57336..ce65b3981ee9 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -1,7 +1,5 @@ package server -// DONTCOVER - import ( "fmt" diff --git a/server/util.go b/server/util.go index d8f5e17e6d62..56db69f289cf 100644 --- a/server/util.go +++ b/server/util.go @@ -32,8 +32,6 @@ import ( "github.com/cosmos/cosmos-sdk/version" ) -// DONTCOVER - // ServerContextKey defines the context key used to retrieve a server.Context from // a command's Context. const ServerContextKey = sdk.ContextKey("server.context") diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go index 08722514db16..db27a6400242 100644 --- a/simapp/simd/cmd/testnet.go +++ b/simapp/simd/cmd/testnet.go @@ -1,7 +1,5 @@ package cmd -// DONTCOVER - import ( "bufio" "encoding/json" diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 000000000000..765c55d3bc16 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,24 @@ +sonar.projectKey=cosmos_cosmos-sdk +sonar.organization=cosmos + +sonar.projectName=Cosmos SDK +sonar.project.monorepo.enabled=true + +sonar.sources=. +sonar.exclusions=**/*_test.go,tests/**,**/*.pb.go,**/*.pb.gw.go,**/*.pulsar.go,test_helpers.go,docs/**,testutil/testdata/**,testutil/testdata_pulsar/**,**/*.java + +sonar.go.coverage.reportPaths=coverage.txt +sonar.coverage.exclusions=**/*_test.go,tests/**,**/*.pb.go,**/*.pb.gw.go,**/*.pulsar.go,test_helpers.go,docs/**,testutil/testdata/**,testutil/testdata_pulsar/**,**/*.java + +sonar.tests=. +sonar.test.inclusions=**/*_test.go,tests/** + +sonar.python.version=3 +sonar.sourceEncoding=UTF-8 +sonar.scm.provider=git +sonar.pullrequest.github.summary_comment=true + +# Exclude C/C++/Objective-C files from analysis +sonar.c.file.suffixes=- +sonar.cpp.file.suffixes=- +sonar.objc.file.suffixes=- \ No newline at end of file diff --git a/testutil/testdata/animal.go b/testutil/testdata/animal.go index 3ce5a00d18f6..428d3d4b2b9b 100644 --- a/testutil/testdata/animal.go +++ b/testutil/testdata/animal.go @@ -1,6 +1,5 @@ package testdata -// DONTCOVER // nolint import ( diff --git a/x/auth/client/testutil/helpers.go b/x/auth/client/testutil/helpers.go index 63e6ebdd4b11..688d2cacef07 100644 --- a/x/auth/client/testutil/helpers.go +++ b/x/auth/client/testutil/helpers.go @@ -110,5 +110,3 @@ func TxMultiSignBatchExec(clientCtx client.Context, filename string, from string return clitestutil.ExecTestCLICmd(clientCtx, cli.GetMultiSignBatchCmd(), args) } - -// DONTCOVER diff --git a/x/auth/simulation/params.go b/x/auth/simulation/params.go index 5ce9ac95fcc5..310e2a49ae16 100644 --- a/x/auth/simulation/params.go +++ b/x/auth/simulation/params.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "fmt" "math/rand" diff --git a/x/bank/simulation/genesis.go b/x/bank/simulation/genesis.go index 8592b08a318d..8547b9184699 100644 --- a/x/bank/simulation/genesis.go +++ b/x/bank/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/bank/simulation/params.go b/x/bank/simulation/params.go index 08decd4e1e63..ab83624c035b 100644 --- a/x/bank/simulation/params.go +++ b/x/bank/simulation/params.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "fmt" "math/rand" diff --git a/x/capability/simulation/genesis.go b/x/capability/simulation/genesis.go index ab1d11fb3d46..8cb45fc034f3 100644 --- a/x/capability/simulation/genesis.go +++ b/x/capability/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/capability/types/errors.go b/x/capability/types/errors.go index 7c582ccbb0a5..957191eb1c0f 100644 --- a/x/capability/types/errors.go +++ b/x/capability/types/errors.go @@ -1,7 +1,5 @@ package types -// DONTCOVER - import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/distribution/simulation/genesis.go b/x/distribution/simulation/genesis.go index 036efa28adff..ddda98a939ce 100644 --- a/x/distribution/simulation/genesis.go +++ b/x/distribution/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/distribution/simulation/params.go b/x/distribution/simulation/params.go index 21dc978b27d3..d4ca51822767 100644 --- a/x/distribution/simulation/params.go +++ b/x/distribution/simulation/params.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "fmt" "math/rand" diff --git a/x/evidence/simulation/genesis.go b/x/evidence/simulation/genesis.go index 640670ebe9a9..286a923ecd01 100644 --- a/x/evidence/simulation/genesis.go +++ b/x/evidence/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/evidence/types/errors.go b/x/evidence/types/errors.go index f44802709149..5e5d12e383d8 100644 --- a/x/evidence/types/errors.go +++ b/x/evidence/types/errors.go @@ -1,4 +1,3 @@ -// DONTCOVER package types import ( diff --git a/x/evidence/types/params.go b/x/evidence/types/params.go index 07c23c9854e8..70ef9f79a434 100644 --- a/x/evidence/types/params.go +++ b/x/evidence/types/params.go @@ -4,8 +4,6 @@ import ( "time" ) -// DONTCOVER - // DoubleSignJailEndTime period ends at Max Time supported by Amino // (Dec 31, 9999 - 23:59:59 GMT). var DoubleSignJailEndTime = time.Unix(253402300799, 0) diff --git a/x/genutil/collect.go b/x/genutil/collect.go index ed48d4174bc6..fafd3e757362 100644 --- a/x/genutil/collect.go +++ b/x/genutil/collect.go @@ -1,7 +1,5 @@ package genutil -// DONTCOVER - import ( "encoding/json" "errors" diff --git a/x/genutil/types/types.go b/x/genutil/types/types.go index 694eebdbe3bb..89f63554869a 100644 --- a/x/genutil/types/types.go +++ b/x/genutil/types/types.go @@ -7,8 +7,6 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" ) -// DONTCOVER - type ( // AppMap map modules names with their json raw representation. AppMap map[string]json.RawMessage diff --git a/x/gov/keeper/invariants.go b/x/gov/keeper/invariants.go index 0cfcdf32e49f..709330df6a26 100644 --- a/x/gov/keeper/invariants.go +++ b/x/gov/keeper/invariants.go @@ -1,7 +1,5 @@ package keeper -// DONTCOVER - import ( "fmt" diff --git a/x/gov/module.go b/x/gov/module.go index b33ade55c2a0..5f67fa123651 100644 --- a/x/gov/module.go +++ b/x/gov/module.go @@ -1,7 +1,5 @@ package gov -// DONTCOVER - import ( "context" "encoding/json" diff --git a/x/gov/simulation/genesis.go b/x/gov/simulation/genesis.go index 20b4b244d5a7..41cb0e6abdbe 100644 --- a/x/gov/simulation/genesis.go +++ b/x/gov/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/gov/simulation/params.go b/x/gov/simulation/params.go index c0f0ac05aecf..138ca15fb0bf 100644 --- a/x/gov/simulation/params.go +++ b/x/gov/simulation/params.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/gov/types/v1/querier.go b/x/gov/types/v1/querier.go index 11859f61b655..3286b49c35d7 100644 --- a/x/gov/types/v1/querier.go +++ b/x/gov/types/v1/querier.go @@ -4,8 +4,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// DONTCOVER - // query endpoints supported by the governance Querier const ( QueryParams = "params" diff --git a/x/gov/types/v1beta1/querier.go b/x/gov/types/v1beta1/querier.go index f08c4898b1f6..742289797e39 100644 --- a/x/gov/types/v1beta1/querier.go +++ b/x/gov/types/v1beta1/querier.go @@ -4,8 +4,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -// DONTCOVER - // query endpoints supported by the governance Querier const ( QueryParams = "params" diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index be363a429809..f0965c05be8c 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/mint/simulation/params.go b/x/mint/simulation/params.go index b75b0fc7000c..34927567e185 100644 --- a/x/mint/simulation/params.go +++ b/x/mint/simulation/params.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "fmt" "math/rand" diff --git a/x/slashing/simulation/genesis.go b/x/slashing/simulation/genesis.go index bb46fce2228c..456d2b06c983 100644 --- a/x/slashing/simulation/genesis.go +++ b/x/slashing/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/slashing/simulation/params.go b/x/slashing/simulation/params.go index e7c8fcf491b0..20d7f682589a 100644 --- a/x/slashing/simulation/params.go +++ b/x/slashing/simulation/params.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "fmt" "math/rand" diff --git a/x/slashing/types/querier.go b/x/slashing/types/querier.go index 3820a65264f6..3674101b78fc 100644 --- a/x/slashing/types/querier.go +++ b/x/slashing/types/querier.go @@ -1,7 +1,5 @@ package types -// DONTCOVER - // Query endpoints supported by the slashing querier const ( QueryParameters = "parameters" diff --git a/x/staking/simulation/genesis.go b/x/staking/simulation/genesis.go index afd393c1c778..74fb20e2c706 100644 --- a/x/staking/simulation/genesis.go +++ b/x/staking/simulation/genesis.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "encoding/json" "fmt" diff --git a/x/staking/simulation/params.go b/x/staking/simulation/params.go index 30789d346770..e969c7bd22ee 100644 --- a/x/staking/simulation/params.go +++ b/x/staking/simulation/params.go @@ -1,7 +1,5 @@ package simulation -// DONTCOVER - import ( "fmt" "math/rand" From 5581f7f3004116b3031702959f72c7fc2d7811d8 Mon Sep 17 00:00:00 2001 From: John Letey Date: Fri, 18 Nov 2022 16:27:06 +0000 Subject: [PATCH 5/8] fix: correctly propagate msg errors in gov (#13918) * fix: correctly propagate msg errors in gov * chore: update changelog * fix: correctly check proposal status in tests * chore: delete unused var --- CHANGELOG.md | 1 + x/gov/abci.go | 4 +++- x/gov/abci_test.go | 16 ++++++++-------- x/gov/common_test.go | 2 -- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f3b8fa5f145..f6a275d62a2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -195,6 +195,7 @@ extension interfaces. `module.Manager.Modules` is now of type `map[string]interf * (snapshot) [#13400](https://github.com/cosmos/cosmos-sdk/pull/13400) Fix snapshot checksum issue in golang 1.19. * (server) [#13778](https://github.com/cosmos/cosmos-sdk/pull/13778) Set Cosmos SDK default endpoints to localhost to avoid unknown exposure of endpoints. * (x/auth) [#13877](https://github.com/cosmos/cosmos-sdk/pull/13877) Handle missing account numbers during `InitGenesis`. +* (x/gov) [#13918](https://github.com/cosmos/cosmos-sdk/pull/13918) Fix propagation of message errors when executing a proposal. ### Deprecated diff --git a/x/gov/abci.go b/x/gov/abci.go index 79efc725bfe7..a19762be44be 100644 --- a/x/gov/abci.go +++ b/x/gov/abci.go @@ -72,7 +72,9 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) { if err == nil { for idx, msg = range messages { handler := keeper.Router().Handler(msg) - res, err := handler(cacheCtx, msg) + + var res *sdk.Result + res, err = handler(cacheCtx, msg) if err != nil { break } diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index bf7432feed96..86860e5c46da 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -11,6 +11,8 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/gov" "github.com/cosmos/cosmos-sdk/x/gov/keeper" "github.com/cosmos/cosmos-sdk/x/gov/types" @@ -347,10 +349,8 @@ func TestEndBlockerProposalHandlerFailed(t *testing.T) { createValidators(t, stakingMsgSvr, ctx, []sdk.ValAddress{valAddr}, []int64{10}) staking.EndBlocker(ctx, suite.StakingKeeper) - // Create a proposal where the handler will pass for the test proposal - // because the value of contextKeyBadProposal is true. - ctx = ctx.WithValue(contextKeyBadProposal, true) - proposal, err := suite.GovKeeper.SubmitProposal(ctx, []sdk.Msg{mkTestLegacyContent(t)}, "") + msg := banktypes.NewMsgSend(authtypes.NewModuleAddress(types.ModuleName), addrs[0], sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000)))) + proposal, err := suite.GovKeeper.SubmitProposal(ctx, []sdk.Msg{msg}, "") require.NoError(t, err) proposalCoins := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, suite.StakingKeeper.TokensFromConsensusPower(ctx, 10))) @@ -368,12 +368,12 @@ func TestEndBlockerProposalHandlerFailed(t *testing.T) { newHeader.Time = ctx.BlockHeader().Time.Add(*suite.GovKeeper.GetParams(ctx).MaxDepositPeriod).Add(*suite.GovKeeper.GetParams(ctx).VotingPeriod) ctx = ctx.WithBlockHeader(newHeader) - // Set the contextKeyBadProposal value to false so that the handler will fail - // during the processing of the proposal in the EndBlocker. - ctx = ctx.WithValue(contextKeyBadProposal, false) - // validate that the proposal fails/has been rejected gov.EndBlocker(ctx, suite.GovKeeper) + + proposal, ok := suite.GovKeeper.GetProposal(ctx, proposal.Id) + require.True(t, ok) + require.Equal(t, v1.StatusFailed, proposal.Status) } func createValidators(t *testing.T, stakingMsgSvr stakingtypes.MsgServer, ctx sdk.Context, addrs []sdk.ValAddress, powerAmt []int64) { diff --git a/x/gov/common_test.go b/x/gov/common_test.go index ca3512f4b255..6bca2818cb83 100644 --- a/x/gov/common_test.go +++ b/x/gov/common_test.go @@ -91,8 +91,6 @@ func SortByteArrays(src [][]byte) [][]byte { return sorted } -const contextKeyBadProposal = "contextKeyBadProposal" - var pubkeys = []cryptotypes.PubKey{ ed25519.GenPrivKey().PubKey(), ed25519.GenPrivKey().PubKey(), From 034554c1412aa1d6e563fcc06a494a003a4f14fd Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 18 Nov 2022 17:49:23 +0100 Subject: [PATCH 6/8] ci: fix sonarcloud code coverage (#13925) * ci: fix sonarcloud codecoverage * updates * updates * trigger ci * trigger ci * updates --- sonar-project.properties | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 765c55d3bc16..ba6b617b3048 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,13 +5,10 @@ sonar.projectName=Cosmos SDK sonar.project.monorepo.enabled=true sonar.sources=. -sonar.exclusions=**/*_test.go,tests/**,**/*.pb.go,**/*.pb.gw.go,**/*.pulsar.go,test_helpers.go,docs/**,testutil/testdata/**,testutil/testdata_pulsar/**,**/*.java - -sonar.go.coverage.reportPaths=coverage.txt -sonar.coverage.exclusions=**/*_test.go,tests/**,**/*.pb.go,**/*.pb.gw.go,**/*.pulsar.go,test_helpers.go,docs/**,testutil/testdata/**,testutil/testdata_pulsar/**,**/*.java - +sonar.exclusions=**/*_test.go,tests/**,**/*.pb.go,**/*.pb.gw.go,**/*.pulsar.go,test_helpers.go,docs/**,testutil/testdata/**,testutil/testdata_pulsar/**,**/*.java,client/docs/** sonar.tests=. sonar.test.inclusions=**/*_test.go,tests/** +sonar.go.coverage.reportPaths=coverage.out,*profile.out sonar.python.version=3 sonar.sourceEncoding=UTF-8 From d8391cb6796d770b02448bee70b865d824e43449 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 17:21:29 +0000 Subject: [PATCH 7/8] build(deps): Bump github.com/btcsuite/btcd/btcec/v2 from 2.3.1 to 2.3.2 (#13926) * build(deps): Bump github.com/btcsuite/btcd/btcec/v2 from 2.3.1 to 2.3.2 Bumps [github.com/btcsuite/btcd/btcec/v2](https://github.com/btcsuite/btcd) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/btcsuite/btcd/releases) - [Changelog](https://github.com/btcsuite/btcd/blob/master/CHANGES) - [Commits](https://github.com/btcsuite/btcd/compare/btcec/v2.3.1...btcec/v2.3.2) --- updated-dependencies: - dependency-name: github.com/btcsuite/btcd/btcec/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * build(deps): Bump github.com/btcsuite/btcd/btcec/v2 from 2.3.1 to 2.3.2 for all modules Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert --- go.mod | 2 +- go.sum | 4 ++-- simapp/go.mod | 2 +- simapp/go.sum | 4 ++-- tests/go.mod | 2 +- tests/go.sum | 4 ++-- tools/cosmovisor/go.mod | 2 +- tools/cosmovisor/go.sum | 4 ++-- tools/rosetta/go.mod | 2 +- tools/rosetta/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 526fe314f9b4..65f7ac2cfaa4 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/armon/go-metrics v0.4.1 github.com/bgentry/speakeasy v0.1.0 github.com/btcsuite/btcd v0.22.3 - github.com/btcsuite/btcd/btcec/v2 v2.3.1 + github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e github.com/cockroachdb/apd/v2 v2.0.2 github.com/confio/ics23/go v0.7.0 diff --git a/go.sum b/go.sum index 850d6cb715ba..79a94049fc63 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,8 @@ github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BR github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= -github.com/btcsuite/btcd/btcec/v2 v2.3.1 h1:v8tFffXRNpwFPbeQhkYPrOXOvVrwD5QIe66Jkz3db14= -github.com/btcsuite/btcd/btcec/v2 v2.3.1/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= +github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/simapp/go.mod b/simapp/go.mod index 3a6d449f1842..7f003b1b4d4e 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -36,7 +36,7 @@ require ( github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/btcsuite/btcd v0.22.3 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.3.1 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect diff --git a/simapp/go.sum b/simapp/go.sum index 5eec16cdcd6b..663ae2e2705d 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -135,8 +135,8 @@ github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BR github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= -github.com/btcsuite/btcd/btcec/v2 v2.3.1 h1:v8tFffXRNpwFPbeQhkYPrOXOvVrwD5QIe66Jkz3db14= -github.com/btcsuite/btcd/btcec/v2 v2.3.1/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= +github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/tests/go.mod b/tests/go.mod index 0bbbf26e15d9..88aff42dbf8a 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -39,7 +39,7 @@ require ( github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/btcsuite/btcd v0.22.3 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.3.1 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect diff --git a/tests/go.sum b/tests/go.sum index 31bcada14aae..0922c9c07974 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -135,8 +135,8 @@ github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BR github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= -github.com/btcsuite/btcd/btcec/v2 v2.3.1 h1:v8tFffXRNpwFPbeQhkYPrOXOvVrwD5QIe66Jkz3db14= -github.com/btcsuite/btcd/btcec/v2 v2.3.1/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= +github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 111eac59a2fb..6e6d0e1c78cb 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -29,7 +29,7 @@ require ( github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/btcsuite/btcd v0.22.3 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.3.1 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/confio/ics23/go v0.7.0 // indirect diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index 6d94151f960d..ccb473c09407 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -113,8 +113,8 @@ github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BR github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= -github.com/btcsuite/btcd/btcec/v2 v2.3.1 h1:v8tFffXRNpwFPbeQhkYPrOXOvVrwD5QIe66Jkz3db14= -github.com/btcsuite/btcd/btcec/v2 v2.3.1/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= +github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index a439711ea6e6..e2b3b581358a 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( cosmossdk.io/math v1.0.0-beta.3 - github.com/btcsuite/btcd/btcec/v2 v2.3.1 + github.com/btcsuite/btcd/btcec/v2 v2.3.2 github.com/coinbase/rosetta-sdk-go v0.8.1 github.com/cosmos/cosmos-sdk v0.46.0-beta2.0.20220909113810-4882f933b1a1 github.com/spf13/cobra v1.6.1 diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index 8d9b2bd68930..ffb004ba67b5 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -77,8 +77,8 @@ github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BR github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= -github.com/btcsuite/btcd/btcec/v2 v2.3.1 h1:v8tFffXRNpwFPbeQhkYPrOXOvVrwD5QIe66Jkz3db14= -github.com/btcsuite/btcd/btcec/v2 v2.3.1/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= +github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= From 385bff589dd191d8fd5ebed84a37964605032873 Mon Sep 17 00:00:00 2001 From: Adam Moser <63419657+toteki@users.noreply.github.com> Date: Sun, 20 Nov 2022 07:05:28 -0800 Subject: [PATCH 8/8] docs: relocate abci.go in docs/building-modules (#13934) --- docs/docs/building-modules/10-structure.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/building-modules/10-structure.md b/docs/docs/building-modules/10-structure.md index 78c39daa1931..68102ec3e365 100644 --- a/docs/docs/building-modules/10-structure.md +++ b/docs/docs/building-modules/10-structure.md @@ -52,13 +52,13 @@ x/{module_name} │   └── querier.go ├── module │   └── module.go +│   └── abci.go ├── simulation │   ├── decoder.go │   ├── genesis.go │   ├── operations.go │   └── params.go ├── {module_name}.pb.go -├── abci.go ├── codec.go ├── errors.go ├── events.go @@ -78,10 +78,10 @@ x/{module_name} * `exported/`: The module's exported types - typically interface types. If a module relies on keepers from another module, it is expected to receive the keepers as interface contracts through the `expected_keepers.go` file (see below) in order to avoid a direct dependency on the module implementing the keepers. However, these interface contracts can define methods that operate on and/or return types that are specific to the module that is implementing the keepers and this is where `exported/` comes into play. The interface types that are defined in `exported/` use canonical types, allowing for the module to receive the keepers as interface contracts through the `expected_keepers.go` file. This pattern allows for code to remain DRY and also alleviates import cycle chaos. * `keeper/`: The module's `Keeper` and `MsgServer` implementation. * `module/`: The module's `AppModule` and `AppModuleBasic` implementation. + * `abci.go`: The module's `BeginBlocker` and `EndBlocker` implementations (this file is only required if `BeginBlocker` and/or `EndBlocker` need to be defined). * `simulation/`: The module's [simulation](./13-simulator.md) package defines functions used by the blockchain simulator application (`simapp`). * `REAMDE.md`: The module's specification documents outlining important concepts, state storage structure, and message and event type definitions. Learn more how to write module specs in the [spec guidelines](../spec/SPEC-SPEC.md). * The root directory includes type definitions for messages, events, and genesis state, including the type definitions generated by Protocol Buffers. - * `abci.go`: The module's `BeginBlocker` and `EndBlocker` implementations (this file is only required if `BeginBlocker` and/or `EndBlocker` need to be defined). * `codec.go`: The module's registry methods for interface types. * `errors.go`: The module's sentinel errors. * `events.go`: The module's event types and constructors.