All Makefile proto commands use Docker (#7931)

* Update tooling around docker

* Run commands

* Remove swagger gen for now

* Update proto-gen-any

* Fix indentn

* Use CURDIR

Co-authored-by: Alessio Treglia <alessio@tendermint.com>
This commit is contained in:
Amaury
2020-11-13 16:36:58 +00:00
committed by GitHub
co-authored by Alessio Treglia
parent 6e3fab854f
commit a8ef4a380d
35 changed files with 485 additions and 370 deletions
+9 -9
View File
@@ -9,31 +9,31 @@ option go_package = "github.com/cosmos/cosmos-sdk/testutil/testdata";
// Query tests the protobuf Query service as defined in
// https://github.com/cosmos/cosmos-sdk/issues/5921.
service Query {
rpc Echo(EchoRequest) returns (EchoResponse);
rpc SayHello(SayHelloRequest) returns (SayHelloResponse);
rpc TestAny(TestAnyRequest) returns (TestAnyResponse);
rpc Echo(EchoRequest) returns (EchoResponse);
rpc SayHello(SayHelloRequest) returns (SayHelloResponse);
rpc TestAny(TestAnyRequest) returns (TestAnyResponse);
}
message EchoRequest {
string message = 1;
string message = 1;
}
message EchoResponse {
string message = 1;
string message = 1;
}
message SayHelloRequest {
string name = 1;
string name = 1;
}
message SayHelloResponse {
string greeting = 1;
string greeting = 1;
}
message TestAnyRequest {
google.protobuf.Any any_animal = 1;
google.protobuf.Any any_animal = 1;
}
message TestAnyResponse {
testdata.HasAnimal has_animal = 1;
testdata.HasAnimal has_animal = 1;
}
+5 -5
View File
@@ -9,20 +9,20 @@ option go_package = "github.com/cosmos/cosmos-sdk/testutil/testdata";
// Msg tests the Protobuf message service as defined in
// https://github.com/cosmos/cosmos-sdk/issues/7500.
service Msg {
rpc CreateDog(MsgCreateDog) returns (MsgCreateDogResponse);
rpc CreateDog(MsgCreateDog) returns (MsgCreateDogResponse);
}
message MsgCreateDog {
testdata.Dog dog = 1;
testdata.Dog dog = 1;
}
message MsgCreateDogResponse {
string name = 1;
string name = 1;
}
// TestMsg is msg type for testing protobuf message using any, as defined in
// https://github.com/cosmos/cosmos-sdk/issues/6213.
message TestMsg {
option (gogoproto.goproto_getters) = false;
repeated string signers = 1;
option (gogoproto.goproto_getters) = false;
repeated string signers = 1;
}
+37 -37
View File
@@ -42,8 +42,8 @@ message Nested4A {
}
message Nested3A {
int32 id = 1;
string name = 2;
int32 id = 1;
string name = 2;
repeated Nested4A a4 = 4;
map<int64, Nested4A> index = 5;
}
@@ -66,10 +66,10 @@ message Nested4B {
}
message Nested3B {
int32 id = 1;
int32 age = 2;
string name = 3;
repeated Nested4B b4 = 4;
int32 id = 1;
int32 age = 2;
string name = 3;
repeated Nested4B b4 = 4;
}
message Nested2B {
@@ -101,32 +101,32 @@ message Customer3 {
}
message TestVersion1 {
int64 x = 1;
TestVersion1 a = 2;
TestVersion1 b = 3; // [(gogoproto.nullable) = false] generates invalid recursive structs;
int64 x = 1;
TestVersion1 a = 2;
TestVersion1 b = 3; // [(gogoproto.nullable) = false] generates invalid recursive structs;
repeated TestVersion1 c = 4;
repeated TestVersion1 d = 5 [(gogoproto.nullable) = false];
oneof sum {
int32 e = 6;
TestVersion1 f = 7;
}
google.protobuf.Any g = 8;
google.protobuf.Any g = 8;
repeated TestVersion1 h = 9; // [(gogoproto.castrepeated) = "TestVersion1"];
// google.protobuf.Timestamp i = 10;
// google.protobuf.Timestamp j = 11; // [(gogoproto.stdtime) = true];
Customer1 k = 12 [(gogoproto.embed) = true];
}
message TestVersion2 {
int64 x = 1;
TestVersion2 a = 2;
TestVersion2 b = 3; // [(gogoproto.nullable) = false];
int64 x = 1;
TestVersion2 a = 2;
TestVersion2 b = 3; // [(gogoproto.nullable) = false];
repeated TestVersion2 c = 4;
repeated TestVersion2 d = 5; // [(gogoproto.nullable) = false];
oneof sum {
int32 e = 6;
TestVersion2 f = 7;
}
google.protobuf.Any g = 8;
google.protobuf.Any g = 8;
repeated TestVersion1 h = 9; // [(gogoproto.castrepeated) = "TestVersion1"];
// google.protobuf.Timestamp i = 10;
// google.protobuf.Timestamp j = 11; // [(gogoproto.stdtime) = true];
@@ -134,16 +134,16 @@ message TestVersion2 {
uint64 new_field = 25;
}
message TestVersion3 {
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
repeated TestVersion3 c = 4;
repeated TestVersion3 d = 5; // [(gogoproto.nullable) = false];
oneof sum {
int32 e = 6;
TestVersion3 f = 7;
}
google.protobuf.Any g = 8;
google.protobuf.Any g = 8;
repeated TestVersion1 h = 9; //[(gogoproto.castrepeated) = "TestVersion1"];
// google.protobuf.Timestamp i = 10;
// google.protobuf.Timestamp j = 11; // [(gogoproto.stdtime) = true];
@@ -152,15 +152,15 @@ message TestVersion3 {
}
message TestVersion3LoneOneOfValue {
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
repeated TestVersion3 c = 4;
repeated TestVersion3 d = 5; // [(gogoproto.nullable) = false];
oneof sum {
int32 e = 6;
}
google.protobuf.Any g = 8;
google.protobuf.Any g = 8;
repeated TestVersion1 h = 9; //[(gogoproto.castrepeated) = "TestVersion1"];
// google.protobuf.Timestamp i = 10;
// google.protobuf.Timestamp j = 11; // [(gogoproto.stdtime) = true];
@@ -169,15 +169,15 @@ message TestVersion3LoneOneOfValue {
}
message TestVersion3LoneNesting {
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
repeated TestVersion3 c = 4;
repeated TestVersion3 d = 5; // [(gogoproto.nullable) = false];
oneof sum {
TestVersion3LoneNesting f = 7;
}
google.protobuf.Any g = 8;
google.protobuf.Any g = 8;
repeated TestVersion1 h = 9; //[(gogoproto.castrepeated) = "TestVersion1"];
// google.protobuf.Timestamp i = 10;
// google.protobuf.Timestamp j = 11; // [(gogoproto.stdtime) = true];
@@ -210,15 +210,15 @@ message TestVersion3LoneNesting {
}
message TestVersion4LoneNesting {
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
int64 x = 1;
TestVersion3 a = 2;
TestVersion3 b = 3; // [(gogoproto.nullable) = false];
repeated TestVersion3 c = 4;
repeated TestVersion3 d = 5; // [(gogoproto.nullable) = false];
oneof sum {
TestVersion3LoneNesting f = 7;
}
google.protobuf.Any g = 8;
google.protobuf.Any g = 8;
repeated TestVersion1 h = 9; //[(gogoproto.castrepeated) = "TestVersion1"];
// google.protobuf.Timestamp i = 10;
// google.protobuf.Timestamp j = 11; // [(gogoproto.stdtime) = true];
@@ -257,7 +257,7 @@ message TestVersionFD1 {
int32 e = 6;
TestVersion1 f = 7;
}
google.protobuf.Any g = 8;
google.protobuf.Any g = 8;
repeated TestVersion1 h = 9; // [(gogoproto.castrepeated) = "TestVersion1"];
}
@@ -268,7 +268,7 @@ message TestVersionFD1WithExtraAny {
int32 e = 6;
TestVersion1 f = 7;
}
AnyWithExtra g = 8;
AnyWithExtra g = 8;
repeated TestVersion1 h = 9; // [(gogoproto.castrepeated) = "TestVersion1"];
}
@@ -279,11 +279,11 @@ message AnyWithExtra {
}
message TestUpdatedTxRaw {
bytes body_bytes = 1;
bytes auth_info_bytes = 2;
repeated bytes signatures = 3;
bytes new_field_5 = 5;
bytes new_field_1024 = 1024;
bytes body_bytes = 1;
bytes auth_info_bytes = 2;
repeated bytes signatures = 3;
bytes new_field_5 = 5;
bytes new_field_1024 = 1024;
}
message TestUpdatedTxBody {