Merge branch 'master' of github.com:cosmos/cosmos-sdk into atheesh/59…

…21-grpc-gateway

proto/cosmos/auth/v1beta1/query.proto

@@ -4,7 +4,7 @@ package cosmos.auth.v1beta1;
 import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 import "google/api/annotations.proto";
-import "cosmos/auth/auth.proto";
+import "cosmos/auth/v1beta1/auth.proto";
 import "cosmos_proto/cosmos.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/auth/types";

proto/cosmos/bank/v1beta1/query.proto

@@ -3,8 +3,8 @@ package cosmos.bank.v1beta1;
 
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
-import "cosmos/cosmos.proto";
 import "google/api/annotations.proto";
+import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types";
 

proto/cosmos/distribution/v1beta1/query.proto

@@ -3,9 +3,9 @@ package cosmos.distribution.v1beta1;
 
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
-import "cosmos/cosmos.proto";
-import "cosmos/distribution/distribution.proto";
 import "google/api/annotations.proto";
+import "cosmos/base/v1beta1/coin.proto";
+import "cosmos/distribution/v1beta1/distribution.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/distribution/types";
 

proto/cosmos/gov/v1beta1/query.proto

@@ -3,8 +3,8 @@ package cosmos.gov.v1beta1;
 
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
-import "cosmos/gov/gov.proto";
 import "google/api/annotations.proto";
+import "cosmos/gov/v1beta1/gov.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types";
 

proto/cosmos/mint/v1beta1/query.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 package cosmos.mint.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos/mint/mint.proto";
 import "google/api/annotations.proto";
+import "cosmos/mint/v1beta1/mint.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/mint/types";
 

proto/cosmos/params/v1beta1/query.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 package cosmos.params.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "cosmos/params/params.proto";
 import "google/api/annotations.proto";
+import "cosmos/params/v1beta1/params.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/params/types/proposal";
 

proto/cosmos/slashing/v1beta1/query.proto

@@ -3,8 +3,8 @@ package cosmos.slashing.v1beta1;
 
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
-import "cosmos/slashing/slashing.proto";
 import "google/api/annotations.proto";
+import "cosmos/slashing/v1beta1/slashing.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/slashing/types";
 

proto/cosmos/staking/v1beta1/query.proto

@@ -3,8 +3,8 @@ package cosmos.staking.v1beta1;
 
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "gogoproto/gogo.proto";
-import "cosmos/staking/staking.proto";
 import "google/api/annotations.proto";
+import "cosmos/staking/v1beta1/staking.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/staking/types";
 

proto/cosmos/upgrade/v1beta1/query.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 package cosmos.upgrade.v1beta1;
 
-import "cosmos/upgrade/upgrade.proto";
 import "google/api/annotations.proto";
+import "cosmos/upgrade/v1beta1/upgrade.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/upgrade/types";
 

proto/ibc/channel/query.proto

@@ -6,6 +6,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "ibc/channel/channel.proto";
 import "google/api/annotations.proto";
+import "google/protobuf/any.proto";
 
 option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/04-channel/types";
 
@@ -21,17 +22,19 @@ service Query {
 		option (google.api.http).get = "/cosmos/ibc/channel/v1beta1/channels";
   }
 
-  // ConnectionChannels queries all the channels associated with a connection end.
+  // ConnectionChannels queries all the channels associated with a connection
+  // end.
   rpc ConnectionChannels(QueryConnectionChannelsRequest) returns (QueryConnectionChannelsResponse) {
 		option (google.api.http).get = "/cosmos/ibc/channel/v1beta1/connections/{connection}/channels";
   }
 
-  // PacketCommitment queries a stored packet commitment hash.
+  // ChannelClientState queries for the client state for the channel associated
+  // with the provided channel identifiers.
   rpc PacketCommitment(QueryPacketCommitmentRequest) returns (QueryPacketCommitmentResponse) {
 		option (google.api.http).get = "/cosmos/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{sequence}";
   }
 
-  // PacketCommitments returns the all the packet commitments hashes associated with a channel.
+  // PacketCommitment queries a stored packet commitment hash.
   rpc PacketCommitments(QueryPacketCommitmentsRequest) returns (QueryPacketCommitmentsResponse) {
 		option (google.api.http).get = "/cosmos/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments";
   }
@@ -41,12 +44,13 @@ service Query {
 		option (google.api.http).get = "/cosmos/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_acks/{sequence}";
   }
 
-  // UnrelayedPackets returns all the unrelayed IBC packets associated with a channel and sequences.
+  // UnrelayedPackets returns all the unrelayed IBC packets associated with a
+  // channel and sequences.
   rpc UnrelayedPackets(QueryUnrelayedPacketsRequest) returns (QueryUnrelayedPacketsResponse) {
 		option (google.api.http).get = "/cosmos/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/packet_commitments/{packet_commitment_sequences}/packet_acks/{acknowledgements}/unrelayed_packets";
   }
 
-  // NextSequenceReceive returns the next receive sequence for a given channel
+  // NextSequenceReceive returns the next receive sequence for a given channel.
   rpc NextSequenceReceive(QueryNextSequenceReceiveRequest) returns (QueryNextSequenceReceiveResponse) {
 		option (google.api.http).get = "/cosmos/ibc/channel/v1beta1/channels/{channel_id}/ports/{port_id}/next_sequence";
   }