LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Proto Auditing: Replace ID with Id (#7032)

Browse Source 
* Proto Auditing: Replace ID with Id

* make proto-gen

* Update docs

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
This commit is contained in:
Amaury Martiny 2020-08-14 10:55:54 +02:00 committed by GitHub
parent 3735b182bc
commit 5559af8b97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
103 changed files with 1925 additions and 1964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -156,6 +156,7 @@ be used to retrieve the actual proposal `Content`. Also the `NewMsgSubmitProposa
* (modules) [\#6834](https://github.com/cosmos/cosmos-sdk/issues/6834) Add `RegisterInterfaces` method to `AppModuleBasic` to support registration of protobuf interface types.
* (modules) [\#6734](https://github.com/cosmos/cosmos-sdk/issues/6834) Add `TxEncodingConfig` parameter to `AppModuleBasic.ValidateGenesis` command to support JSON tx decoding in `genutil`.
* (genesis) [\#7000](https://github.com/cosmos/cosmos-sdk/pull/7000) The root `GenesisState` is now decoded using `encoding/json` instead of amino so `int64` and `uint64` types are now encoded as integers as opposed to strings.
* (types) [\#7032](https://github.com/cosmos/cosmos-sdk/pull/7032) All types ending with `ID` (e.g. `ProposalID`) now end with `Id` (e.g. `ProposalId`), to match default Protobuf generated format. Also see [\#7033](https://github.com/cosmos/cosmos-sdk/pull/7033) for more details.
### Features

2
proto/cosmos/base/store/v1beta1/commit_info.proto
View File

@ -16,7 +16,7 @@ message CommitInfo {
// between a store name and the commit ID.
message StoreInfo {
string name = 1;
CommitID commit_id = 2 [(gogoproto.nullable) = false, (gogoproto.customname) = "CommitID"];
CommitID commit_id = 2 [(gogoproto.nullable) = false];
}
// CommitID defines the committment information when a specific store is

1
proto/cosmos/gov/v1beta1/genesis.proto
View File

@ -11,7 +11,6 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types";
message GenesisState{
// starting_proposal_id is the ID of the starting proposal.
uint64 starting_proposal_id = 1 [
(gogoproto.customname) = "StartingProposalID",
(gogoproto.moretags) = "yaml:\"starting_proposal_id\""
];
// deposits defines all the deposits present at genesis.

10
proto/cosmos/gov/v1beta1/gov.proto
View File

@ -44,7 +44,7 @@ message TextProposal {
message Deposit {
option (gogoproto.equal) = true;
uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID", (gogoproto.moretags) = "yaml:\"proposal_id\""];
uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""];
bytes depositor = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
repeated cosmos.base.v1beta1.Coin amount = 3
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
@ -54,8 +54,10 @@ message Deposit {
message Proposal {
option (gogoproto.equal) = true;
uint64 proposal_id = 1
[(gogoproto.customname) = "ProposalID", (gogoproto.jsontag) = "id", (gogoproto.moretags) = "yaml:\"id\""];
uint64 proposal_id = 1 [
(gogoproto.jsontag) = "id",
(gogoproto.moretags) = "yaml:\"id\""
];
google.protobuf.Any content = 2 [(cosmos_proto.accepts_interface) = "Content"];
ProposalStatus status = 3 [(gogoproto.moretags) = "yaml:\"proposal_status\""];
TallyResult final_tally_result = 4
@ -112,7 +114,7 @@ message TallyResult {
message Vote {
option (gogoproto.equal) = true;
uint64 proposal_id = 1 [(gogoproto.customname) = "ProposalID", (gogoproto.moretags) = "yaml:\"proposal_id\""];
uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""];
bytes voter = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
VoteOption option = 3;
}

2
proto/cosmos/gov/v1beta1/tx.proto
View File

@ -32,7 +32,6 @@ message MsgVote {
uint64 proposal_id = 1 [
(gogoproto.jsontag) = "proposal_id",
(gogoproto.customname) = "ProposalID",
(gogoproto.moretags) = "yaml:\"proposal_id\""
];
bytes voter = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
@ -45,7 +44,6 @@ message MsgDeposit {
uint64 proposal_id = 1 [
(gogoproto.jsontag) = "proposal_id",
(gogoproto.customname) = "ProposalID",
(gogoproto.moretags) = "yaml:\"proposal_id\""
];
bytes depositor = 2 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];

36
proto/ibc/channel/channel.proto
View File

@ -8,8 +8,8 @@ import "gogoproto/gogo.proto";
// MsgChannelOpenInit defines an sdk.Msg to initialize a channel handshake. It is
// called by a relayer on Chain A.
message MsgChannelOpenInit {
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
Channel channel = 3 [(gogoproto.nullable) = false];
bytes signer = 4 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
}
@ -17,8 +17,8 @@ message MsgChannelOpenInit {
// MsgChannelOpenInit defines a msg sent by a Relayer to try to open a channel
// on Chain B.
message MsgChannelOpenTry {
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
Channel channel = 3 [(gogoproto.nullable) = false];
string counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
bytes proof_init = 5 [(gogoproto.moretags) = "yaml:\"proof_init\""];
@ -29,8 +29,8 @@ message MsgChannelOpenTry {
// MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge
// the change of channel state to TRYOPEN on Chain B.
message MsgChannelOpenAck {
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
string counterparty_version = 3 [(gogoproto.moretags) = "yaml:\"counterparty_version\""];
bytes proof_try = 4 [(gogoproto.moretags) = "yaml:\"proof_try\""];
uint64 proof_height = 5 [(gogoproto.moretags) = "yaml:\"proof_height\""];
@ -40,8 +40,8 @@ message MsgChannelOpenAck {
// MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain B to acknowledge
// the change of channel state to OPEN on Chain A.
message MsgChannelOpenConfirm {
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
bytes proof_ack = 3 [(gogoproto.moretags) = "yaml:\"proof_ack\""];
uint64 proof_height = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
bytes signer = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
@ -50,16 +50,16 @@ message MsgChannelOpenConfirm {
// MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain A
// to close a channel with Chain B.
message MsgChannelCloseInit {
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
bytes signer = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
}
// MsgChannelCloseConfirm defines a msg sent by a Relayer to Chain B
// to acknowledge the change of channel state to CLOSED on Chain A.
message MsgChannelCloseConfirm {
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
bytes proof_init = 3 [(gogoproto.moretags) = "yaml:\"proof_init\""];
uint64 proof_height = 4 [(gogoproto.moretags) = "yaml:\"proof_height\""];
bytes signer = 5 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
@ -127,9 +127,9 @@ message IdentifiedChannel {
// opaque channel version, which is agreed upon during the handshake
string version = 5;
// port identifier
string port_id = 6 [(gogoproto.customname) = "PortID"];
string port_id = 6;
// channel identifier
string channel_id = 7 [(gogoproto.customname) = "ChannelID"];
string channel_id = 7;
}
// State defines if a channel is in one of the following states:
@ -167,9 +167,9 @@ message Counterparty {
option (gogoproto.goproto_getters) = false;
// port on the counterparty chain which owns the other end of the channel.
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
// channel end on the counterparty chain
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
}
// Packet defines a type that carries data across different chains through IBC
@ -202,9 +202,9 @@ message PacketAckCommitment {
option (gogoproto.goproto_getters) = false;
// channel port identifier.
string port_id = 1 [(gogoproto.customname) = "PortID", (gogoproto.moretags) = "yaml:\"port_id\""];
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
// channel unique identifier.
string channel_id = 2 [(gogoproto.customname) = "ChannelID", (gogoproto.moretags) = "yaml:\"channel_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
// packet sequence.
uint64 sequence = 3;
// packet commitment hash.

2
proto/ibc/channel/genesis.proto
View File

@ -35,11 +35,9 @@ message GenesisState {
// next send and receive sequences.
message PacketSequence {
string port_id = 1 [
(gogoproto.customname) = "PortID",
(gogoproto.moretags) = "yaml:\"port_id\""
];
string channel_id = 2 [
(gogoproto.customname) = "ChannelID",
(gogoproto.moretags) = "yaml:\"channel_id\""
];
uint64 sequence = 3;

38
proto/ibc/channel/query.proto
View File

@ -2,7 +2,6 @@ syntax = "proto3";
package ibc.channel;
import "ibc/client/client.proto";
import "gogoproto/gogo.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
import "ibc/channel/channel.proto";
import "google/protobuf/any.proto";
@ -68,9 +67,9 @@ service Query {
// QueryChannelRequest is the request type for the Query/Channel RPC method
message QueryChannelRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
}
// QueryChannelResponse is the response type for the Query/Channel RPC method.
@ -127,9 +126,9 @@ message QueryConnectionChannelsResponse {
// RPC method
message QueryChannelClientStateRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
}
// QueryChannelClientStateResponse is the Response type for the
@ -149,9 +148,9 @@ message QueryChannelClientStateResponse {
// Query/ConsensusState RPC method
message QueryChannelConsensusStateRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
// height of the consensus state
uint64 height = 3;
}
@ -162,7 +161,7 @@ message QueryChannelConsensusStateResponse {
// consensus state associated with the channel
google.protobuf.Any consensus_state = 1;
// client ID associated with the consensus state
string client_id = 2 [(gogoproto.customname) = "ClientID"];
string client_id = 2;
// merkle proof of existence
bytes proof = 3;
// merkle proof path
@ -175,9 +174,9 @@ message QueryChannelConsensusStateResponse {
// Query/PacketCommitment RPC method
message QueryPacketCommitmentRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
// packet sequence
uint64 sequence = 3;
}
@ -200,9 +199,9 @@ message QueryPacketCommitmentResponse {
// Query/QueryPacketCommitments RPC method
message QueryPacketCommitmentsRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
// pagination request
cosmos.base.query.v1beta1.PageRequest pagination = 3;
}
@ -221,9 +220,9 @@ message QueryPacketCommitmentsResponse {
// Query/PacketAcknowledgement RPC method
message QueryPacketAcknowledgementRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
// packet sequence
uint64 sequence = 3;
}
@ -246,12 +245,11 @@ message QueryPacketAcknowledgementResponse {
// Query/UnrelayedPackets RPC method
message QueryUnrelayedPacketsRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
// list of packet sequences
repeated uint64 packet_commitment_sequences = 3
[(gogoproto.customname) = "PacketCommitmentSequences"];
repeated uint64 packet_commitment_sequences = 3;
// flag indicating if the return value is packet commitments or
// acknowledgements
bool acknowledgements = 4;
@ -270,9 +268,9 @@ message QueryUnrelayedPacketsResponse {
// Query/QueryNextSequenceReceiveRequest RPC method
message QueryNextSequenceReceiveRequest {
// port unique identifier
string port_id = 1 [(gogoproto.customname) = "PortID"];
string port_id = 1;
// channel unique identifier
string channel_id = 2 [(gogoproto.customname) = "ChannelID"];
string channel_id = 2;
}
// QuerySequenceResponse is the request type for the

2
proto/ibc/client/client.proto
View File

@ -10,6 +10,6 @@ import "google/protobuf/any.proto";
message IdentifiedClientState {
option (gogoproto.goproto_getters) = false;
// client identifier
string id = 1 [(gogoproto.customname) = "ID", (gogoproto.moretags) = "yaml:\"id\""];
string id = 1 [(gogoproto.moretags) = "yaml:\"id\""];
google.protobuf.Any client_state = 2;
}

5
proto/ibc/client/genesis.proto
View File

@ -9,7 +9,6 @@ import "google/protobuf/any.proto";
// GenesisClientState defines an identified ClientState as protobuf Any format.
message GenesisClientState {
string client_id = 1 [
(gogoproto.customname) = "ClientID",
(gogoproto.moretags) = "yaml:\"client_id\""
];
google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""];
@ -17,9 +16,7 @@ message GenesisClientState {
// ClientConsensusStates defines all the stored consensus states for a given client.
message ClientConsensusStates {
string client_id = 1 [
(gogoproto.customname) = "ClientID"
];
string client_id = 1;
repeated google.protobuf.Any consensus_states = 2 [
(gogoproto.moretags) = "yaml:\"consensus_states\""
];

13
proto/ibc/connection/connection.proto
View File

@ -10,11 +10,9 @@ import "ibc/commitment/commitment.proto";
// initialize a connection with Chain B.
message MsgConnectionOpenInit {
string client_id = 1 [
(gogoproto.customname) = "ClientID",
(gogoproto.moretags) = "yaml:\"client_id\""
];
string connection_id = 2 [
(gogoproto.customname) = "ConnectionID",
(gogoproto.moretags) = "yaml:\"connection_id\""
];
Counterparty counterparty = 3 [(gogoproto.nullable) = false];
@ -26,11 +24,9 @@ message MsgConnectionOpenInit {
// connection on Chain B.
message MsgConnectionOpenTry {
string client_id = 1 [
(gogoproto.customname) = "ClientID",
(gogoproto.moretags) = "yaml:\"client_id\""
];
string connection_id = 2 [
(gogoproto.customname) = "ConnectionID",
(gogoproto.moretags) = "yaml:\"connection_id\""
];
Counterparty counterparty = 3 [(gogoproto.nullable) = false];
@ -52,7 +48,6 @@ message MsgConnectionOpenTry {
// acknowledge the change of connection state to TRYOPEN on Chain B.
message MsgConnectionOpenAck {
string connection_id = 1 [
(gogoproto.customname) = "ConnectionID",
(gogoproto.moretags) = "yaml:\"connection_id\""
];
string version = 2;
@ -72,7 +67,6 @@ message MsgConnectionOpenAck {
// acknowledge the change of connection state to OPEN on Chain A.
message MsgConnectionOpenConfirm {
string connection_id = 1 [
(gogoproto.customname) = "ConnectionID",
(gogoproto.moretags) = "yaml:\"connection_id\""
];
// proof for the change of the connection state on Chain A: `INIT -> OPEN`
@ -92,7 +86,6 @@ message ConnectionEnd {
option (gogoproto.goproto_getters) = false;
// client associated with this connection.
string client_id = 1 [
(gogoproto.customname) = "ClientID",
(gogoproto.moretags) = "yaml:\"client_id\""
];
// IBC version which can be utilised to determine encodings or protocols for
@ -110,10 +103,9 @@ message IdentifiedConnection {
option (gogoproto.goproto_getters) = false;
// connection identifier.
string id = 1
[(gogoproto.customname) = "ID", (gogoproto.moretags) = "yaml:\"id\""];
[(gogoproto.moretags) = "yaml:\"id\""];
// client associated with this connection.
string client_id = 2 [
(gogoproto.customname) = "ClientID",
(gogoproto.moretags) = "yaml:\"client_id\""
];
// IBC version which can be utilised to determine encodings or protocols for
@ -149,13 +141,11 @@ message Counterparty {
// identifies the client on the counterparty chain associated with a given
// connection.
string client_id = 1 [
(gogoproto.customname) = "ClientID",
(gogoproto.moretags) = "yaml:\"client_id\""
];
// identifies the connection end on the counterparty chain associated with a
// given connection.
string connection_id = 2 [
(gogoproto.customname) = "ConnectionID",
(gogoproto.moretags) = "yaml:\"connection_id\""
];
// commitment merkle prefix of the counterparty chain
@ -172,7 +162,6 @@ message ClientPaths {
message ConnectionPaths {
// client state unique identifier
string client_id = 1 [
(gogoproto.customname) = "ClientID",
(gogoproto.moretags) = "yaml:\"client_id\""
];
// list of connection paths

10
proto/ibc/connection/query.proto
View File

@ -42,7 +42,7 @@ service Query {
// method
message QueryConnectionRequest {
// connection unique identifier
string connection_id = 1 [(gogoproto.customname) = "ConnectionID"];
string connection_id = 1;
}
// QueryConnectionResponse is the response type for the Query/Connection RPC
@ -80,7 +80,7 @@ message QueryConnectionsResponse {
// Query/ClientConnections RPC method
message QueryClientConnectionsRequest {
// client identifier associated with a connection
string client_id = 1 [(gogoproto.customname) = "ClientID"];
string client_id = 1;
}
// QueryClientConnectionsResponse is the response type for the
@ -100,8 +100,7 @@ message QueryClientConnectionsResponse {
// Query/ConnectionClientState RPC method
message QueryConnectionClientStateRequest {
// connection identifier
string id = 1 [
(gogoproto.customname) = "ConnectionID",
string connection_id = 1 [
(gogoproto.moretags) = "yaml:\"connection_id\""
];
}
@ -124,7 +123,6 @@ message QueryConnectionClientStateResponse {
message QueryConnectionConsensusStateRequest {
// connection identifier
string connection_id = 1 [
(gogoproto.customname) = "ConnectionID",
(gogoproto.moretags) = "yaml:\"connection_id\""
];
uint64 height = 2;
@ -136,7 +134,7 @@ message QueryConnectionConsensusStateResponse {
// consensus state associated with the channel
google.protobuf.Any consensus_state = 1;
// client ID associated with the consensus state
string client_id = 2 [(gogoproto.customname) = "ClientID"];
string client_id = 2;
// merkle proof of existence
bytes proof = 3;
// merkle proof path

3
proto/ibc/localhost/localhost.proto
View File

@ -18,10 +18,9 @@ message MsgCreateClient {
message ClientState {
option (gogoproto.goproto_getters) = false;
// client id
string id = 1 [(gogoproto.customname) = "ID"];
string id = 1;
// self chain ID
string chain_id = 2 [
(gogoproto.customname) = "ChainID",
(gogoproto.moretags) = "yaml:\"chain_id\""
];
// self latest block height

2
proto/ibc/tendermint/tendermint.proto
View File

@ -14,7 +14,7 @@ import "gogoproto/gogo.proto";
message ClientState {
option (gogoproto.goproto_getters) = false;
string chain_id = 1 [(gogoproto.customname) = "ChainID"];
string chain_id = 1;
Fraction trust_level = 2 [
(gogoproto.nullable) = false,
(gogoproto.moretags) = "yaml:\"trust_level\""

1
proto/ibc/transfer/genesis.proto
View File

@ -9,7 +9,6 @@ import "gogoproto/gogo.proto";
// by the module manager
message GenesisState {
string port_id = 1 [
(gogoproto.customname) = "PortID",
(gogoproto.moretags) = "yaml:\"port_id\""
];
}

4
store/rootmulti/store.go
View File

@ -219,7 +219,7 @@ func (rs *Store) getCommitID(infos map[string]types.StoreInfo, name string) type
return types.CommitID{}
}
return info.CommitID
return info.CommitId
}
func deleteKVStore(kv types.KVStore) error {
@ -607,7 +607,7 @@ func commitStores(version int64, storeMap map[types.StoreKey]types.CommitKVStore
si := types.StoreInfo{}
si.Name = key.Name()
si.CommitID = commitID
si.CommitId = commitID
storeInfos = append(storeInfos, si)
}

2
store/rootmulti/store_test.go
View File

@ -588,7 +588,7 @@ func hashStores(stores map[types.StoreKey]types.CommitKVStore) []byte {
name := key.Name()
m[name] = types.StoreInfo{
Name: name,
CommitID: store.LastCommitID(),
CommitId: store.LastCommitID(),
}.GetHash()
}
return sdkmaps.SimpleHashFromMap(m)

2
store/types/commit_info.go
View File

@ -18,7 +18,7 @@ import (
// This is then chained with the substore proof, so we prove the root hash from the substore before this
// and need to pass that (unmodified) as the leaf value of the multistore proof.
func (si StoreInfo) GetHash() []byte {
return si.CommitID.Hash
return si.CommitId.Hash
}
func (ci CommitInfo) toMap() map[string][]byte {

55
store/types/commit_info.pb.go
View File

@ -81,7 +81,7 @@ func (m *CommitInfo) GetStoreInfos() []StoreInfo {
// between a store name and the commit ID.
type StoreInfo struct {
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
CommitID CommitID `protobuf:"bytes,2,opt,name=commit_id,json=commitId,proto3" json:"commit_id"`
CommitId CommitID `protobuf:"bytes,2,opt,name=commit_id,json=commitId,proto3" json:"commit_id"`
}
func (m *StoreInfo) Reset() { *m = StoreInfo{} }
@ -124,9 +124,9 @@ func (m *StoreInfo) GetName() string {
return ""
}
func (m *StoreInfo) GetCommitID() CommitID {
func (m *StoreInfo) GetCommitId() CommitID {
if m != nil {
return m.CommitID
return m.CommitId
}
return CommitID{}
}
@ -195,27 +195,26 @@ func init() {
}
var fileDescriptor_83f4097f6265b52f = []byte{
// 308 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x4e, 0xc3, 0x30,
0x10, 0x86, 0xe3, 0x36, 0x82, 0xd6, 0x65, 0x40, 0x16, 0x43, 0x60, 0x70, 0xab, 0xc2, 0x10, 0x09,
0x61, 0xab, 0x65, 0x63, 0x60, 0x08, 0x2c, 0x15, 0x9b, 0xd9, 0x58, 0x50, 0xd2, 0xba, 0x6d, 0x84,
0x92, 0xab, 0x72, 0xa6, 0x12, 0x6f, 0xc1, 0xc8, 0xc8, 0xe3, 0x74, 0xec, 0xc8, 0x54, 0xa1, 0xe4,
0x45, 0x50, 0x9c, 0xa4, 0x1b, 0x9d, 0x7c, 0x77, 0xfe, 0xfd, 0x7f, 0xfa, 0x7d, 0xf4, 0x7a, 0x0a,
0x98, 0x00, 0xca, 0x28, 0x44, 0x2d, 0xd1, 0x40, 0xa6, 0xe5, 0x7a, 0x14, 0x69, 0x13, 0x8e, 0xe4,
0x14, 0x92, 0x24, 0x36, 0xaf, 0x71, 0x3a, 0x07, 0xb1, 0xca, 0xc0, 0x00, 0x3b, 0xaf, 0xc4, 0xa2,
0x14, 0x0b, 0x2b, 0x16, 0xb5, 0xf8, 0xe2, 0x6c, 0x01, 0x0b, 0xb0, 0x2a, 0x59, 0x56, 0xd5, 0x83,
0x21, 0x52, 0xfa, 0x60, 0x5d, 0x26, 0xe9, 0x1c, 0x98, 0x47, 0x8f, 0xd7, 0x3a, 0xc3, 0x18, 0x52,
0x8f, 0x0c, 0x88, 0xdf, 0x56, 0x4d, 0xcb, 0x9e, 0x68, 0xcf, 0xda, 0x59, 0x18, 0x7a, 0xad, 0x41,
0xdb, 0xef, 0x8d, 0xaf, 0xc4, 0xbf, 0x38, 0xf1, 0x5c, 0x76, 0xa5, 0x69, 0xe0, 0x6e, 0x76, 0x7d,
0x47, 0x51, 0x6c, 0x06, 0x38, 0x44, 0xda, 0xdd, 0x5f, 0x33, 0x46, 0xdd, 0x34, 0x4c, 0xb4, 0x05,
0x76, 0x95, 0xad, 0x99, 0xa2, 0xdd, 0x26, 0xdb, 0xcc, 0x6b, 0x0d, 0x88, 0xdf, 0x1b, 0x5f, 0x1e,
0x60, 0xd5, 0x09, 0x1e, 0x83, 0xd3, 0x12, 0x95, 0xef, 0xfa, 0x9d, 0x66, 0xa2, 0x3a, 0x95, 0xcf,
0x64, 0x36, 0xbc, 0xa7, 0xfb, 0xe9, 0x81, 0x9c, 0x8c, 0xba, 0xcb, 0x10, 0x97, 0x16, 0x7a, 0xa2,
0x6c, 0x7d, 0xe7, 0x7e, 0x7d, 0xf7, 0x9d, 0x20, 0xd8, 0xe4, 0x9c, 0x6c, 0x73, 0x4e, 0x7e, 0x73,
0x4e, 0x3e, 0x0b, 0xee, 0x6c, 0x0b, 0xee, 0xfc, 0x14, 0xdc, 0x79, 0xf1, 0x17, 0xb1, 0x59, 0xbe,
0x47, 0x62, 0x0a, 0x89, 0xac, 0x97, 0x55, 0x1d, 0x37, 0x38, 0x7b, 0xab, 0x57, 0x66, 0x3e, 0x56,
0x1a, 0xa3, 0x23, 0xfb, 0xe9, 0xb7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x49, 0xb6, 0xbf, 0xab,
0xd4, 0x01, 0x00, 0x00,
// 301 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4e, 0xce, 0x2f, 0xce,
0xcd, 0x2f, 0xd6, 0x4f, 0x4a, 0x2c, 0x4e, 0xd5, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, 0x33,
0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0x2c, 0x89, 0xcf, 0xcc, 0x4b,
0xcb, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x84, 0x28, 0xd6, 0x03, 0x29, 0xd6, 0x03,
0x2b, 0xd6, 0x83, 0x2a, 0x96, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd2, 0x07, 0xb1, 0x20,
0x1a, 0x94, 0x8a, 0xb9, 0xb8, 0x9c, 0xc1, 0xa6, 0x78, 0xe6, 0xa5, 0xe5, 0x0b, 0x49, 0x70, 0xb1,
0x97, 0xa5, 0x16, 0x15, 0x67, 0xe6, 0xe7, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0xc1, 0xb8,
0x42, 0xde, 0x5c, 0xdc, 0x60, 0xe3, 0xc0, 0x96, 0x15, 0x4b, 0x30, 0x29, 0x30, 0x6b, 0x70, 0x1b,
0xa9, 0xe8, 0xe1, 0xb4, 0x4e, 0x2f, 0x18, 0xc4, 0x03, 0x19, 0xea, 0xc4, 0x72, 0xe2, 0x9e, 0x3c,
0x43, 0x10, 0x57, 0x31, 0x4c, 0xa0, 0x58, 0x29, 0x9d, 0x8b, 0x13, 0x2e, 0x2d, 0x24, 0xc4, 0xc5,
0x92, 0x97, 0x98, 0x9b, 0x0a, 0xb6, 0x90, 0x33, 0x08, 0xcc, 0x16, 0x72, 0xe3, 0xe2, 0x84, 0xf9,
0x2d, 0x45, 0x82, 0x49, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x19, 0x8f, 0x5d, 0x50, 0x1f, 0xb8, 0x40,
0xad, 0xe2, 0x80, 0xe8, 0xf5, 0x4c, 0x51, 0xb2, 0xe3, 0xe2, 0x80, 0xc9, 0xe1, 0xf1, 0x9b, 0x10,
0x17, 0x4b, 0x46, 0x62, 0x71, 0x06, 0xd8, 0x22, 0x9e, 0x20, 0x30, 0xdb, 0x8a, 0x65, 0xc6, 0x02,
0x79, 0x06, 0x27, 0xa7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e,
0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x48,
0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x46, 0x10, 0x84, 0xd2, 0x2d,
0x4e, 0xc9, 0x86, 0x46, 0x53, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, 0xa0, 0x8d, 0x01,
0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0xc0, 0xc7, 0x12, 0xc8, 0x01, 0x00, 0x00,
}
func (m *CommitInfo) Marshal() (dAtA []byte, err error) {
@ -281,7 +280,7 @@ func (m *StoreInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int
_ = l
{
size, err := m.CommitID.MarshalToSizedBuffer(dAtA[:i])
size, err := m.CommitId.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
@ -374,7 +373,7 @@ func (m *StoreInfo) Size() (n int) {
if l > 0 {
n += 1 + l + sovCommitInfo(uint64(l))
}
l = m.CommitID.Size()
l = m.CommitId.Size()
n += 1 + l + sovCommitInfo(uint64(l))
return n
}
@ -570,7 +569,7 @@ func (m *StoreInfo) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field CommitID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field CommitId", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
@ -597,7 +596,7 @@ func (m *StoreInfo) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := m.CommitID.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
if err := m.CommitId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex

3
x/distribution/types/genesis.pb.go
View File

@ -141,7 +141,8 @@ func (m *ValidatorOutstandingRewardsRecord) GetOutstandingRewards() github_com_c
type ValidatorAccumulatedCommissionRecord struct {
// validator_address is the address of the validator.
ValidatorAddress github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"validator_address,omitempty" yaml:"validator_address"`
Accumulated ValidatorAccumulatedCommission `protobuf:"bytes,2,opt,name=accumulated,proto3" json:"accumulated" yaml:"accumulated"`
// accumulated is the accumulated commission of a validator.
Accumulated ValidatorAccumulatedCommission `protobuf:"bytes,2,opt,name=accumulated,proto3" json:"accumulated" yaml:"accumulated"`
}
func (m *ValidatorAccumulatedCommissionRecord) Reset() { *m = ValidatorAccumulatedCommissionRecord{} }

2
x/evidence/types/genesis.pb.go
View File

@ -25,7 +25,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// GenesisState defines the evidence module's genesis state.
type GenesisState struct {
// evidence defines all the evidences at genesis.
// evidence defines all the evidence at genesis.
Evidence []*types.Any `protobuf:"bytes,1,rep,name=evidence,proto3" json:"evidence,omitempty"`
}

18
x/gov/abci.go
View File

@ -18,20 +18,20 @@ func EndBlocker(ctx sdk.Context, keeper keeper.Keeper) {
// delete inactive proposal from store and its deposits
keeper.IterateInactiveProposalsQueue(ctx, ctx.BlockHeader().Time, func(proposal types.Proposal) bool {
keeper.DeleteProposal(ctx, proposal.ProposalID)
keeper.DeleteDeposits(ctx, proposal.ProposalID)
keeper.DeleteProposal(ctx, proposal.ProposalId)
keeper.DeleteDeposits(ctx, proposal.ProposalId)
ctx.EventManager().EmitEvent(
sdk.NewEvent(
types.EventTypeInactiveProposal,
sdk.NewAttribute(types.AttributeKeyProposalID, fmt.Sprintf("%d", proposal.ProposalID)),
sdk.NewAttribute(types.AttributeKeyProposalID, fmt.Sprintf("%d", proposal.ProposalId)),
sdk.NewAttribute(types.AttributeKeyProposalResult, types.AttributeValueProposalDropped),
),
)
logger.Info(
fmt.Sprintf("proposal %d (%s) didn't meet minimum deposit of %s (had only %s); deleted",
proposal.ProposalID,
proposal.ProposalId,
proposal.GetTitle(),
keeper.GetDepositParams(ctx).MinDeposit,
proposal.TotalDeposit,
@ -47,9 +47,9 @@ func EndBlocker(ctx sdk.Context, keeper keeper.Keeper) {
passes, burnDeposits, tallyResults := keeper.Tally(ctx, proposal)
if burnDeposits {
keeper.DeleteDeposits(ctx, proposal.ProposalID)
keeper.DeleteDeposits(ctx, proposal.ProposalId)
} else {
keeper.RefundDeposits(ctx, proposal.ProposalID)
keeper.RefundDeposits(ctx, proposal.ProposalId)
}
if passes {
@ -87,19 +87,19 @@ func EndBlocker(ctx sdk.Context, keeper keeper.Keeper) {
proposal.FinalTallyResult = tallyResults
keeper.SetProposal(ctx, proposal)
keeper.RemoveFromActiveProposalQueue(ctx, proposal.ProposalID, proposal.VotingEndTime)
keeper.RemoveFromActiveProposalQueue(ctx, proposal.ProposalId, proposal.VotingEndTime)
logger.Info(
fmt.Sprintf(
"proposal %d (%s) tallied; result: %s",
proposal.ProposalID, proposal.GetTitle(), logMsg,
proposal.ProposalId, proposal.GetTitle(), logMsg,
),
)
ctx.EventManager().EmitEvent(
sdk.NewEvent(
types.EventTypeActiveProposal,
sdk.NewAttribute(types.AttributeKeyProposalID, fmt.Sprintf("%d", proposal.ProposalID)),
sdk.NewAttribute(types.AttributeKeyProposalID, fmt.Sprintf("%d", proposal.ProposalId)),
sdk.NewAttribute(types.AttributeKeyProposalResult, tagValue),
),
)

8
x/gov/abci_test.go
View File

@ -286,7 +286,7 @@ func TestProposalPassedEndblocker(t *testing.T) {
require.NoError(t, err)
proposalCoins := sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(10))}
newDepositMsg := types.NewMsgDeposit(addrs[0], proposal.ProposalID, proposalCoins)
newDepositMsg := types.NewMsgDeposit(addrs[0], proposal.ProposalId, proposalCoins)
res, err := handler(ctx, newDepositMsg)
require.NoError(t, err)
@ -299,7 +299,7 @@ func TestProposalPassedEndblocker(t *testing.T) {
deposits := initialModuleAccCoins.Add(proposal.TotalDeposit...).Add(proposalCoins...)
require.True(t, moduleAccCoins.IsEqual(deposits))
err = app.GovKeeper.AddVote(ctx, proposal.ProposalID, addrs[0], types.OptionYes)
err = app.GovKeeper.AddVote(ctx, proposal.ProposalId, addrs[0], types.OptionYes)
require.NoError(t, err)
newHeader := ctx.BlockHeader()
@ -338,13 +338,13 @@ func TestEndBlockerProposalHandlerFailed(t *testing.T) {
require.NoError(t, err)
proposalCoins := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(10)))
newDepositMsg := types.NewMsgDeposit(addrs[0], proposal.ProposalID, proposalCoins)
newDepositMsg := types.NewMsgDeposit(addrs[0], proposal.ProposalId, proposalCoins)
res, err := handler(ctx, newDepositMsg)
require.NoError(t, err)
require.NotNil(t, res)
err = app.GovKeeper.AddVote(ctx, proposal.ProposalID, addrs[0], types.OptionYes)
err = app.GovKeeper.AddVote(ctx, proposal.ProposalId, addrs[0], types.OptionYes)
require.NoError(t, err)
newHeader := ctx.BlockHeader()

8
x/gov/client/utils/query.go
View File

@ -58,7 +58,7 @@ func QueryDepositsByTxQuery(clientCtx client.Context, params types.QueryProposal
deposits = append(deposits, types.Deposit{
Depositor: depMsg.Depositor,
ProposalID: params.ProposalID,
ProposalId: params.ProposalID,
Amount: depMsg.Amount,
})
}
@ -100,7 +100,7 @@ func QueryVotesByTxQuery(clientCtx client.Context, params types.QueryProposalVot
votes = append(votes, types.Vote{
Voter: voteMsg.Voter,
ProposalID: params.ProposalID,
ProposalId: params.ProposalID,
Option: voteMsg.Option,
})
}
@ -147,7 +147,7 @@ func QueryVoteByTxQuery(clientCtx client.Context, params types.QueryVoteParams)
vote := types.Vote{
Voter: voteMsg.Voter,
ProposalID: params.ProposalID,
ProposalId: params.ProposalID,
Option: voteMsg.Option,
}
@ -188,7 +188,7 @@ func QueryDepositByTxQuery(clientCtx client.Context, params types.QueryDepositPa
deposit := types.Deposit{
Depositor: depMsg.Depositor,
ProposalID: params.ProposalID,
ProposalId: params.ProposalID,
Amount: depMsg.Amount,
}

12
x/gov/genesis.go
View File

@ -10,7 +10,7 @@ import (
// InitGenesis - store genesis parameters
func InitGenesis(ctx sdk.Context, ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, data *types.GenesisState) {
k.SetProposalID(ctx, data.StartingProposalID)
k.SetProposalID(ctx, data.StartingProposalId)
k.SetDepositParams(ctx, data.DepositParams)
k.SetVotingParams(ctx, data.VotingParams)
k.SetTallyParams(ctx, data.TallyParams)
@ -34,9 +34,9 @@ func InitGenesis(ctx sdk.Context, ak types.AccountKeeper, bk types.BankKeeper, k
for _, proposal := range data.Proposals {
switch proposal.Status {
case types.StatusDepositPeriod:
k.InsertInactiveProposalQueue(ctx, proposal.ProposalID, proposal.DepositEndTime)
k.InsertInactiveProposalQueue(ctx, proposal.ProposalId, proposal.DepositEndTime)
case types.StatusVotingPeriod:
k.InsertActiveProposalQueue(ctx, proposal.ProposalID, proposal.VotingEndTime)
k.InsertActiveProposalQueue(ctx, proposal.ProposalId, proposal.VotingEndTime)
}
k.SetProposal(ctx, proposal)
}
@ -62,15 +62,15 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
var proposalsDeposits types.Deposits
var proposalsVotes types.Votes
for _, proposal := range proposals {
deposits := k.GetDeposits(ctx, proposal.ProposalID)
deposits := k.GetDeposits(ctx, proposal.ProposalId)
proposalsDeposits = append(proposalsDeposits, deposits...)
votes := k.GetVotes(ctx, proposal.ProposalID)
votes := k.GetVotes(ctx, proposal.ProposalId)
proposalsVotes = append(proposalsVotes, votes...)
}
return &types.GenesisState{
StartingProposalID: startingProposalID,
StartingProposalId: startingProposalID,
Deposits: proposalsDeposits,
Votes: proposalsVotes,
Proposals: proposals,

8
x/gov/genesis_test.go
View File

@ -33,11 +33,11 @@ func TestImportExportQueues(t *testing.T) {
proposal := TestProposal
proposal1, err := app.GovKeeper.SubmitProposal(ctx, proposal)
require.NoError(t, err)
proposalID1 := proposal1.ProposalID
proposalID1 := proposal1.ProposalId
proposal2, err := app.GovKeeper.SubmitProposal(ctx, proposal)
require.NoError(t, err)
proposalID2 := proposal2.ProposalID
proposalID2 := proposal2.ProposalId
votingStarted, err := app.GovKeeper.AddDeposit(ctx, proposalID2, addrs[0], app.GovKeeper.GetDepositParams(ctx).MinDeposit)
require.NoError(t, err)
@ -139,8 +139,8 @@ func TestEqualProposals(t *testing.T) {
require.False(t, state1.Equal(state2))
// Now make proposals identical by setting both IDs to 55
proposal1.ProposalID = 55
proposal2.ProposalID = 55
proposal1.ProposalId = 55
proposal2.ProposalId = 55
require.Equal(t, proposal1, proposal1)
require.Equal(t, proposal1, proposal2)

16
x/gov/handler.go
View File

@ -42,7 +42,7 @@ func handleMsgSubmitProposal(ctx sdk.Context, keeper keeper.Keeper, msg types.Ms
defer telemetry.IncrCounter(1, types.ModuleName, "proposal")
votingStarted, err := keeper.AddDeposit(ctx, proposal.ProposalID, msg.GetProposer(), msg.GetInitialDeposit())
votingStarted, err := keeper.AddDeposit(ctx, proposal.ProposalId, msg.GetProposer(), msg.GetInitialDeposit())
if err != nil {
return nil, err
}
@ -58,20 +58,20 @@ func handleMsgSubmitProposal(ctx sdk.Context, keeper keeper.Keeper, msg types.Ms
submitEvent := sdk.NewEvent(types.EventTypeSubmitProposal, sdk.NewAttribute(types.AttributeKeyProposalType, msg.GetContent().ProposalType()))
if votingStarted {
submitEvent = submitEvent.AppendAttributes(
sdk.NewAttribute(types.AttributeKeyVotingPeriodStart, fmt.Sprintf("%d", proposal.ProposalID)),
sdk.NewAttribute(types.AttributeKeyVotingPeriodStart, fmt.Sprintf("%d", proposal.ProposalId)),
)
}
ctx.EventManager().EmitEvent(submitEvent)
return &sdk.Result{
Data: types.GetProposalIDBytes(proposal.ProposalID),
Data: types.GetProposalIDBytes(proposal.ProposalId),
Events: ctx.EventManager().ABCIEvents(),
}, nil
}
func handleMsgDeposit(ctx sdk.Context, keeper keeper.Keeper, msg *types.MsgDeposit) (*sdk.Result, error) {
votingStarted, err := keeper.AddDeposit(ctx, msg.ProposalID, msg.Depositor, msg.Amount)
votingStarted, err := keeper.AddDeposit(ctx, msg.ProposalId, msg.Depositor, msg.Amount)
if err != nil {
return nil, err
}
@ -80,7 +80,7 @@ func handleMsgDeposit(ctx sdk.Context, keeper keeper.Keeper, msg *types.MsgDepos
[]string{types.ModuleName, "deposit"},
1,
[]metrics.Label{
telemetry.NewLabel("proposal_id", strconv.Itoa(int(msg.ProposalID))),
telemetry.NewLabel("proposal_id", strconv.Itoa(int(msg.ProposalId))),
},
)
@ -96,7 +96,7 @@ func handleMsgDeposit(ctx sdk.Context, keeper keeper.Keeper, msg *types.MsgDepos
ctx.EventManager().EmitEvent(
sdk.NewEvent(
types.EventTypeProposalDeposit,
sdk.NewAttribute(types.AttributeKeyVotingPeriodStart, fmt.Sprintf("%d", msg.ProposalID)),
sdk.NewAttribute(types.AttributeKeyVotingPeriodStart, fmt.Sprintf("%d", msg.ProposalId)),
),
)
}
@ -105,7 +105,7 @@ func handleMsgDeposit(ctx sdk.Context, keeper keeper.Keeper, msg *types.MsgDepos
}
func handleMsgVote(ctx sdk.Context, keeper keeper.Keeper, msg *types.MsgVote) (*sdk.Result, error) {
err := keeper.AddVote(ctx, msg.ProposalID, msg.Voter, msg.Option)
err := keeper.AddVote(ctx, msg.ProposalId, msg.Voter, msg.Option)
if err != nil {
return nil, err
}
@ -114,7 +114,7 @@ func handleMsgVote(ctx sdk.Context, keeper keeper.Keeper, msg *types.MsgVote) (*
[]string{types.ModuleName, "vote"},
1,
[]metrics.Label{
telemetry.NewLabel("proposal_id", strconv.Itoa(int(msg.ProposalID))),
telemetry.NewLabel("proposal_id", strconv.Itoa(int(msg.ProposalId))),
},
)

2
x/gov/keeper/deposit.go
View File

@ -25,7 +25,7 @@ func (keeper Keeper) GetDeposit(ctx sdk.Context, proposalID uint64, depositorAdd
func (keeper Keeper) SetDeposit(ctx sdk.Context, deposit types.Deposit) {
store := ctx.KVStore(keeper.storeKey)
bz := keeper.cdc.MustMarshalBinaryBare(&deposit)
store.Set(types.DepositKey(deposit.ProposalID, deposit.Depositor), bz)
store.Set(types.DepositKey(deposit.ProposalId, deposit.Depositor), bz)
}
// GetAllDeposits returns all the deposits from the store

2
x/gov/keeper/deposit_test.go
View File

@ -20,7 +20,7 @@ func TestDeposits(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
fourStake := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(4)))
fiveStake := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(5)))

4
x/gov/keeper/grpc_query.go
View File

@ -57,12 +57,12 @@ func (q Keeper) Proposals(c context.Context, req *types.QueryProposalsRequest) (
// match voter address (if supplied)
if len(req.Voter) > 0 {
_, matchVoter = q.GetVote(ctx, p.ProposalID, req.Voter)
_, matchVoter = q.GetVote(ctx, p.ProposalId, req.Voter)
}
// match depositor (if supplied)
if len(req.Depositor) > 0 {
_, matchDepositor = q.GetDeposit(ctx, p.ProposalID, req.Depositor)
_, matchDepositor = q.GetDeposit(ctx, p.ProposalId, req.Depositor)
}
if matchVoter && matchDepositor && matchStatus {

54
x/gov/keeper/grpc_query_test.go
View File

@ -165,7 +165,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryProposals() {
"request with filter of deposit address",
func() {
depositCoins := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(20)))
deposit := types.NewDeposit(testProposals[0].ProposalID, addrs[0], depositCoins)
deposit := types.NewDeposit(testProposals[0].ProposalId, addrs[0], depositCoins)
app.GovKeeper.SetDeposit(ctx, deposit)
req = &types.QueryProposalsRequest{
@ -183,7 +183,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryProposals() {
func() {
testProposals[1].Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, testProposals[1])
suite.Require().NoError(app.GovKeeper.AddVote(ctx, testProposals[1].ProposalID, addrs[0], types.OptionAbstain))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, testProposals[1].ProposalId, addrs[0], types.OptionAbstain))
req = &types.QueryProposalsRequest{
Voter: addrs[0],
@ -278,7 +278,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryVote() {
suite.Require().NoError(err)
req = &types.QueryVoteRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
Voter: addrs[0],
}
@ -291,14 +291,14 @@ func (suite *KeeperTestSuite) TestGRPCQueryVote() {
func() {
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalID, addrs[0], types.OptionAbstain))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalId, addrs[0], types.OptionAbstain))
req = &types.QueryVoteRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
Voter: addrs[0],
}
expRes = &types.QueryVoteResponse{Vote: types.NewVote(proposal.ProposalID, addrs[0], types.OptionAbstain)}
expRes = &types.QueryVoteResponse{Vote: types.NewVote(proposal.ProposalId, addrs[0], types.OptionAbstain)}
},
true,
},
@ -306,7 +306,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryVote() {
"wrong voter id request",
func() {
req = &types.QueryVoteRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
Voter: addrs[1],
}
@ -383,7 +383,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryVotes() {
suite.Require().NoError(err)
req = &types.QueryVotesRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
}
},
true,
@ -395,15 +395,15 @@ func (suite *KeeperTestSuite) TestGRPCQueryVotes() {
app.GovKeeper.SetProposal(ctx, proposal)
votes = []types.Vote{
{proposal.ProposalID, addrs[0], types.OptionAbstain},
{proposal.ProposalID, addrs[1], types.OptionYes},
{proposal.ProposalId, addrs[0], types.OptionAbstain},
{proposal.ProposalId, addrs[1], types.OptionYes},
}
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalID, votes[0].Voter, votes[0].Option))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalID, votes[1].Voter, votes[1].Option))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalId, votes[0].Voter, votes[0].Option))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalId, votes[1].Voter, votes[1].Option))
req = &types.QueryVotesRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
}
expRes = &types.QueryVotesResponse{
@ -572,7 +572,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDeposit() {
suite.Require().NotNil(proposal)
req = &types.QueryDepositRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
Depositor: addrs[0],
}
},
@ -582,11 +582,11 @@ func (suite *KeeperTestSuite) TestGRPCQueryDeposit() {
"valid request",
func() {
depositCoins := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(20)))
deposit := types.NewDeposit(proposal.ProposalID, addrs[0], depositCoins)
deposit := types.NewDeposit(proposal.ProposalId, addrs[0], depositCoins)
app.GovKeeper.SetDeposit(ctx, deposit)
req = &types.QueryDepositRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
Depositor: addrs[0],
}
@ -660,7 +660,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDeposits() {
suite.Require().NoError(err)
req = &types.QueryDepositsRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
}
},
true,
@ -669,17 +669,17 @@ func (suite *KeeperTestSuite) TestGRPCQueryDeposits() {
"get deposits with default limit",
func() {
depositAmount1 := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(20)))
deposit1 := types.NewDeposit(proposal.ProposalID, addrs[0], depositAmount1)
deposit1 := types.NewDeposit(proposal.ProposalId, addrs[0], depositAmount1)
app.GovKeeper.SetDeposit(ctx, deposit1)
depositAmount2 := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.TokensFromConsensusPower(30)))
deposit2 := types.NewDeposit(proposal.ProposalID, addrs[1], depositAmount2)
deposit2 := types.NewDeposit(proposal.ProposalId, addrs[1], depositAmount2)
app.GovKeeper.SetDeposit(ctx, deposit2)
deposits := types.Deposits{deposit1, deposit2}
req = &types.QueryDepositsRequest{
ProposalId: proposal.ProposalID,
ProposalId: proposal.ProposalId,
}
expRes = &types.QueryDepositsResponse{
@ -752,7 +752,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryTally() {
suite.Require().NoError(err)
suite.Require().NotNil(proposal)
req = &types.QueryTallyResultRequest{ProposalId: proposal.ProposalID}
req = &types.QueryTallyResultRequest{ProposalId: proposal.ProposalId}
expRes = &types.QueryTallyResultResponse{
Tally: types.EmptyTallyResult(),
@ -766,11 +766,11 @@ func (suite *KeeperTestSuite) TestGRPCQueryTally() {
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalID, addrs[0], types.OptionYes))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalID, addrs[1], types.OptionYes))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalID, addrs[2], types.OptionYes))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalId, addrs[0], types.OptionYes))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalId, addrs[1], types.OptionYes))
suite.Require().NoError(app.GovKeeper.AddVote(ctx, proposal.ProposalId, addrs[2], types.OptionYes))
req = &types.QueryTallyResultRequest{ProposalId: proposal.ProposalID}
req = &types.QueryTallyResultRequest{ProposalId: proposal.ProposalId}
expRes = &types.QueryTallyResultResponse{
Tally: types.TallyResult{
@ -785,9 +785,9 @@ func (suite *KeeperTestSuite) TestGRPCQueryTally() {
func() {
proposal.Status = types.StatusPassed
app.GovKeeper.SetProposal(ctx, proposal)
proposal, _ = app.GovKeeper.GetProposal(ctx, proposal.ProposalID)
proposal, _ = app.GovKeeper.GetProposal(ctx, proposal.ProposalId)
req = &types.QueryTallyResultRequest{ProposalId: proposal.ProposalID}
req = &types.QueryTallyResultRequest{ProposalId: proposal.ProposalId}
expRes = &types.QueryTallyResultResponse{
Tally: proposal.FinalTallyResult,

8
x/gov/keeper/keeper_test.go
View File

@ -54,7 +54,7 @@ func TestIncrementProposalNumber(t *testing.T) {
proposal6, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
require.Equal(t, uint64(6), proposal6.ProposalID)
require.Equal(t, uint64(6), proposal6.ProposalId)
}
func TestProposalQueues(t *testing.T) {
@ -70,19 +70,19 @@ func TestProposalQueues(t *testing.T) {
require.True(t, inactiveIterator.Valid())
proposalID := types.GetProposalIDFromBytes(inactiveIterator.Value())
require.Equal(t, proposalID, proposal.ProposalID)
require.Equal(t, proposalID, proposal.ProposalId)
inactiveIterator.Close()
app.GovKeeper.ActivateVotingPeriod(ctx, proposal)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposal.ProposalID)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposal.ProposalId)
require.True(t, ok)
activeIterator := app.GovKeeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime)
require.True(t, activeIterator.Valid())
proposalID, _ = types.SplitActiveProposalQueueKey(activeIterator.Key())
require.Equal(t, proposalID, proposal.ProposalID)
require.Equal(t, proposalID, proposal.ProposalId)
activeIterator.Close()
}

10
x/gov/keeper/proposal.go
View File

@ -72,7 +72,7 @@ func (keeper Keeper) SetProposal(ctx sdk.Context, proposal types.Proposal) {
bz := keeper.MustMarshalProposal(proposal)
store.Set(types.ProposalKey(proposal.ProposalID), bz)
store.Set(types.ProposalKey(proposal.ProposalId), bz)
}
// DeleteProposal deletes a proposal from store
@ -139,12 +139,12 @@ func (keeper Keeper) GetProposalsFiltered(ctx sdk.Context, params types.QueryPro
// match voter address (if supplied)
if len(params.Voter) > 0 {
_, matchVoter = keeper.GetVote(ctx, p.ProposalID, params.Voter)
_, matchVoter = keeper.GetVote(ctx, p.ProposalId, params.Voter)
}
// match depositor (if supplied)
if len(params.Depositor) > 0 {
_, matchDepositor = keeper.GetDeposit(ctx, p.ProposalID, params.Depositor)
_, matchDepositor = keeper.GetDeposit(ctx, p.ProposalId, params.Depositor)
}
if matchVoter && matchDepositor && matchStatus {
@ -187,8 +187,8 @@ func (keeper Keeper) ActivateVotingPeriod(ctx sdk.Context, proposal types.Propos
proposal.Status = types.StatusVotingPeriod
keeper.SetProposal(ctx, proposal)
keeper.RemoveFromInactiveProposalQueue(ctx, proposal.ProposalID, proposal.DepositEndTime)
keeper.InsertActiveProposalQueue(ctx, proposal.ProposalID, proposal.VotingEndTime)
keeper.RemoveFromInactiveProposalQueue(ctx, proposal.ProposalId, proposal.DepositEndTime)
keeper.InsertActiveProposalQueue(ctx, proposal.ProposalId, proposal.VotingEndTime)
}
func (keeper Keeper) MarshalProposal(proposal types.Proposal) ([]byte, error) {

6
x/gov/keeper/proposal_test.go
View File

@ -22,7 +22,7 @@ func TestGetSetProposal(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
app.GovKeeper.SetProposal(ctx, proposal)
gotProposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
@ -44,14 +44,14 @@ func TestActivateVotingPeriod(t *testing.T) {
require.True(t, proposal.VotingStartTime.Equal(ctx.BlockHeader().Time))
proposal, ok := app.GovKeeper.GetProposal(ctx, proposal.ProposalID)
proposal, ok := app.GovKeeper.GetProposal(ctx, proposal.ProposalId)
require.True(t, ok)
activeIterator := app.GovKeeper.ActiveProposalQueueIterator(ctx, proposal.VotingEndTime)
require.True(t, activeIterator.Valid())
proposalID := types.GetProposalIDFromBytes(activeIterator.Value())
require.Equal(t, proposalID, proposal.ProposalID)
require.Equal(t, proposalID, proposal.ProposalId)
activeIterator.Close()
}

60
x/gov/keeper/querier_test.go
View File

@ -162,16 +162,16 @@ func TestQueries(t *testing.T) {
// TestAddrs[0] proposes (and deposits) proposals #1 and #2
proposal1, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
deposit1 := types.NewDeposit(proposal1.ProposalID, TestAddrs[0], oneCoins)
_, err = app.GovKeeper.AddDeposit(ctx, deposit1.ProposalID, deposit1.Depositor, deposit1.Amount)
deposit1 := types.NewDeposit(proposal1.ProposalId, TestAddrs[0], oneCoins)
_, err = app.GovKeeper.AddDeposit(ctx, deposit1.ProposalId, deposit1.Depositor, deposit1.Amount)
require.NoError(t, err)
proposal1.TotalDeposit = proposal1.TotalDeposit.Add(deposit1.Amount...)
proposal2, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
deposit2 := types.NewDeposit(proposal2.ProposalID, TestAddrs[0], consCoins)
_, err = app.GovKeeper.AddDeposit(ctx, deposit2.ProposalID, deposit2.Depositor, deposit2.Amount)
deposit2 := types.NewDeposit(proposal2.ProposalId, TestAddrs[0], consCoins)
_, err = app.GovKeeper.AddDeposit(ctx, deposit2.ProposalId, deposit2.Depositor, deposit2.Amount)
require.NoError(t, err)
proposal2.TotalDeposit = proposal2.TotalDeposit.Add(deposit2.Amount...)
@ -179,23 +179,23 @@ func TestQueries(t *testing.T) {
// TestAddrs[1] proposes (and deposits) on proposal #3
proposal3, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
deposit3 := types.NewDeposit(proposal3.ProposalID, TestAddrs[1], oneCoins)
_, err = app.GovKeeper.AddDeposit(ctx, deposit3.ProposalID, deposit3.Depositor, deposit3.Amount)
deposit3 := types.NewDeposit(proposal3.ProposalId, TestAddrs[1], oneCoins)
_, err = app.GovKeeper.AddDeposit(ctx, deposit3.ProposalId, deposit3.Depositor, deposit3.Amount)
require.NoError(t, err)
proposal3.TotalDeposit = proposal3.TotalDeposit.Add(deposit3.Amount...)
// TestAddrs[1] deposits on proposals #2 & #3
deposit4 := types.NewDeposit(proposal2.ProposalID, TestAddrs[1], depositParams.MinDeposit)
_, err = app.GovKeeper.AddDeposit(ctx, deposit4.ProposalID, deposit4.Depositor, deposit4.Amount)
deposit4 := types.NewDeposit(proposal2.ProposalId, TestAddrs[1], depositParams.MinDeposit)
_, err = app.GovKeeper.AddDeposit(ctx, deposit4.ProposalId, deposit4.Depositor, deposit4.Amount)
require.NoError(t, err)
proposal2.TotalDeposit = proposal2.TotalDeposit.Add(deposit4.Amount...)
proposal2.Status = types.StatusVotingPeriod
proposal2.VotingEndTime = proposal2.VotingEndTime.Add(types.DefaultPeriod)
deposit5 := types.NewDeposit(proposal3.ProposalID, TestAddrs[1], depositParams.MinDeposit)
_, err = app.GovKeeper.AddDeposit(ctx, deposit5.ProposalID, deposit5.Depositor, deposit5.Amount)
deposit5 := types.NewDeposit(proposal3.ProposalId, TestAddrs[1], depositParams.MinDeposit)
_, err = app.GovKeeper.AddDeposit(ctx, deposit5.ProposalId, deposit5.Depositor, deposit5.Amount)
require.NoError(t, err)
proposal3.TotalDeposit = proposal3.TotalDeposit.Add(deposit5.Amount...)
@ -205,26 +205,26 @@ func TestQueries(t *testing.T) {
deposit5.Amount = deposit5.Amount.Add(deposit3.Amount...)
// check deposits on proposal1 match individual deposits
deposits := getQueriedDeposits(t, ctx, appCodec, querier, proposal1.ProposalID)
deposits := getQueriedDeposits(t, ctx, appCodec, querier, proposal1.ProposalId)
require.Len(t, deposits, 1)
require.Equal(t, deposit1, deposits[0])
deposit := getQueriedDeposit(t, ctx, appCodec, querier, proposal1.ProposalID, TestAddrs[0])
deposit := getQueriedDeposit(t, ctx, appCodec, querier, proposal1.ProposalId, TestAddrs[0])
require.Equal(t, deposit1, deposit)
// check deposits on proposal2 match individual deposits
deposits = getQueriedDeposits(t, ctx, appCodec, querier, proposal2.ProposalID)
deposits = getQueriedDeposits(t, ctx, appCodec, querier, proposal2.ProposalId)
require.Len(t, deposits, 2)
// NOTE order of deposits is determined by the addresses
require.Equal(t, deposit2, deposits[0])
require.Equal(t, deposit4, deposits[1])
// check deposits on proposal3 match individual deposits
deposits = getQueriedDeposits(t, ctx, appCodec, querier, proposal3.ProposalID)
deposits = getQueriedDeposits(t, ctx, appCodec, querier, proposal3.ProposalId)
require.Len(t, deposits, 1)
require.Equal(t, deposit5, deposits[0])
deposit = getQueriedDeposit(t, ctx, appCodec, querier, proposal3.ProposalID, TestAddrs[1])
deposit = getQueriedDeposit(t, ctx, appCodec, querier, proposal3.ProposalId, TestAddrs[1])
require.Equal(t, deposit5, deposit)
// Only proposal #1 should be in types.Deposit Period
@ -239,13 +239,13 @@ func TestQueries(t *testing.T) {
require.Equal(t, proposal3, proposals[1])
// Addrs[0] votes on proposals #2 & #3
vote1 := types.NewVote(proposal2.ProposalID, TestAddrs[0], types.OptionYes)
vote2 := types.NewVote(proposal3.ProposalID, TestAddrs[0], types.OptionYes)
vote1 := types.NewVote(proposal2.ProposalId, TestAddrs[0], types.OptionYes)
vote2 := types.NewVote(proposal3.ProposalId, TestAddrs[0], types.OptionYes)
app.GovKeeper.SetVote(ctx, vote1)
app.GovKeeper.SetVote(ctx, vote2)
// Addrs[1] votes on proposal #3
vote3 := types.NewVote(proposal3.ProposalID, TestAddrs[1], types.OptionYes)
vote3 := types.NewVote(proposal3.ProposalId, TestAddrs[1], types.OptionYes)
app.GovKeeper.SetVote(ctx, vote3)
// Test query voted by TestAddrs[0]
@ -254,15 +254,15 @@ func TestQueries(t *testing.T) {
require.Equal(t, proposal3, proposals[1])
// Test query votes on types.Proposal 2
votes := getQueriedVotes(t, ctx, appCodec, querier, proposal2.ProposalID, 1, 0)
votes := getQueriedVotes(t, ctx, appCodec, querier, proposal2.ProposalId, 1, 0)
require.Len(t, votes, 1)
require.Equal(t, vote1, votes[0])
vote := getQueriedVote(t, ctx, appCodec, querier, proposal2.ProposalID, TestAddrs[0])
vote := getQueriedVote(t, ctx, appCodec, querier, proposal2.ProposalId, TestAddrs[0])
require.Equal(t, vote1, vote)
// Test query votes on types.Proposal 3
votes = getQueriedVotes(t, ctx, appCodec, querier, proposal3.ProposalID, 1, 0)
votes = getQueriedVotes(t, ctx, appCodec, querier, proposal3.ProposalId, 1, 0)
require.Len(t, votes, 2)
require.Equal(t, vote2, votes[0])
require.Equal(t, vote3, votes[1])
@ -275,20 +275,20 @@ func TestQueries(t *testing.T) {
// Test query voted by TestAddrs[1]
proposals = getQueriedProposals(t, ctx, appCodec, querier, nil, TestAddrs[1], types.StatusNil, 1, 0)
require.Equal(t, proposal3.ProposalID, proposals[0].ProposalID)
require.Equal(t, proposal3.ProposalId, proposals[0].ProposalId)
// Test query deposited by TestAddrs[0]
proposals = getQueriedProposals(t, ctx, appCodec, querier, TestAddrs[0], nil, types.StatusNil, 1, 0)
require.Equal(t, proposal1.ProposalID, proposals[0].ProposalID)
require.Equal(t, proposal1.ProposalId, proposals[0].ProposalId)
// Test query deposited by addr2
proposals = getQueriedProposals(t, ctx, appCodec, querier, TestAddrs[1], nil, types.StatusNil, 1, 0)
require.Equal(t, proposal2.ProposalID, proposals[0].ProposalID)
require.Equal(t, proposal3.ProposalID, proposals[1].ProposalID)
require.Equal(t, proposal2.ProposalId, proposals[0].ProposalId)
require.Equal(t, proposal3.ProposalId, proposals[1].ProposalId)
// Test query voted AND deposited by addr1
proposals = getQueriedProposals(t, ctx, appCodec, querier, TestAddrs[0], TestAddrs[0], types.StatusNil, 1, 0)
require.Equal(t, proposal2.ProposalID, proposals[0].ProposalID)
require.Equal(t, proposal2.ProposalId, proposals[0].ProposalId)
}
func TestPaginatedVotesQuery(t *testing.T) {
@ -297,7 +297,7 @@ func TestPaginatedVotesQuery(t *testing.T) {
legacyQuerierCdc := app.LegacyAmino()
proposal := types.Proposal{
ProposalID: 100,
ProposalId: 100,
Status: types.StatusVotingPeriod,
}
@ -309,7 +309,7 @@ func TestPaginatedVotesQuery(t *testing.T) {
for i := range votes {
rand.Read(addr)
vote := types.Vote{
ProposalID: proposal.ProposalID,
ProposalId: proposal.ProposalId,
Voter: addr,
Option: types.OptionYes,
}
@ -320,7 +320,7 @@ func TestPaginatedVotesQuery(t *testing.T) {
querier := keeper.NewQuerier(app.GovKeeper, legacyQuerierCdc)
// keeper preserves consistent order for each query, but this is not the insertion order
all := getQueriedVotes(t, ctx, legacyQuerierCdc, querier, proposal.ProposalID, 1, 0)
all := getQueriedVotes(t, ctx, legacyQuerierCdc, querier, proposal.ProposalId, 1, 0)
require.Equal(t, len(all), len(votes))
type testCase struct {
@ -354,7 +354,7 @@ func TestPaginatedVotesQuery(t *testing.T) {
} {
tc := tc
t.Run(tc.description, func(t *testing.T) {
votes := getQueriedVotes(t, ctx, legacyQuerierCdc, querier, proposal.ProposalID, tc.page, tc.limit)
votes := getQueriedVotes(t, ctx, legacyQuerierCdc, querier, proposal.ProposalId, tc.page, tc.limit)
require.Equal(t, len(tc.votes), len(votes))
for i := range votes {
require.Equal(t, tc.votes[i], votes[i])

4
x/gov/keeper/tally.go
View File

@ -33,7 +33,7 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
return false
})
keeper.IterateVotes(ctx, proposal.ProposalID, func(vote types.Vote) bool {
keeper.IterateVotes(ctx, proposal.ProposalId, func(vote types.Vote) bool {
// if validator, just record it in the map
valAddrStr := sdk.ValAddress(vote.Voter).String()
if val, ok := currValidators[valAddrStr]; ok {
@ -61,7 +61,7 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
return false
})
keeper.deleteVote(ctx, vote.ProposalID, vote.Voter)
keeper.deleteVote(ctx, vote.ProposalId, vote.Voter)
return false
})

30
x/gov/keeper/tally_test.go
View File

@ -21,7 +21,7 @@ func TestTallyNoOneVotes(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -45,7 +45,7 @@ func TestTallyNoQuorum(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -68,7 +68,7 @@ func TestTallyOnlyValidatorsAllYes(t *testing.T) {
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -94,7 +94,7 @@ func TestTallyOnlyValidators51No(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -118,7 +118,7 @@ func TestTallyOnlyValidators51Yes(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -143,7 +143,7 @@ func TestTallyOnlyValidatorsVetoed(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -169,7 +169,7 @@ func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -195,7 +195,7 @@ func TestTallyOnlyValidatorsAbstainFails(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -222,7 +222,7 @@ func TestTallyOnlyValidatorsNonVoter(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -256,7 +256,7 @@ func TestTallyDelgatorOverride(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -292,7 +292,7 @@ func TestTallyDelgatorInherit(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -331,7 +331,7 @@ func TestTallyDelgatorMultipleOverride(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -373,7 +373,7 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -414,7 +414,7 @@ func TestTallyJailedValidator(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)
@ -447,7 +447,7 @@ func TestTallyValidatorMultipleDelegations(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
proposal.Status = types.StatusVotingPeriod
app.GovKeeper.SetProposal(ctx, proposal)

2
x/gov/keeper/vote.go
View File

@ -70,7 +70,7 @@ func (keeper Keeper) GetVote(ctx sdk.Context, proposalID uint64, voterAddr sdk.A
func (keeper Keeper) SetVote(ctx sdk.Context, vote types.Vote) {
store := ctx.KVStore(keeper.storeKey)
bz := keeper.cdc.MustMarshalBinaryBare(&vote)
store.Set(types.VoteKey(vote.ProposalID, vote.Voter), bz)
store.Set(types.VoteKey(vote.ProposalId, vote.Voter), bz)
}
// IterateAllVotes iterates over the all the stored votes and performs a callback function

12
x/gov/keeper/vote_test.go
View File

@ -20,7 +20,7 @@ func TestVotes(t *testing.T) {
tp := TestProposal
proposal, err := app.GovKeeper.SubmitProposal(ctx, tp)
require.NoError(t, err)
proposalID := proposal.ProposalID
proposalID := proposal.ProposalId
var invalidOption types.VoteOption = 0x10
@ -37,7 +37,7 @@ func TestVotes(t *testing.T) {
vote, found := app.GovKeeper.GetVote(ctx, proposalID, addrs[0])
require.True(t, found)
require.Equal(t, addrs[0], vote.Voter)
require.Equal(t, proposalID, vote.ProposalID)
require.Equal(t, proposalID, vote.ProposalId)
require.Equal(t, types.OptionAbstain, vote.Option)
// Test change of vote
@ -45,7 +45,7 @@ func TestVotes(t *testing.T) {
vote, found = app.GovKeeper.GetVote(ctx, proposalID, addrs[0])
require.True(t, found)
require.Equal(t, addrs[0], vote.Voter)
require.Equal(t, proposalID, vote.ProposalID)
require.Equal(t, proposalID, vote.ProposalId)
require.Equal(t, types.OptionYes, vote.Option)
// Test second vote
@ -53,7 +53,7 @@ func TestVotes(t *testing.T) {
vote, found = app.GovKeeper.GetVote(ctx, proposalID, addrs[1])
require.True(t, found)
require.Equal(t, addrs[1], vote.Voter)
require.Equal(t, proposalID, vote.ProposalID)
require.Equal(t, proposalID, vote.ProposalId)
require.Equal(t, types.OptionNoWithVeto, vote.Option)
// Test vote iterator
@ -62,9 +62,9 @@ func TestVotes(t *testing.T) {
require.Len(t, votes, 2)
require.Equal(t, votes, app.GovKeeper.GetVotes(ctx, proposalID))
require.Equal(t, addrs[0], votes[0].Voter)
require.Equal(t, proposalID, votes[0].ProposalID)
require.Equal(t, proposalID, votes[0].ProposalId)
require.Equal(t, types.OptionYes, votes[0].Option)
require.Equal(t, addrs[1], votes[1].Voter)
require.Equal(t, proposalID, votes[1].ProposalID)
require.Equal(t, proposalID, votes[1].ProposalId)
require.Equal(t, types.OptionNoWithVeto, votes[1].Option)
}

2
x/gov/simulation/genesis_test.go
View File

@ -47,7 +47,7 @@ func TestRandomizedGenState(t *testing.T) {
require.Equal(t, dec1, govGenesis.TallyParams.Quorum)
require.Equal(t, dec2, govGenesis.TallyParams.Threshold)
require.Equal(t, dec3, govGenesis.TallyParams.Veto)
require.Equal(t, uint64(0x28), govGenesis.StartingProposalID)
require.Equal(t, uint64(0x28), govGenesis.StartingProposalId)
require.Equal(t, types.Deposits(nil), govGenesis.Deposits)
require.Equal(t, types.Votes(nil), govGenesis.Votes)
require.Equal(t, types.Proposals(nil), govGenesis.Proposals)

4
x/gov/simulation/operations_test.go
View File

@ -158,7 +158,7 @@ func TestSimulateMsgDeposit(t *testing.T) {
types.ModuleCdc.UnmarshalJSON(operationMsg.Msg, &msg)
require.True(t, operationMsg.OK)
require.Equal(t, uint64(1), msg.ProposalID)
require.Equal(t, uint64(1), msg.ProposalId)
require.Equal(t, "cosmos1ghekyjucln7y67ntx7cf27m9dpuxxemn4c8g4r", msg.Depositor.String())
require.Equal(t, "560969stake", msg.Amount.String())
require.Equal(t, "gov", msg.Route())
@ -200,7 +200,7 @@ func TestSimulateMsgVote(t *testing.T) {
types.ModuleCdc.UnmarshalJSON(operationMsg.Msg, &msg)
require.True(t, operationMsg.OK)
require.Equal(t, uint64(1), msg.ProposalID)
require.Equal(t, uint64(1), msg.ProposalId)
require.Equal(t, "cosmos1ghekyjucln7y67ntx7cf27m9dpuxxemn4c8g4r", msg.Voter.String())
require.Equal(t, types.OptionYes, msg.Option)
require.Equal(t, "gov", msg.Route())

2
x/gov/types/deposit.go
View File

@ -40,7 +40,7 @@ func (d Deposits) String() string {
if len(d) == 0 {
return "[]"
}
out := fmt.Sprintf("Deposits for Proposal %d:", d[0].ProposalID)
out := fmt.Sprintf("Deposits for Proposal %d:", d[0].ProposalId)
for _, dep := range d {
out += fmt.Sprintf("\n %s: %s", dep.Depositor, dep.Amount)
}

4
x/gov/types/genesis.go
View File

@ -10,7 +10,7 @@ import (
// NewGenesisState creates a new genesis state for the governance module
func NewGenesisState(startingProposalID uint64, dp DepositParams, vp VotingParams, tp TallyParams) *GenesisState {
return &GenesisState{
StartingProposalID: startingProposalID,
StartingProposalId: startingProposalID,
DepositParams: dp,
VotingParams: vp,
TallyParams: tp,
@ -28,7 +28,7 @@ func DefaultGenesisState() *GenesisState {
}
func (data GenesisState) Equal(other GenesisState) bool {
return data.StartingProposalID == other.StartingProposalID &&
return data.StartingProposalId == other.StartingProposalId &&
data.Deposits.Equal(other.Deposits) &&
data.Votes.Equal(other.Votes) &&
data.Proposals.Equal(other.Proposals) &&

77
x/gov/types/genesis.pb.go
View File

@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// GenesisState defines the gov module's genesis state.
type GenesisState struct {
// starting_proposal_id is the ID of the starting proposal.
StartingProposalID uint64 `protobuf:"varint,1,opt,name=starting_proposal_id,json=startingProposalId,proto3" json:"starting_proposal_id,omitempty" yaml:"starting_proposal_id"`
StartingProposalId uint64 `protobuf:"varint,1,opt,name=starting_proposal_id,json=startingProposalId,proto3" json:"starting_proposal_id,omitempty" yaml:"starting_proposal_id"`
// deposits defines all the deposits present at genesis.
Deposits Deposits `protobuf:"bytes,2,rep,name=deposits,proto3,castrepeated=Deposits" json:"deposits"`
// votes defines all the votes present at genesis.
@ -74,9 +74,9 @@ func (m *GenesisState) XXX_DiscardUnknown() {
var xxx_messageInfo_GenesisState proto.InternalMessageInfo
func (m *GenesisState) GetStartingProposalID() uint64 {
func (m *GenesisState) GetStartingProposalId() uint64 {
if m != nil {
return m.StartingProposalID
return m.StartingProposalId
}
return 0
}
@ -130,35 +130,34 @@ func init() {
func init() { proto.RegisterFile("cosmos/gov/v1beta1/genesis.proto", fileDescriptor_43cd825e0fa7a627) }
var fileDescriptor_43cd825e0fa7a627 = []byte{
// 439 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x6e, 0xd3, 0x40,
0x10, 0x86, 0x63, 0x9a, 0x94, 0x76, 0x93, 0x20, 0x58, 0x82, 0x64, 0x35, 0xc1, 0x36, 0x3e, 0xe5,
0x82, 0xad, 0x16, 0x71, 0x41, 0xe2, 0x62, 0x55, 0x42, 0x3d, 0x20, 0x55, 0x2e, 0xe2, 0xc0, 0x25,
0xda, 0xc4, 0xab, 0xc5, 0x22, 0xe9, 0x58, 0x9e, 0xc5, 0x22, 0x6f, 0xc1, 0x73, 0xf0, 0x24, 0x3d,
0xf6, 0xc8, 0xc9, 0x20, 0xe7, 0x0d, 0xfa, 0x02, 0x20, 0xef, 0xae, 0xc1, 0x05, 0xc3, 0x29, 0xf1,
0xce, 0x3f, 0xdf, 0xb7, 0x3b, 0x1a, 0xe2, 0xad, 0x00, 0x37, 0x80, 0xa1, 0x80, 0x22, 0x2c, 0x8e,
0x97, 0x5c, 0xb2, 0xe3, 0x50, 0xf0, 0x4b, 0x8e, 0x29, 0x06, 0x59, 0x0e, 0x12, 0x28, 0xd5, 0x89,
0x40, 0x40, 0x11, 0x98, 0xc4, 0xd1, 0x44, 0x80, 0x00, 0x55, 0x0e, 0xeb, 0x7f, 0x3a, 0x79, 0x34,
0xeb, 0x62, 0x41, 0xa1, 0xab, 0xfe, 0x8f, 0x3e, 0x19, 0xbd, 0xd2, 0xe4, 0x0b, 0xc9, 0x24, 0xa7,
0x82, 0x4c, 0x50, 0xb2, 0x5c, 0xa6, 0x97, 0x62, 0x91, 0xe5, 0x90, 0x01, 0xb2, 0xf5, 0x22, 0x4d,
0x6c, 0xcb, 0xb3, 0xe6, 0xfd, 0xe8, 0x79, 0x55, 0xba, 0xf4, 0xc2, 0xd4, 0xcf, 0x4d, 0xf9, 0xec,
0xf4, 0xa6, 0x74, 0xa7, 0x5b, 0xb6, 0x59, 0xbf, 0xf0, 0xbb, 0x7a, 0xfd, 0x98, 0xe2, 0x9f, 0x2d,
0x09, 0x3d, 0x23, 0x07, 0x09, 0xcf, 0x00, 0x53, 0x89, 0xf6, 0x1d, 0x6f, 0x6f, 0x3e, 0x3c, 0x99,
0x06, 0x7f, 0x3f, 0x2a, 0x38, 0xd5, 0x99, 0xe8, 0xfe, 0x55, 0xe9, 0xf6, 0xbe, 0x7c, 0x73, 0x0f,
0xcc, 0x01, 0xc6, 0xbf, 0xda, 0xe9, 0x4b, 0x32, 0x28, 0x40, 0x72, 0xb4, 0xf7, 0x14, 0xc7, 0xee,
0xe2, 0xbc, 0x05, 0xc9, 0xa3, 0xb1, 0x81, 0x0c, 0xea, 0x2f, 0x8c, 0x75, 0x17, 0x7d, 0x4d, 0x0e,
0x9b, 0xdb, 0xa2, 0xdd, 0x57, 0x88, 0x59, 0x17, 0xa2, 0xb9, 0x7c, 0xf4, 0xc0, 0x60, 0x0e, 0x9b,
0x13, 0x8c, 0x7f, 0x13, 0xa8, 0x20, 0xf7, 0xcc, 0xcd, 0x16, 0x19, 0xcb, 0xd9, 0x06, 0xed, 0x81,
0x67, 0xcd, 0x87, 0x27, 0x4f, 0xfe, 0xf3, 0xbc, 0x73, 0x15, 0x8c, 0x1e, 0xd7, 0xe0, 0x9b, 0xd2,
0x7d, 0xa4, 0x87, 0x79, 0x1b, 0xe3, 0xc7, 0xe3, 0xa4, 0x9d, 0xa6, 0x2b, 0x32, 0x2e, 0x40, 0x0f,
0x5b, 0x7b, 0xf6, 0x95, 0xc7, 0xfb, 0xc7, 0xf3, 0xeb, 0xf1, 0x6b, 0xcd, 0xcc, 0x68, 0x26, 0x5a,
0x73, 0x0b, 0xe2, 0xc7, 0xa3, 0xa2, 0x95, 0xa5, 0x0b, 0x32, 0x92, 0x6c, 0xbd, 0xde, 0x36, 0x8e,
0xbb, 0xca, 0xe1, 0x76, 0x39, 0xde, 0xd4, 0x39, 0xa3, 0x98, 0x1a, 0xc5, 0x43, 0xad, 0x68, 0x23,
0xfc, 0x78, 0x28, 0x5b, 0xc9, 0xe8, 0xaa, 0x72, 0xac, 0xeb, 0xca, 0xb1, 0xbe, 0x57, 0x8e, 0xf5,
0x79, 0xe7, 0xf4, 0xae, 0x77, 0x4e, 0xef, 0xeb, 0xce, 0xe9, 0xbd, 0x9b, 0x8b, 0x54, 0xbe, 0xff,
0xb8, 0x0c, 0x56, 0xb0, 0x09, 0xcd, 0x12, 0xeb, 0x9f, 0xa7, 0x98, 0x7c, 0x08, 0x3f, 0xa9, 0x8d,
0x96, 0xdb, 0x8c, 0xe3, 0x72, 0x5f, 0x2d, 0xf3, 0xb3, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x23,
0x30, 0xcd, 0xfb, 0x38, 0x03, 0x00, 0x00,
// 430 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x31, 0x6f, 0xd3, 0x40,
0x14, 0xc7, 0x63, 0x9a, 0x94, 0xf6, 0x92, 0x20, 0x38, 0x82, 0x64, 0x35, 0xc1, 0x36, 0x9e, 0xb2,
0x60, 0xab, 0x65, 0x43, 0x62, 0xb1, 0x90, 0x50, 0x07, 0xa4, 0x62, 0x10, 0x03, 0x4b, 0x74, 0x89,
0x4f, 0x87, 0x85, 0xdd, 0x67, 0xf9, 0x1d, 0x16, 0xf9, 0x16, 0x7c, 0x0e, 0x3e, 0x49, 0xc7, 0x8e,
0x4c, 0x01, 0x25, 0x13, 0x6b, 0x3f, 0x01, 0xf2, 0xdd, 0x19, 0x1c, 0x61, 0x3a, 0x25, 0x7e, 0xf7,
0xbf, 0xdf, 0xef, 0xdd, 0xd3, 0x23, 0xde, 0x0a, 0x30, 0x07, 0x0c, 0x05, 0x54, 0x61, 0x75, 0xba,
0xe4, 0x92, 0x9d, 0x86, 0x82, 0x5f, 0x72, 0x4c, 0x31, 0x28, 0x4a, 0x90, 0x40, 0xa9, 0x4e, 0x04,
0x02, 0xaa, 0xc0, 0x24, 0x4e, 0x26, 0x02, 0x04, 0xa8, 0xe3, 0xb0, 0xfe, 0xa7, 0x93, 0x27, 0xb3,
0x2e, 0x16, 0x54, 0xfa, 0xd4, 0xff, 0xd5, 0x27, 0xa3, 0x57, 0x9a, 0xfc, 0x56, 0x32, 0xc9, 0xe9,
0x1b, 0x32, 0x41, 0xc9, 0x4a, 0x99, 0x5e, 0x8a, 0x45, 0x51, 0x42, 0x01, 0xc8, 0xb2, 0x45, 0x9a,
0xd8, 0x96, 0x67, 0xcd, 0xfb, 0x91, 0x7b, 0xb3, 0x71, 0xa7, 0x6b, 0x96, 0x67, 0xcf, 0xfd, 0xae,
0x94, 0x1f, 0xd3, 0xa6, 0x7c, 0x61, 0xaa, 0xe7, 0x09, 0x3d, 0x27, 0x47, 0x09, 0x2f, 0x00, 0x53,
0x89, 0xf6, 0x1d, 0xef, 0x60, 0x3e, 0x3c, 0x9b, 0x06, 0xff, 0xb6, 0x1f, 0xbc, 0xd4, 0x99, 0xe8,
0xfe, 0xd5, 0xc6, 0xed, 0x7d, 0xfb, 0xe1, 0x1e, 0x99, 0x02, 0xc6, 0x7f, 0xae, 0xd3, 0x17, 0x64,
0x50, 0x81, 0xe4, 0x68, 0x1f, 0x28, 0x8e, 0xdd, 0xc5, 0x79, 0x0f, 0x92, 0x47, 0x63, 0x03, 0x19,
0xd4, 0x5f, 0x18, 0xeb, 0x5b, 0xf4, 0x35, 0x39, 0x6e, 0xba, 0x45, 0xbb, 0xaf, 0x10, 0xb3, 0x2e,
0x44, 0xd3, 0x7c, 0xf4, 0xc0, 0x60, 0x8e, 0x9b, 0x0a, 0xc6, 0x7f, 0x09, 0x54, 0x90, 0x7b, 0xa6,
0xb3, 0x45, 0xc1, 0x4a, 0x96, 0xa3, 0x3d, 0xf0, 0xac, 0xf9, 0xf0, 0xec, 0xc9, 0x2d, 0xcf, 0xbb,
0x50, 0xc1, 0xe8, 0x71, 0x0d, 0xbe, 0xd9, 0xb8, 0x8f, 0xf4, 0x30, 0xf7, 0x31, 0x7e, 0x3c, 0x4e,
0xda, 0x69, 0xba, 0x22, 0xe3, 0x0a, 0xf4, 0xb0, 0xb5, 0xe7, 0x50, 0x79, 0xbc, 0xff, 0x3c, 0xbf,
0x1e, 0xbf, 0xd6, 0xcc, 0x8c, 0x66, 0xa2, 0x35, 0x7b, 0x10, 0x3f, 0x1e, 0x55, 0xad, 0x2c, 0x5d,
0x90, 0x91, 0x64, 0x59, 0xb6, 0x6e, 0x1c, 0x77, 0x95, 0xc3, 0xed, 0x72, 0xbc, 0xab, 0x73, 0x46,
0x31, 0x35, 0x8a, 0x87, 0x5a, 0xd1, 0x46, 0xf8, 0xf1, 0x50, 0xb6, 0x92, 0xd1, 0xd5, 0xd6, 0xb1,
0xae, 0xb7, 0x8e, 0xf5, 0x73, 0xeb, 0x58, 0x5f, 0x77, 0x4e, 0xef, 0x7a, 0xe7, 0xf4, 0xbe, 0xef,
0x9c, 0xde, 0x87, 0xb9, 0x48, 0xe5, 0xc7, 0xcf, 0xcb, 0x60, 0x05, 0x79, 0x68, 0xd6, 0x55, 0xff,
0x3c, 0xc5, 0xe4, 0x53, 0xf8, 0x45, 0xed, 0xae, 0x5c, 0x17, 0x1c, 0x97, 0x87, 0x6a, 0x6d, 0x9f,
0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x63, 0x67, 0xf6, 0x22, 0x03, 0x00, 0x00,
}
func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@ -253,8 +252,8 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x12
}
}
if m.StartingProposalID != 0 {
i = encodeVarintGenesis(dAtA, i, uint64(m.StartingProposalID))
if m.StartingProposalId != 0 {
i = encodeVarintGenesis(dAtA, i, uint64(m.StartingProposalId))
i--
dAtA[i] = 0x8
}
@ -278,8 +277,8 @@ func (m *GenesisState) Size() (n int) {
}
var l int
_ = l
if m.StartingProposalID != 0 {
n += 1 + sovGenesis(uint64(m.StartingProposalID))
if m.StartingProposalId != 0 {
n += 1 + sovGenesis(uint64(m.StartingProposalId))
}
if len(m.Deposits) > 0 {
for _, e := range m.Deposits {
@ -345,9 +344,9 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field StartingProposalID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field StartingProposalId", wireType)
}
m.StartingProposalID = 0
m.StartingProposalId = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenesis
@ -357,7 +356,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.StartingProposalID |= uint64(b&0x7F) << shift
m.StartingProposalId |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}

4
x/gov/types/genesis_test.go
View File

@ -12,11 +12,11 @@ func TestEqualProposalID(t *testing.T) {
require.Equal(t, state1, state2)
// Proposals
state1.StartingProposalID = 1
state1.StartingProposalId = 1
require.NotEqual(t, state1, state2)
require.False(t, state1.Equal(state2))
state2.StartingProposalID = 1
state2.StartingProposalId = 1
require.Equal(t, state1, state2)
require.True(t, state1.Equal(state2))
}

229
x/gov/types/gov.pb.go
View File

@ -158,7 +158,7 @@ var xxx_messageInfo_TextProposal proto.InternalMessageInfo
// Deposit defines an amount deposited by an account address to an active proposal
type Deposit struct {
ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"`
ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"`
Depositor github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=depositor,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"depositor,omitempty"`
Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
}
@ -197,7 +197,7 @@ var xxx_messageInfo_Deposit proto.InternalMessageInfo
// Proposal defines the core field members of a governance proposal
type Proposal struct {
ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"id" yaml:"id"`
ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"id" yaml:"id"`
Content *types1.Any `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"`
Status ProposalStatus `protobuf:"varint,3,opt,name=status,proto3,enum=cosmos.gov.v1beta1.ProposalStatus" json:"status,omitempty" yaml:"proposal_status"`
FinalTallyResult TallyResult `protobuf:"bytes,4,opt,name=final_tally_result,json=finalTallyResult,proto3" json:"final_tally_result" yaml:"final_tally_result"`
@ -283,7 +283,7 @@ var xxx_messageInfo_TallyResult proto.InternalMessageInfo
// Vote defines a vote on a governance proposal. A vote corresponds to a proposal
// ID, the voter, and the vote option.
type Vote struct {
ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"`
ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"`
Voter github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=voter,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"voter,omitempty"`
Option VoteOption `protobuf:"varint,3,opt,name=option,proto3,enum=cosmos.gov.v1beta1.VoteOption" json:"option,omitempty"`
}
@ -456,94 +456,93 @@ func init() {
func init() { proto.RegisterFile("cosmos/gov/v1beta1/gov.proto", fileDescriptor_6e82113c1a9a4b7c) }
var fileDescriptor_6e82113c1a9a4b7c = []byte{
// 1383 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x31, 0x6c, 0xdb, 0x46,
0x17, 0x16, 0x65, 0xd9, 0x8e, 0x4f, 0xb2, 0xcd, 0x9c, 0xfd, 0xdb, 0x32, 0xff, 0xfc, 0x24, 0xc3,
0x3f, 0x28, 0x8c, 0x20, 0x91, 0x13, 0x17, 0x28, 0xd0, 0x04, 0x28, 0x22, 0x5a, 0x4c, 0xa2, 0x22,
0x90, 0x04, 0x8a, 0x51, 0x90, 0x74, 0x20, 0x68, 0xf1, 0x22, 0xb3, 0x15, 0x79, 0xaa, 0x78, 0x72,
0x6d, 0x74, 0xe9, 0xd0, 0x21, 0x50, 0x8b, 0x22, 0x63, 0x81, 0x42, 0x40, 0x81, 0x76, 0xea, 0xdc,
0xb9, 0xb3, 0x51, 0x74, 0x08, 0x8a, 0x0e, 0x41, 0x07, 0xa5, 0x71, 0x80, 0xa2, 0xf0, 0xe8, 0xb1,
0x53, 0x41, 0xde, 0xd1, 0xa2, 0x24, 0xa3, 0x8e, 0xd0, 0x4e, 0x26, 0xdf, 0xbd, 0xef, 0x7b, 0xef,
0xbe, 0xbb, 0xef, 0xd1, 0x02, 0x17, 0xea, 0xd8, 0x77, 0xb1, 0xbf, 0xd1, 0xc0, 0xbb, 0x1b, 0xbb,
0xd7, 0xb7, 0x11, 0xb1, 0xae, 0x07, 0xcf, 0xb9, 0x56, 0x1b, 0x13, 0x0c, 0x21, 0x5d, 0xcd, 0x05,
0x11, 0xb6, 0x2a, 0x88, 0x0c, 0xb1, 0x6d, 0xf9, 0xe8, 0x04, 0x52, 0xc7, 0x8e, 0x47, 0x31, 0xc2,
0x72, 0x03, 0x37, 0x70, 0xf8, 0xb8, 0x11, 0x3c, 0xb1, 0xe8, 0x1a, 0x45, 0x99, 0x74, 0x81, 0xd1,
0xd2, 0x25, 0xa9, 0x81, 0x71, 0xa3, 0x89, 0x36, 0xc2, 0xb7, 0xed, 0xce, 0xe3, 0x0d, 0xe2, 0xb8,
0xc8, 0x27, 0x96, 0xdb, 0x8a, 0xb0, 0xa3, 0x09, 0x96, 0xb7, 0xcf, 0x96, 0xc4, 0xd1, 0x25, 0xbb,
0xd3, 0xb6, 0x88, 0x83, 0x59, 0x33, 0xca, 0x03, 0x90, 0x31, 0xd0, 0x1e, 0xa9, 0xb4, 0x71, 0x0b,
0xfb, 0x56, 0x13, 0x2e, 0x83, 0x69, 0xe2, 0x90, 0x26, 0xca, 0x72, 0x32, 0xb7, 0x3e, 0xa7, 0xd3,
0x17, 0x28, 0x83, 0xb4, 0x8d, 0xfc, 0x7a, 0xdb, 0x69, 0x05, 0xd0, 0x6c, 0x32, 0x5c, 0x8b, 0x87,
0x6e, 0x2c, 0xfe, 0xf1, 0xb5, 0xc4, 0xfd, 0xfc, 0xfd, 0xd5, 0xd9, 0x2d, 0xec, 0x11, 0xe4, 0x11,
0xe5, 0xf3, 0x24, 0x98, 0x2d, 0xa0, 0x16, 0xf6, 0x1d, 0x02, 0x35, 0x90, 0x6e, 0xb1, 0x02, 0xa6,
0x63, 0x87, 0xd4, 0x29, 0xf5, 0xd2, 0x61, 0x5f, 0x02, 0x51, 0xdd, 0x62, 0xe1, 0xb8, 0x2f, 0xc1,
0x7d, 0xcb, 0x6d, 0xde, 0x50, 0x62, 0xa9, 0x8a, 0x0e, 0xa2, 0xb7, 0xa2, 0x0d, 0xcb, 0x60, 0xce,
0xa6, 0x8c, 0xb8, 0x1d, 0xf6, 0x90, 0x51, 0xaf, 0xff, 0xd9, 0x97, 0xae, 0x36, 0x1c, 0xb2, 0xd3,
0xd9, 0xce, 0xd5, 0xb1, 0xcb, 0x74, 0x63, 0x7f, 0xae, 0xfa, 0xf6, 0x07, 0x1b, 0x64, 0xbf, 0x85,
0xfc, 0x5c, 0xbe, 0x5e, 0xcf, 0xdb, 0x76, 0x1b, 0xf9, 0xbe, 0x3e, 0xe0, 0x80, 0x75, 0x30, 0x63,
0xb9, 0xb8, 0xe3, 0x91, 0xec, 0x94, 0x3c, 0xb5, 0x9e, 0xde, 0x5c, 0xcb, 0x31, 0xdd, 0x83, 0xa3,
0x8b, 0xce, 0x33, 0xb7, 0x85, 0x1d, 0x4f, 0xbd, 0x76, 0xd0, 0x97, 0x12, 0xdf, 0xbd, 0x90, 0xd6,
0x5f, 0xa3, 0x58, 0x00, 0xf0, 0x75, 0x46, 0x7d, 0x23, 0x15, 0x28, 0xa3, 0x7c, 0x3a, 0x0b, 0xce,
0x9d, 0x88, 0xac, 0x9e, 0xa6, 0xc7, 0xc5, 0x61, 0x3d, 0x8e, 0xfa, 0x52, 0xd2, 0xb1, 0x8f, 0xfb,
0xd2, 0x1c, 0x55, 0x65, 0x54, 0x8c, 0x9b, 0x60, 0xb6, 0x4e, 0xa5, 0x0e, 0xa5, 0x48, 0x6f, 0x2e,
0xe7, 0xe8, 0x51, 0xe7, 0xa2, 0xa3, 0xce, 0xe5, 0xbd, 0x7d, 0x35, 0xfd, 0xe3, 0xe0, 0x4c, 0xf4,
0x08, 0x01, 0x6b, 0x60, 0xc6, 0x27, 0x16, 0xe9, 0xf8, 0xd9, 0x29, 0x99, 0x5b, 0x5f, 0xd8, 0x54,
0x72, 0xe3, 0xf7, 0x38, 0x17, 0xf5, 0x52, 0x0d, 0x33, 0x55, 0xe1, 0xb8, 0x2f, 0xad, 0x8c, 0x9c,
0x10, 0x25, 0x51, 0x74, 0xc6, 0x06, 0x5b, 0x00, 0x3e, 0x76, 0x3c, 0xab, 0x69, 0x12, 0xab, 0xd9,
0xdc, 0x37, 0xdb, 0xc8, 0xef, 0x34, 0x49, 0x36, 0x15, 0xf6, 0x27, 0x9d, 0x56, 0xc3, 0x08, 0xf2,
0xf4, 0x30, 0x4d, 0xbd, 0x18, 0x48, 0x7c, 0xdc, 0x97, 0xd6, 0x68, 0x91, 0x71, 0x22, 0x45, 0xe7,
0xc3, 0x60, 0x0c, 0x04, 0xdf, 0x03, 0x69, 0xbf, 0xb3, 0xed, 0x3a, 0xc4, 0x0c, 0x4c, 0x91, 0x9d,
0x0e, 0x4b, 0x09, 0x63, 0x52, 0x18, 0x91, 0x63, 0x54, 0x91, 0x55, 0x61, 0x97, 0x2d, 0x06, 0x56,
0x9e, 0xbe, 0x90, 0x38, 0x1d, 0xd0, 0x48, 0x00, 0x80, 0x0e, 0xe0, 0xd9, 0x65, 0x31, 0x91, 0x67,
0xd3, 0x0a, 0x33, 0x67, 0x56, 0xf8, 0x3f, 0xab, 0xb0, 0x4a, 0x2b, 0x8c, 0x32, 0xd0, 0x32, 0x0b,
0x2c, 0xac, 0x79, 0x76, 0x58, 0xea, 0x09, 0x07, 0xe6, 0x09, 0x26, 0x56, 0xd3, 0x64, 0x0b, 0xd9,
0xd9, 0xb3, 0xae, 0xe4, 0x5d, 0x56, 0x67, 0x99, 0xd6, 0x19, 0x42, 0x2b, 0x13, 0x5d, 0xd5, 0x4c,
0x88, 0x8d, 0xdc, 0xda, 0x04, 0xe7, 0x77, 0x31, 0x71, 0xbc, 0x46, 0x70, 0xbc, 0x6d, 0x26, 0xec,
0xb9, 0x33, 0xb7, 0x7d, 0x89, 0xb5, 0x93, 0xa5, 0xed, 0x8c, 0x51, 0xd0, 0x7d, 0x2f, 0xd2, 0x78,
0x35, 0x08, 0x87, 0x1b, 0x7f, 0x0c, 0x58, 0x68, 0x20, 0xf1, 0xdc, 0x99, 0xb5, 0x14, 0x56, 0x6b,
0x65, 0xa8, 0xd6, 0xb0, 0xc2, 0xf3, 0x34, 0xca, 0x04, 0x66, 0x36, 0x3c, 0x48, 0x82, 0x74, 0xfc,
0xfa, 0xdc, 0x02, 0x53, 0xfb, 0xc8, 0xa7, 0xc3, 0x4e, 0xcd, 0x05, 0xac, 0xbf, 0xf6, 0xa5, 0x37,
0x5e, 0x43, 0xb8, 0xa2, 0x47, 0xf4, 0x00, 0x0a, 0xef, 0x82, 0x59, 0x6b, 0xdb, 0x27, 0x96, 0xc3,
0xc6, 0xe2, 0xc4, 0x2c, 0x11, 0x1c, 0xbe, 0x03, 0x92, 0x1e, 0x0e, 0x0d, 0x39, 0x39, 0x49, 0xd2,
0xc3, 0xb0, 0x01, 0x32, 0x1e, 0x36, 0x3f, 0x72, 0xc8, 0x8e, 0xb9, 0x8b, 0x08, 0x0e, 0x6d, 0x37,
0xa7, 0x6a, 0x93, 0x31, 0x1d, 0xf7, 0xa5, 0x25, 0x2a, 0x6a, 0x9c, 0x4b, 0xd1, 0x81, 0x87, 0x1f,
0x38, 0x64, 0xa7, 0x86, 0x08, 0x66, 0x52, 0xfe, 0xc2, 0x81, 0x54, 0x0d, 0x13, 0xf4, 0x6f, 0x4d,
0xf7, 0x3b, 0x60, 0x7a, 0x17, 0x13, 0xf4, 0x0f, 0x26, 0x3b, 0xc5, 0xc3, 0xb7, 0xc0, 0x0c, 0xa6,
0xdf, 0x29, 0x3a, 0xdc, 0xc4, 0xd3, 0x06, 0x4f, 0xd0, 0x79, 0x39, 0xcc, 0xd2, 0x59, 0x36, 0xdb,
0xd6, 0x0f, 0x49, 0x30, 0xcf, 0x9c, 0x50, 0xb1, 0xda, 0x96, 0xeb, 0xc3, 0xaf, 0x38, 0x90, 0x76,
0x1d, 0xef, 0xc4, 0x98, 0xdc, 0x59, 0xc6, 0x34, 0x03, 0xc9, 0x8f, 0xfa, 0xd2, 0x7f, 0x62, 0xa8,
0x2b, 0xd8, 0x75, 0x08, 0x72, 0x5b, 0x64, 0x7f, 0x20, 0x45, 0x6c, 0x79, 0x32, 0xbf, 0x02, 0xd7,
0xf1, 0x22, 0xb7, 0x7e, 0xc1, 0x01, 0xe8, 0x5a, 0x7b, 0x11, 0x91, 0xd9, 0x42, 0x6d, 0x07, 0xdb,
0xec, 0x9b, 0xb0, 0x36, 0xe6, 0xa1, 0x02, 0xfb, 0xfc, 0xd3, 0x7b, 0x71, 0xd4, 0x97, 0x2e, 0x8c,
0x83, 0x87, 0x7a, 0x65, 0xd3, 0x78, 0x3c, 0x4b, 0xf9, 0x32, 0x70, 0x19, 0xef, 0x5a, 0x7b, 0x91,
0x5c, 0x34, 0xfc, 0x19, 0x07, 0x32, 0xb5, 0xd0, 0x7a, 0x4c, 0xbf, 0x8f, 0x01, 0xb3, 0x62, 0xd4,
0x1b, 0x77, 0x56, 0x6f, 0x37, 0x59, 0x6f, 0xab, 0x43, 0xb8, 0xa1, 0xb6, 0x96, 0x87, 0x9c, 0x1f,
0xef, 0x28, 0x43, 0x63, 0xac, 0x9b, 0x6f, 0x23, 0xc3, 0xb3, 0x66, 0x1e, 0x81, 0x99, 0x0f, 0x3b,
0xb8, 0xdd, 0x71, 0xc3, 0x2e, 0x32, 0xaa, 0x3a, 0x81, 0x3d, 0x0a, 0xa8, 0x7e, 0xd4, 0x97, 0x78,
0x8a, 0x1f, 0x74, 0xa3, 0x33, 0x46, 0x58, 0x07, 0x73, 0x64, 0xa7, 0x8d, 0xfc, 0x1d, 0xdc, 0xb4,
0xd9, 0x2d, 0xd6, 0x26, 0xa6, 0x5f, 0x3a, 0xa1, 0x88, 0x55, 0x18, 0xf0, 0x42, 0x03, 0xa4, 0x42,
0x77, 0x4f, 0x85, 0xfc, 0xb7, 0x26, 0xe6, 0x5f, 0x08, 0xd0, 0x31, 0xea, 0x90, 0xed, 0xf2, 0xef,
0x1c, 0x00, 0x03, 0x4b, 0xc0, 0x2b, 0x60, 0xb5, 0x56, 0x36, 0x34, 0xb3, 0x5c, 0x31, 0x8a, 0xe5,
0x92, 0x79, 0xbf, 0x54, 0xad, 0x68, 0x5b, 0xc5, 0xdb, 0x45, 0xad, 0xc0, 0x27, 0x84, 0xc5, 0x6e,
0x4f, 0x4e, 0xd3, 0x44, 0x2d, 0xa0, 0x80, 0x0a, 0x58, 0x8c, 0x67, 0x3f, 0xd4, 0xaa, 0x3c, 0x27,
0xcc, 0x77, 0x7b, 0xf2, 0x1c, 0xcd, 0x7a, 0x88, 0x7c, 0x78, 0x19, 0x2c, 0xc5, 0x73, 0xf2, 0x6a,
0xd5, 0xc8, 0x17, 0x4b, 0x7c, 0x52, 0x38, 0xdf, 0xed, 0xc9, 0xf3, 0x34, 0x2f, 0xcf, 0x06, 0xa1,
0x0c, 0x16, 0xe2, 0xb9, 0xa5, 0x32, 0x3f, 0x25, 0x64, 0xba, 0x3d, 0xf9, 0x1c, 0x4d, 0x2b, 0x61,
0xb8, 0x09, 0xb2, 0xc3, 0x19, 0xe6, 0x83, 0xa2, 0x71, 0xd7, 0xac, 0x69, 0x46, 0x99, 0x4f, 0x09,
0xcb, 0xdd, 0x9e, 0xcc, 0x47, 0xb9, 0xd1, 0xd4, 0x12, 0x52, 0x4f, 0xbe, 0x11, 0x13, 0x97, 0x7f,
0x4a, 0x82, 0x85, 0xe1, 0x7f, 0x6c, 0x60, 0x0e, 0xfc, 0xb7, 0xa2, 0x97, 0x2b, 0xe5, 0x6a, 0xfe,
0x9e, 0x59, 0x35, 0xf2, 0xc6, 0xfd, 0xea, 0xc8, 0x86, 0xc3, 0xad, 0xd0, 0xe4, 0x92, 0xd3, 0x84,
0x37, 0x81, 0x38, 0x9a, 0x5f, 0xd0, 0x2a, 0xe5, 0x6a, 0xd1, 0x30, 0x2b, 0x9a, 0x5e, 0x2c, 0x17,
0x78, 0x4e, 0x58, 0xed, 0xf6, 0xe4, 0x25, 0x0a, 0x19, 0x72, 0x07, 0x7c, 0x1b, 0xfc, 0x6f, 0x14,
0x5c, 0x2b, 0x1b, 0xc5, 0xd2, 0x9d, 0x08, 0x9b, 0x14, 0x56, 0xba, 0x3d, 0x19, 0x52, 0x6c, 0x2d,
0x76, 0x95, 0xe1, 0x15, 0xb0, 0x32, 0x0a, 0xad, 0xe4, 0xab, 0x55, 0xad, 0xc0, 0x4f, 0x09, 0x7c,
0xb7, 0x27, 0x67, 0x28, 0xa6, 0x62, 0xf9, 0x3e, 0xb2, 0xe1, 0x35, 0x90, 0x1d, 0xcd, 0xd6, 0xb5,
0x77, 0xb5, 0x2d, 0x43, 0x2b, 0xf0, 0x29, 0x01, 0x76, 0x7b, 0xf2, 0x02, 0xcd, 0xd7, 0xd1, 0xfb,
0xa8, 0x4e, 0xd0, 0xa9, 0xfc, 0xb7, 0xf3, 0xc5, 0x7b, 0x5a, 0x81, 0x9f, 0x8e, 0xf3, 0xdf, 0xb6,
0x9c, 0x26, 0xb2, 0xa9, 0x9c, 0x6a, 0xe9, 0xe0, 0xa5, 0x98, 0x78, 0xfe, 0x52, 0x4c, 0x7c, 0x72,
0x28, 0x26, 0x0e, 0x0e, 0x45, 0xee, 0xd9, 0xa1, 0xc8, 0xfd, 0x76, 0x28, 0x72, 0x4f, 0x5f, 0x89,
0x89, 0x67, 0xaf, 0xc4, 0xc4, 0xf3, 0x57, 0x62, 0xe2, 0xd1, 0xdf, 0x4f, 0xb6, 0xbd, 0xf0, 0xb7,
0x55, 0x78, 0x47, 0xb7, 0x67, 0xc2, 0x61, 0xf0, 0xe6, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x46,
0x4b, 0xfc, 0xfb, 0x76, 0x0d, 0x00, 0x00,
// 1375 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x41, 0x6c, 0xdb, 0xd4,
0x1b, 0x8f, 0xd3, 0xb4, 0x5d, 0x5f, 0xd2, 0xd6, 0x7b, 0xed, 0xbf, 0x4d, 0xfd, 0xdf, 0xdf, 0xf6,
0xdf, 0x20, 0x54, 0x4d, 0x5b, 0xba, 0x15, 0x04, 0x62, 0x93, 0xd0, 0x92, 0xc6, 0xdb, 0x82, 0xa6,
0x24, 0x72, 0xbc, 0x4c, 0x1b, 0x07, 0xcb, 0x89, 0xdf, 0x52, 0x43, 0xec, 0x17, 0xe2, 0x97, 0xd2,
0x88, 0x0b, 0xc7, 0x29, 0x48, 0x68, 0x47, 0x24, 0x14, 0x09, 0x09, 0x4e, 0x9c, 0x39, 0x73, 0x44,
0x15, 0xe2, 0x30, 0x71, 0x9a, 0x38, 0x64, 0xac, 0x93, 0x10, 0xea, 0xb1, 0x07, 0x0e, 0x1c, 0x10,
0xb2, 0xdf, 0x73, 0xe3, 0x24, 0x15, 0x5d, 0xe0, 0x54, 0xfb, 0xfb, 0xbe, 0xdf, 0xef, 0xfb, 0xde,
0xef, 0x7d, 0xdf, 0xe7, 0x06, 0x5c, 0xa8, 0x63, 0xcf, 0xc1, 0xde, 0x56, 0x03, 0xef, 0x6d, 0xed,
0x5d, 0xad, 0x21, 0x62, 0x5e, 0xf5, 0x9f, 0x33, 0xad, 0x36, 0x26, 0x18, 0x42, 0xea, 0xcd, 0xf8,
0x16, 0xe6, 0x15, 0x44, 0x86, 0xa8, 0x99, 0x1e, 0x3a, 0x81, 0xd4, 0xb1, 0xed, 0x52, 0x8c, 0xb0,
0xda, 0xc0, 0x0d, 0x1c, 0x3c, 0x6e, 0xf9, 0x4f, 0xcc, 0xba, 0x41, 0x51, 0x06, 0x75, 0x30, 0x5a,
0xea, 0x92, 0x1a, 0x18, 0x37, 0x9a, 0x68, 0x2b, 0x78, 0xab, 0x75, 0x1e, 0x6e, 0x11, 0xdb, 0x41,
0x1e, 0x31, 0x9d, 0x56, 0x88, 0x1d, 0x0f, 0x30, 0xdd, 0x2e, 0x73, 0x89, 0xe3, 0x2e, 0xab, 0xd3,
0x36, 0x89, 0x8d, 0x59, 0x31, 0xca, 0x3d, 0x90, 0xd2, 0xd1, 0x3e, 0x29, 0xb7, 0x71, 0x0b, 0x7b,
0x66, 0x13, 0xae, 0x82, 0x59, 0x62, 0x93, 0x26, 0x4a, 0x73, 0x32, 0xb7, 0xb9, 0xa0, 0xd1, 0x17,
0x28, 0x83, 0xa4, 0x85, 0xbc, 0x7a, 0xdb, 0x6e, 0xf9, 0xd0, 0x74, 0x3c, 0xf0, 0x45, 0x4d, 0xd7,
0x96, 0x7f, 0xfb, 0x52, 0xe2, 0x7e, 0xfa, 0xf6, 0xf2, 0xfc, 0x0e, 0x76, 0x09, 0x72, 0x89, 0xf2,
0x27, 0x07, 0xe6, 0xf3, 0xa8, 0x85, 0x3d, 0x9b, 0xc0, 0xb7, 0x40, 0xb2, 0xc5, 0x12, 0x18, 0xb6,
0x15, 0x50, 0x27, 0x72, 0x6b, 0xc7, 0x03, 0x09, 0x76, 0x4d, 0xa7, 0x79, 0x4d, 0x89, 0x38, 0x15,
0x0d, 0x84, 0x6f, 0x05, 0x0b, 0x96, 0xc0, 0x82, 0x45, 0x39, 0x70, 0x3b, 0xc8, 0x9a, 0xca, 0x5d,
0xfd, 0x63, 0x20, 0x5d, 0x6e, 0xd8, 0x64, 0xb7, 0x53, 0xcb, 0xd4, 0xb1, 0xc3, 0x94, 0x62, 0x7f,
0x2e, 0x7b, 0xd6, 0x07, 0x5b, 0xa4, 0xdb, 0x42, 0x5e, 0x26, 0x5b, 0xaf, 0x67, 0x2d, 0xab, 0x8d,
0x3c, 0x4f, 0x1b, 0x72, 0xc0, 0x3a, 0x98, 0x33, 0x1d, 0xdc, 0x71, 0x49, 0x7a, 0x46, 0x9e, 0xd9,
0x4c, 0x6e, 0x6f, 0x64, 0x98, 0xd2, 0xfe, 0x65, 0x85, 0x37, 0x98, 0xd9, 0xc1, 0xb6, 0x9b, 0xbb,
0x72, 0x30, 0x90, 0x62, 0xdf, 0x3c, 0x93, 0x36, 0x5f, 0x22, 0x99, 0x0f, 0xf0, 0x34, 0x46, 0x7d,
0x2d, 0xe1, 0x6b, 0xa1, 0xfc, 0x3e, 0x07, 0xce, 0x9d, 0xc8, 0xfa, 0xc6, 0x69, 0x0a, 0xac, 0x1c,
0x0d, 0xa4, 0xb8, 0x6d, 0x1d, 0x0f, 0xa4, 0x05, 0xaa, 0xc3, 0xf8, 0xf1, 0xaf, 0x83, 0xf9, 0x3a,
0x95, 0x33, 0x38, 0x7c, 0x72, 0x7b, 0x35, 0x43, 0xaf, 0x33, 0x13, 0x5e, 0x67, 0x26, 0xeb, 0x76,
0x73, 0xc9, 0x1f, 0x86, 0xba, 0x6b, 0x21, 0x02, 0x56, 0xc1, 0x9c, 0x47, 0x4c, 0xd2, 0xf1, 0xd2,
0x33, 0x32, 0xb7, 0xb9, 0xb4, 0xad, 0x64, 0x26, 0x7b, 0x35, 0x13, 0x16, 0x58, 0x09, 0x22, 0x73,
0xc2, 0xf1, 0x40, 0x5a, 0x1b, 0xbb, 0x13, 0x4a, 0xa2, 0x68, 0x8c, 0x0d, 0xb6, 0x00, 0x7c, 0x68,
0xbb, 0x66, 0xd3, 0x20, 0x66, 0xb3, 0xd9, 0x35, 0xda, 0xc8, 0xeb, 0x34, 0x49, 0x3a, 0x11, 0xd4,
0x27, 0x9d, 0x96, 0x43, 0xf7, 0xe3, 0xb4, 0x20, 0x2c, 0xf7, 0x7f, 0x5f, 0xd4, 0xe3, 0x81, 0xb4,
0x41, 0x93, 0x4c, 0x12, 0x29, 0x1a, 0x1f, 0x18, 0x23, 0x20, 0xf8, 0x1e, 0x48, 0x7a, 0x9d, 0x9a,
0x63, 0x13, 0xc3, 0x6f, 0xfc, 0xf4, 0x6c, 0x90, 0x4a, 0x98, 0x90, 0x42, 0x0f, 0xa7, 0x22, 0x27,
0xb2, 0x2c, 0xac, 0xbd, 0x22, 0x60, 0xe5, 0xf1, 0x33, 0x89, 0xd3, 0x00, 0xb5, 0xf8, 0x00, 0x68,
0x03, 0x9e, 0xb5, 0x87, 0x81, 0x5c, 0x8b, 0x66, 0x98, 0x3b, 0x33, 0xc3, 0x2b, 0x2c, 0xc3, 0x3a,
0xcd, 0x30, 0xce, 0x40, 0xd3, 0x2c, 0x31, 0xb3, 0xea, 0x5a, 0x41, 0xaa, 0x47, 0x1c, 0x58, 0x24,
0x98, 0x98, 0x4d, 0x83, 0x39, 0xd2, 0xf3, 0x67, 0x35, 0xe1, 0x6d, 0x96, 0x67, 0x95, 0xe6, 0x19,
0x41, 0x2b, 0x53, 0x35, 0x67, 0x2a, 0xc0, 0x86, 0x13, 0xd9, 0x04, 0xe7, 0xf7, 0x30, 0xb1, 0xdd,
0x86, 0x7f, 0xbd, 0x6d, 0x26, 0xec, 0xb9, 0x33, 0x8f, 0xfd, 0x2a, 0x2b, 0x27, 0x4d, 0xcb, 0x99,
0xa0, 0xa0, 0xe7, 0x5e, 0xa6, 0xf6, 0x8a, 0x6f, 0x0e, 0x0e, 0xfe, 0x10, 0x30, 0xd3, 0x50, 0xe2,
0x85, 0x33, 0x73, 0x29, 0x2c, 0xd7, 0xda, 0x48, 0xae, 0x51, 0x85, 0x17, 0xa9, 0x95, 0x09, 0xcc,
0x06, 0xef, 0x20, 0x0e, 0x92, 0xd1, 0xf6, 0xb9, 0x01, 0x66, 0xba, 0xc8, 0xa3, 0x0b, 0x2d, 0x97,
0xf1, 0x59, 0x7f, 0x1e, 0x48, 0xaf, 0xbd, 0x84, 0x70, 0x05, 0x97, 0x68, 0x3e, 0x14, 0xde, 0x06,
0xf3, 0x66, 0xcd, 0x23, 0xa6, 0xcd, 0x56, 0xdf, 0xd4, 0x2c, 0x21, 0x1c, 0xbe, 0x03, 0xe2, 0x2e,
0x0e, 0x06, 0x72, 0x7a, 0x92, 0xb8, 0x8b, 0x61, 0x03, 0xa4, 0x5c, 0x6c, 0x7c, 0x64, 0x93, 0x5d,
0x63, 0x0f, 0x11, 0x1c, 0x8c, 0xdd, 0x42, 0x4e, 0x9d, 0x8e, 0xe9, 0x78, 0x20, 0xad, 0x50, 0x51,
0xa3, 0x5c, 0x8a, 0x06, 0x5c, 0x7c, 0xcf, 0x26, 0xbb, 0x55, 0x44, 0x30, 0x93, 0xf2, 0x7b, 0x0e,
0x24, 0xaa, 0x98, 0xa0, 0x7f, 0xbe, 0xc1, 0x6f, 0x81, 0xd9, 0x3d, 0x4c, 0xd0, 0xbf, 0xd8, 0xde,
0x14, 0x0f, 0xdf, 0x04, 0x73, 0x98, 0x7e, 0x7d, 0xe8, 0x3a, 0x13, 0x4f, 0x5b, 0x35, 0x7e, 0xad,
0xa5, 0x20, 0x4a, 0x63, 0xd1, 0xec, 0x20, 0xdf, 0xc5, 0xc1, 0x22, 0xeb, 0xfd, 0xb2, 0xd9, 0x36,
0x1d, 0x0f, 0x7e, 0xc1, 0x81, 0xa4, 0x63, 0xbb, 0x27, 0xa3, 0xc8, 0x9d, 0x35, 0x8a, 0x86, 0x2f,
0xf2, 0xd1, 0x40, 0xfa, 0x4f, 0x04, 0x75, 0x09, 0x3b, 0x36, 0x41, 0x4e, 0x8b, 0x74, 0x87, 0x52,
0x44, 0xdc, 0xd3, 0x4d, 0x28, 0x70, 0x6c, 0x37, 0x9c, 0xcf, 0xcf, 0x38, 0x00, 0x1d, 0x73, 0x3f,
0x24, 0x32, 0x5a, 0xa8, 0x6d, 0x63, 0x8b, 0x7d, 0x05, 0x36, 0x26, 0xa6, 0x26, 0xcf, 0x3e, 0xea,
0xb4, 0x13, 0x8e, 0x06, 0xd2, 0x85, 0x49, 0xf0, 0x48, 0xad, 0x6c, 0xff, 0x4e, 0x46, 0x29, 0x9f,
0xfb, 0x73, 0xc5, 0x3b, 0xe6, 0x7e, 0x28, 0x17, 0x35, 0x7f, 0xca, 0x81, 0x54, 0x35, 0x18, 0x36,
0xa6, 0xdf, 0xc7, 0x80, 0x0d, 0x5f, 0x58, 0x1b, 0x77, 0x56, 0x6d, 0xd7, 0x59, 0x6d, 0xeb, 0x23,
0xb8, 0x91, 0xb2, 0x56, 0x47, 0x66, 0x3d, 0x5a, 0x51, 0x8a, 0xda, 0x58, 0x35, 0x5f, 0x87, 0x23,
0xce, 0x8a, 0x79, 0x00, 0xe6, 0x3e, 0xec, 0xe0, 0x76, 0xc7, 0x09, 0xaa, 0x48, 0xe5, 0x72, 0x53,
0x0c, 0x44, 0x1e, 0xd5, 0x8f, 0x06, 0x12, 0x4f, 0xf1, 0xc3, 0x6a, 0x34, 0xc6, 0x08, 0xeb, 0x60,
0x81, 0xec, 0xb6, 0x91, 0xb7, 0x8b, 0x9b, 0x16, 0xeb, 0x62, 0x75, 0x6a, 0xfa, 0x95, 0x13, 0x8a,
0x48, 0x86, 0x21, 0x2f, 0xd4, 0x41, 0x22, 0x98, 0xe7, 0x99, 0x80, 0xff, 0xc6, 0xd4, 0xfc, 0x4b,
0x3e, 0x3a, 0x42, 0x1d, 0xb0, 0x5d, 0xfc, 0x95, 0x03, 0x60, 0x38, 0x12, 0xf0, 0x12, 0x58, 0xaf,
0x96, 0x74, 0xd5, 0x28, 0x95, 0xf5, 0x42, 0xa9, 0x68, 0xdc, 0x2d, 0x56, 0xca, 0xea, 0x4e, 0xe1,
0x66, 0x41, 0xcd, 0xf3, 0x31, 0x61, 0xb9, 0xd7, 0x97, 0x93, 0x34, 0x50, 0xf5, 0x29, 0xa0, 0x02,
0x96, 0xa3, 0xd1, 0xf7, 0xd5, 0x0a, 0xcf, 0x09, 0x8b, 0xbd, 0xbe, 0xbc, 0x40, 0xa3, 0xee, 0x23,
0x0f, 0x5e, 0x04, 0x2b, 0xd1, 0x98, 0x6c, 0xae, 0xa2, 0x67, 0x0b, 0x45, 0x3e, 0x2e, 0x9c, 0xef,
0xf5, 0xe5, 0x45, 0x1a, 0x97, 0x65, 0xab, 0x4f, 0x06, 0x4b, 0xd1, 0xd8, 0x62, 0x89, 0x9f, 0x11,
0x52, 0xbd, 0xbe, 0x7c, 0x8e, 0x86, 0x15, 0x31, 0xdc, 0x06, 0xe9, 0xd1, 0x08, 0xe3, 0x5e, 0x41,
0xbf, 0x6d, 0x54, 0x55, 0xbd, 0xc4, 0x27, 0x84, 0xd5, 0x5e, 0x5f, 0xe6, 0xc3, 0xd8, 0x70, 0x4f,
0x09, 0x89, 0x47, 0x5f, 0x89, 0xb1, 0x8b, 0x3f, 0xc6, 0xc1, 0xd2, 0xe8, 0xbf, 0x32, 0x30, 0x03,
0xfe, 0x5b, 0xd6, 0x4a, 0xe5, 0x52, 0x25, 0x7b, 0xc7, 0xa8, 0xe8, 0x59, 0xfd, 0x6e, 0x65, 0xec,
0xc0, 0xc1, 0x51, 0x68, 0x70, 0xd1, 0x6e, 0xc2, 0xeb, 0x40, 0x1c, 0x8f, 0xcf, 0xab, 0xe5, 0x52,
0xa5, 0xa0, 0x1b, 0x65, 0x55, 0x2b, 0x94, 0xf2, 0x3c, 0x27, 0xac, 0xf7, 0xfa, 0xf2, 0x0a, 0x85,
0x8c, 0x4c, 0x07, 0x7c, 0x1b, 0xfc, 0x6f, 0x1c, 0x5c, 0x2d, 0xe9, 0x85, 0xe2, 0xad, 0x10, 0x1b,
0x17, 0xd6, 0x7a, 0x7d, 0x19, 0x52, 0x6c, 0x35, 0xd2, 0xca, 0xf0, 0x12, 0x58, 0x1b, 0x87, 0x96,
0xb3, 0x95, 0x8a, 0x9a, 0xe7, 0x67, 0x04, 0xbe, 0xd7, 0x97, 0x53, 0x14, 0x53, 0x36, 0x3d, 0x0f,
0x59, 0xf0, 0x0a, 0x48, 0x8f, 0x47, 0x6b, 0xea, 0xbb, 0xea, 0x8e, 0xae, 0xe6, 0xf9, 0x84, 0x00,
0x7b, 0x7d, 0x79, 0x89, 0xc6, 0x6b, 0xe8, 0x7d, 0x54, 0x27, 0xe8, 0x54, 0xfe, 0x9b, 0xd9, 0xc2,
0x1d, 0x35, 0xcf, 0xcf, 0x46, 0xf9, 0x6f, 0x9a, 0x76, 0x13, 0x59, 0x54, 0xce, 0x5c, 0xf1, 0xe0,
0xb9, 0x18, 0x7b, 0xfa, 0x5c, 0x8c, 0x7d, 0x72, 0x28, 0xc6, 0x0e, 0x0e, 0x45, 0xee, 0xc9, 0xa1,
0xc8, 0xfd, 0x72, 0x28, 0x72, 0x8f, 0x5f, 0x88, 0xb1, 0x27, 0x2f, 0xc4, 0xd8, 0xd3, 0x17, 0x62,
0xec, 0xc1, 0xdf, 0x6f, 0xb6, 0xfd, 0xe0, 0x17, 0x53, 0xd0, 0xa3, 0xb5, 0xb9, 0x60, 0x19, 0xbc,
0xfe, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0xad, 0x38, 0x5a, 0x4c, 0x0d, 0x00, 0x00,
}
func (this *TextProposal) Equal(that interface{}) bool {
@ -592,7 +591,7 @@ func (this *Deposit) Equal(that interface{}) bool {
} else if this == nil {
return false
}
if this.ProposalID != that1.ProposalID {
if this.ProposalId != that1.ProposalId {
return false
}
if !bytes.Equal(this.Depositor, that1.Depositor) {
@ -627,7 +626,7 @@ func (this *Proposal) Equal(that interface{}) bool {
} else if this == nil {
return false
}
if this.ProposalID != that1.ProposalID {
if this.ProposalId != that1.ProposalId {
return false
}
if !this.Content.Equal(that1.Content) {
@ -713,7 +712,7 @@ func (this *Vote) Equal(that interface{}) bool {
} else if this == nil {
return false
}
if this.ProposalID != that1.ProposalID {
if this.ProposalId != that1.ProposalId {
return false
}
if !bytes.Equal(this.Voter, that1.Voter) {
@ -802,8 +801,8 @@ func (m *Deposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if m.ProposalID != 0 {
i = encodeVarintGov(dAtA, i, uint64(m.ProposalID))
if m.ProposalId != 0 {
i = encodeVarintGov(dAtA, i, uint64(m.ProposalId))
i--
dAtA[i] = 0x8
}
@ -903,8 +902,8 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if m.ProposalID != 0 {
i = encodeVarintGov(dAtA, i, uint64(m.ProposalID))
if m.ProposalId != 0 {
i = encodeVarintGov(dAtA, i, uint64(m.ProposalId))
i--
dAtA[i] = 0x8
}
@ -1006,8 +1005,8 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if m.ProposalID != 0 {
i = encodeVarintGov(dAtA, i, uint64(m.ProposalID))
if m.ProposalId != 0 {
i = encodeVarintGov(dAtA, i, uint64(m.ProposalId))
i--
dAtA[i] = 0x8
}
@ -1177,8 +1176,8 @@ func (m *Deposit) Size() (n int) {
}
var l int
_ = l
if m.ProposalID != 0 {
n += 1 + sovGov(uint64(m.ProposalID))
if m.ProposalId != 0 {
n += 1 + sovGov(uint64(m.ProposalId))
}
l = len(m.Depositor)
if l > 0 {
@ -1199,8 +1198,8 @@ func (m *Proposal) Size() (n int) {
}
var l int
_ = l
if m.ProposalID != 0 {
n += 1 + sovGov(uint64(m.ProposalID))
if m.ProposalId != 0 {
n += 1 + sovGov(uint64(m.ProposalId))
}
if m.Content != nil {
l = m.Content.Size()
@ -1251,8 +1250,8 @@ func (m *Vote) Size() (n int) {
}
var l int
_ = l
if m.ProposalID != 0 {
n += 1 + sovGov(uint64(m.ProposalID))
if m.ProposalId != 0 {
n += 1 + sovGov(uint64(m.ProposalId))
}
l = len(m.Voter)
if l > 0 {
@ -1461,9 +1460,9 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ProposalID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ProposalId", wireType)
}
m.ProposalID = 0
m.ProposalId = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGov
@ -1473,7 +1472,7 @@ func (m *Deposit) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.ProposalID |= uint64(b&0x7F) << shift
m.ProposalId |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
@ -1601,9 +1600,9 @@ func (m *Proposal) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ProposalID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ProposalId", wireType)
}
m.ProposalID = 0
m.ProposalId = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGov
@ -1613,7 +1612,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.ProposalID |= uint64(b&0x7F) << shift
m.ProposalId |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
@ -2116,9 +2115,9 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ProposalID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ProposalId", wireType)
}
m.ProposalID = 0
m.ProposalId = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGov
@ -2128,7 +2127,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.ProposalID |= uint64(b&0x7F) << shift
m.ProposalId |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}

4
x/gov/types/proposal.go
View File

@ -19,7 +19,7 @@ const DefaultStartingProposalID uint64 = 1
// NewProposal creates a new Proposal instance
func NewProposal(content Content, id uint64, submitTime, depositEndTime time.Time) (Proposal, error) {
p := Proposal{
ProposalID: id,
ProposalId: id,
Status: StatusDepositPeriod,
FinalTallyResult: EmptyTallyResult(),
TotalDeposit: sdk.NewCoins(),
@ -112,7 +112,7 @@ func (p Proposals) String() string {
out := "ID - (Status) [Type] Title\n"
for _, prop := range p {
out += fmt.Sprintf("%d - (%s) [%s] %s\n",
prop.ProposalID, prop.Status,
prop.ProposalId, prop.Status,
prop.ProposalType(), prop.GetTitle())
}
return strings.TrimSpace(out)

104
x/gov/types/tx.pb.go
View File

@ -70,7 +70,7 @@ var xxx_messageInfo_MsgSubmitProposal proto.InternalMessageInfo
// MsgVote defines a message to cast a vote
type MsgVote struct {
ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"`
ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"`
Voter github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=voter,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"voter,omitempty"`
Option VoteOption `protobuf:"varint,3,opt,name=option,proto3,enum=cosmos.gov.v1beta1.VoteOption" json:"option,omitempty"`
}
@ -109,7 +109,7 @@ var xxx_messageInfo_MsgVote proto.InternalMessageInfo
// MsgDeposit defines a message to submit a deposit to an existing proposal
type MsgDeposit struct {
ProposalID uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"`
ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"`
Depositor github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=depositor,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"depositor,omitempty"`
Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"`
}
@ -155,40 +155,40 @@ func init() {
func init() { proto.RegisterFile("cosmos/gov/v1beta1/tx.proto", fileDescriptor_3c053992595e3dce) }
var fileDescriptor_3c053992595e3dce = []byte{
// 525 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xcf, 0x6b, 0x13, 0x41,
0x14, 0xde, 0x4d, 0x6b, 0xa2, 0x13, 0xa9, 0x38, 0x14, 0x49, 0xab, 0xcc, 0x86, 0x9c, 0x72, 0xc9,
0xac, 0x49, 0xc1, 0x43, 0x3d, 0x25, 0x2d, 0x48, 0x85, 0x58, 0x89, 0xe2, 0xc1, 0x4b, 0xd8, 0x1f,
0xe3, 0x38, 0x98, 0xec, 0x5b, 0x32, 0x93, 0xd0, 0xdc, 0xfc, 0x0b, 0xc4, 0xbf, 0x40, 0x3c, 0x7b,
0x16, 0xff, 0x86, 0xe0, 0xa9, 0xc7, 0x9e, 0x56, 0x9b, 0x80, 0x88, 0xc7, 0x1e, 0x3d, 0x49, 0x66,
0x66, 0x6b, 0x51, 0xf1, 0x27, 0x9e, 0x76, 0xdf, 0x7c, 0xef, 0xfb, 0x76, 0xbe, 0x6f, 0xdf, 0x43,
0x57, 0x23, 0x90, 0x43, 0x90, 0x3e, 0x87, 0x89, 0x3f, 0x69, 0x86, 0x4c, 0x05, 0x4d, 0x5f, 0x1d,
0xd0, 0x74, 0x04, 0x0a, 0x30, 0x36, 0x20, 0xe5, 0x30, 0xa1, 0x16, 0xdc, 0x24, 0x96, 0x10, 0x06,
0x92, 0x9d, 0x32, 0x22, 0x10, 0x89, 0xe1, 0x6c, 0x5e, 0xfb, 0x81, 0xe0, 0x92, 0x6f, 0xd0, 0x0d,
0x83, 0xf6, 0x75, 0xe5, 0x5b, 0x79, 0x03, 0xad, 0x73, 0xe0, 0x60, 0xce, 0x97, 0x6f, 0x39, 0x81,
0x03, 0xf0, 0x01, 0xf3, 0x75, 0x15, 0x8e, 0x1f, 0xf9, 0x41, 0x32, 0x35, 0x50, 0xed, 0x4d, 0x01,
0x5d, 0xee, 0x4a, 0x7e, 0x6f, 0x1c, 0x0e, 0x85, 0xba, 0x3b, 0x82, 0x14, 0x64, 0x30, 0xc0, 0x37,
0x51, 0x29, 0x82, 0x44, 0xb1, 0x44, 0x55, 0xdc, 0xaa, 0x5b, 0x2f, 0xb7, 0xd6, 0xa9, 0x91, 0xa0,
0xb9, 0x04, 0x6d, 0x27, 0xd3, 0x4e, 0xf9, 0xed, 0xeb, 0x46, 0x69, 0xc7, 0x34, 0xf6, 0x72, 0x06,
0x7e, 0xe6, 0xa2, 0x4b, 0x22, 0x11, 0x4a, 0x04, 0x83, 0x7e, 0xcc, 0x52, 0x90, 0x42, 0x55, 0x0a,
0xd5, 0x95, 0x7a, 0xb9, 0xb5, 0x41, 0xed, 0x65, 0x97, 0xbe, 0xf3, 0x30, 0xe8, 0x0e, 0x88, 0xa4,
0x73, 0x7b, 0x96, 0x79, 0xce, 0x49, 0xe6, 0x5d, 0x99, 0x06, 0xc3, 0xc1, 0x76, 0xed, 0x1b, 0x7e,
0xed, 0xd5, 0x3b, 0xaf, 0xce, 0x85, 0x7a, 0x3c, 0x0e, 0x69, 0x04, 0x43, 0xeb, 0xd9, 0x3e, 0x1a,
0x32, 0x7e, 0xe2, 0xab, 0x69, 0xca, 0xa4, 0x96, 0x92, 0xbd, 0x35, 0xcb, 0xde, 0x35, 0x64, 0xdc,
0x45, 0xe7, 0x53, 0xed, 0x8c, 0x8d, 0x2a, 0x2b, 0x55, 0xb7, 0x7e, 0xb1, 0xd3, 0xfc, 0x9c, 0x79,
0x8d, 0xdf, 0xd0, 0x6b, 0x47, 0x51, 0x3b, 0x8e, 0x47, 0x4c, 0xca, 0xde, 0xa9, 0xc4, 0xf6, 0xea,
0xc7, 0x97, 0x9e, 0x5b, 0xfb, 0xe0, 0xa2, 0x52, 0x57, 0xf2, 0x07, 0xa0, 0x18, 0xbe, 0x8f, 0xca,
0xa9, 0x8d, 0xae, 0x2f, 0x62, 0x1d, 0xd9, 0x6a, 0x67, 0x6b, 0x9e, 0x79, 0x28, 0x4f, 0x74, 0x6f,
0xf7, 0x53, 0xe6, 0x9d, 0x6d, 0x3a, 0xc9, 0x3c, 0x6c, 0xac, 0x9e, 0x39, 0xac, 0xf5, 0x50, 0x5e,
0xed, 0xc5, 0xf8, 0x16, 0x3a, 0x37, 0x01, 0xc5, 0x46, 0x95, 0xc2, 0xdf, 0xde, 0xd9, 0xf0, 0xf1,
0x0d, 0x54, 0x84, 0x54, 0x09, 0x48, 0xb4, 0xfb, 0xb5, 0x16, 0xa1, 0xdf, 0x8f, 0x24, 0x5d, 0x1a,
0xd9, 0xd7, 0x5d, 0x3d, 0xdb, 0x6d, 0x8d, 0xbe, 0x28, 0x20, 0xd4, 0x95, 0x3c, 0x0f, 0xf3, 0xff,
0x78, 0xdd, 0x47, 0x17, 0xec, 0xaf, 0x86, 0x7f, 0xf0, 0xfb, 0x55, 0x03, 0x47, 0xa8, 0x18, 0x0c,
0x61, 0x9c, 0xa8, 0xca, 0xca, 0xaf, 0x46, 0xef, 0xfa, 0x72, 0xf4, 0xfe, 0x68, 0xc0, 0xac, 0xb4,
0x09, 0xa8, 0x73, 0x67, 0x76, 0x4c, 0x9c, 0xa3, 0x63, 0xe2, 0x3c, 0x9d, 0x13, 0x67, 0x36, 0x27,
0xee, 0xe1, 0x9c, 0xb8, 0xef, 0xe7, 0xc4, 0x7d, 0xbe, 0x20, 0xce, 0xe1, 0x82, 0x38, 0x47, 0x0b,
0xe2, 0x3c, 0xfc, 0xb9, 0xfa, 0x81, 0x5e, 0x75, 0xfd, 0x8d, 0xb0, 0xa8, 0x77, 0x6c, 0xeb, 0x4b,
0x00, 0x00, 0x00, 0xff, 0xff, 0x70, 0x5e, 0xd0, 0x13, 0x56, 0x04, 0x00, 0x00,
// 518 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x8a, 0x13, 0x4d,
0x14, 0xed, 0x4e, 0xe6, 0x4b, 0x3e, 0x2b, 0x32, 0x62, 0x31, 0x48, 0x66, 0x94, 0xea, 0x10, 0x10,
0xb2, 0x49, 0xb5, 0x89, 0xe0, 0x62, 0x5c, 0x25, 0x23, 0x8a, 0x42, 0x1c, 0x89, 0xe0, 0xc2, 0x4d,
0xe8, 0x9f, 0xb2, 0x2c, 0x4c, 0xfa, 0x36, 0xa9, 0x4a, 0x98, 0xec, 0x7c, 0x02, 0x99, 0x47, 0x70,
0xed, 0x5a, 0x7c, 0x86, 0xe0, 0x6a, 0x96, 0x59, 0x45, 0x27, 0xd9, 0x88, 0xcb, 0x59, 0xba, 0x92,
0xae, 0xaa, 0x1e, 0x07, 0x15, 0xff, 0x57, 0xdd, 0x75, 0xcf, 0x3d, 0xa7, 0xef, 0x39, 0x7d, 0x0b,
0x5d, 0x8e, 0x40, 0x8e, 0x40, 0xfa, 0x1c, 0xa6, 0xfe, 0xb4, 0x15, 0x32, 0x15, 0xb4, 0x7c, 0x75,
0x40, 0xd3, 0x31, 0x28, 0xc0, 0xd8, 0x80, 0x94, 0xc3, 0x94, 0x5a, 0x70, 0x87, 0x58, 0x42, 0x18,
0x48, 0x76, 0xca, 0x88, 0x40, 0x24, 0x86, 0xb3, 0x73, 0xe5, 0x3b, 0x82, 0x19, 0xdf, 0xa0, 0xdb,
0x06, 0x1d, 0xe8, 0x93, 0x6f, 0xe5, 0x0d, 0xb4, 0xc5, 0x81, 0x83, 0xa9, 0x67, 0x6f, 0x39, 0x81,
0x03, 0xf0, 0x21, 0xf3, 0xf5, 0x29, 0x9c, 0x3c, 0xf1, 0x83, 0x64, 0x66, 0xa0, 0xfa, 0x9b, 0x02,
0xba, 0xd8, 0x93, 0xfc, 0xe1, 0x24, 0x1c, 0x09, 0xf5, 0x60, 0x0c, 0x29, 0xc8, 0x60, 0x88, 0x6f,
0xa2, 0x72, 0x04, 0x89, 0x62, 0x89, 0xaa, 0xba, 0x35, 0xb7, 0x51, 0x69, 0x6f, 0x51, 0x23, 0x41,
0x73, 0x09, 0xda, 0x49, 0x66, 0xdd, 0xca, 0xdb, 0xd7, 0xcd, 0xf2, 0x9e, 0x69, 0xec, 0xe7, 0x0c,
0xfc, 0xc2, 0x45, 0x17, 0x44, 0x22, 0x94, 0x08, 0x86, 0x83, 0x98, 0xa5, 0x20, 0x85, 0xaa, 0x16,
0x6a, 0xc5, 0x46, 0xa5, 0xbd, 0x4d, 0xed, 0xb0, 0x99, 0xef, 0x3c, 0x0c, 0xba, 0x07, 0x22, 0xe9,
0xde, 0x9b, 0x2f, 0x3d, 0xe7, 0x64, 0xe9, 0x5d, 0x9a, 0x05, 0xa3, 0xe1, 0x6e, 0xfd, 0x2b, 0x7e,
0xfd, 0xd5, 0x3b, 0xaf, 0xc1, 0x85, 0x7a, 0x3a, 0x09, 0x69, 0x04, 0x23, 0xeb, 0xd9, 0x3e, 0x9a,
0x32, 0x7e, 0xe6, 0xab, 0x59, 0xca, 0xa4, 0x96, 0x92, 0xfd, 0x4d, 0xcb, 0xbe, 0x65, 0xc8, 0xb8,
0x87, 0xfe, 0x4f, 0xb5, 0x33, 0x36, 0xae, 0x16, 0x6b, 0x6e, 0xe3, 0x7c, 0xb7, 0xf5, 0x69, 0xe9,
0x35, 0x7f, 0x41, 0xaf, 0x13, 0x45, 0x9d, 0x38, 0x1e, 0x33, 0x29, 0xfb, 0xa7, 0x12, 0xbb, 0x1b,
0x1f, 0x5e, 0x7a, 0x6e, 0x7d, 0xe1, 0xa2, 0x72, 0x4f, 0xf2, 0x47, 0xa0, 0x18, 0xbe, 0x8d, 0x2a,
0xa9, 0x8d, 0x6e, 0x20, 0x62, 0x1d, 0xd9, 0x46, 0xf7, 0xea, 0xc7, 0xa5, 0x77, 0xb6, 0x7c, 0xb2,
0xf4, 0xb0, 0x31, 0x77, 0xa6, 0x58, 0xef, 0xa3, 0xfc, 0x74, 0x37, 0xc6, 0x77, 0xd0, 0x7f, 0x53,
0x50, 0x6c, 0x5c, 0x2d, 0xfc, 0xe9, 0x94, 0x86, 0x8f, 0x6f, 0xa0, 0x12, 0xa4, 0x4a, 0x40, 0xa2,
0xfd, 0x6e, 0xb6, 0x09, 0xfd, 0x76, 0x09, 0x69, 0x36, 0xfa, 0xbe, 0xee, 0xea, 0xdb, 0x6e, 0x6b,
0xed, 0xb0, 0x80, 0x50, 0x4f, 0xf2, 0x3c, 0xbe, 0x7f, 0xe5, 0x6e, 0x1f, 0x9d, 0xb3, 0xbf, 0x13,
0xfe, 0xc2, 0xe1, 0x17, 0x0d, 0x1c, 0xa1, 0x52, 0x30, 0x82, 0x49, 0xa2, 0xaa, 0xc5, 0x9f, 0xad,
0xd7, 0xb5, 0x6c, 0xbd, 0x7e, 0x6b, 0x89, 0xac, 0xb4, 0x89, 0xa4, 0x7b, 0x7f, 0x7e, 0x4c, 0x9c,
0xc5, 0x31, 0x71, 0x9e, 0xaf, 0x88, 0x33, 0x5f, 0x11, 0xf7, 0x68, 0x45, 0xdc, 0xf7, 0x2b, 0xe2,
0x1e, 0xae, 0x89, 0x73, 0xb4, 0x26, 0xce, 0x62, 0x4d, 0x9c, 0xc7, 0x3f, 0x56, 0x3f, 0xd0, 0xd7,
0x59, 0x7f, 0x23, 0x2c, 0xe9, 0x7b, 0x74, 0xfd, 0x73, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56, 0x71,
0x86, 0xf1, 0x3a, 0x04, 0x00, 0x00,
}
func (this *MsgSubmitProposal) Equal(that interface{}) bool {
@ -245,7 +245,7 @@ func (this *MsgVote) Equal(that interface{}) bool {
} else if this == nil {
return false
}
if this.ProposalID != that1.ProposalID {
if this.ProposalId != that1.ProposalId {
return false
}
if !bytes.Equal(this.Voter, that1.Voter) {
@ -275,7 +275,7 @@ func (this *MsgDeposit) Equal(that interface{}) bool {
} else if this == nil {
return false
}
if this.ProposalID != that1.ProposalID {
if this.ProposalId != that1.ProposalId {
return false
}
if !bytes.Equal(this.Depositor, that1.Depositor) {
@ -379,8 +379,8 @@ func (m *MsgVote) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if m.ProposalID != 0 {
i = encodeVarintTx(dAtA, i, uint64(m.ProposalID))
if m.ProposalId != 0 {
i = encodeVarintTx(dAtA, i, uint64(m.ProposalId))
i--
dAtA[i] = 0x8
}
@ -428,8 +428,8 @@ func (m *MsgDeposit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if m.ProposalID != 0 {
i = encodeVarintTx(dAtA, i, uint64(m.ProposalID))
if m.ProposalId != 0 {
i = encodeVarintTx(dAtA, i, uint64(m.ProposalId))
i--
dAtA[i] = 0x8
}
@ -476,8 +476,8 @@ func (m *MsgVote) Size() (n int) {
}
var l int
_ = l
if m.ProposalID != 0 {
n += 1 + sovTx(uint64(m.ProposalID))
if m.ProposalId != 0 {
n += 1 + sovTx(uint64(m.ProposalId))
}
l = len(m.Voter)
if l > 0 {
@ -495,8 +495,8 @@ func (m *MsgDeposit) Size() (n int) {
}
var l int
_ = l
if m.ProposalID != 0 {
n += 1 + sovTx(uint64(m.ProposalID))
if m.ProposalId != 0 {
n += 1 + sovTx(uint64(m.ProposalId))
}
l = len(m.Depositor)
if l > 0 {
@ -705,9 +705,9 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ProposalID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ProposalId", wireType)
}
m.ProposalID = 0
m.ProposalId = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTx
@ -717,7 +717,7 @@ func (m *MsgVote) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.ProposalID |= uint64(b&0x7F) << shift
m.ProposalId |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
@ -830,9 +830,9 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ProposalID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ProposalId", wireType)
}
m.ProposalID = 0
m.ProposalId = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowTx
@ -842,7 +842,7 @@ func (m *MsgDeposit) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.ProposalID |= uint64(b&0x7F) << shift
m.ProposalId |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}

2
x/gov/types/vote.go
View File

@ -40,7 +40,7 @@ func (v Votes) String() string {
if len(v) == 0 {
return "[]"
}
out := fmt.Sprintf("Votes for Proposal %d:", v[0].ProposalID)
out := fmt.Sprintf("Votes for Proposal %d:", v[0].ProposalId)
for _, vot := range v {
out += fmt.Sprintf("\n %s: %s", vot.Voter, vot.Option)
}

8
x/ibc-transfer/genesis.go
View File

@ -10,14 +10,14 @@ import (
// InitGenesis binds to portid from genesis state
func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, state types.GenesisState) {
keeper.SetPort(ctx, state.PortID)
keeper.SetPort(ctx, state.PortId)
// Only try to bind to port if it is not already bound, since we may already own
// port capability from capability InitGenesis
if !keeper.IsBound(ctx, state.PortID) {
if !keeper.IsBound(ctx, state.PortId) {
// transfer module binds to the transfer port on InitChain
// and claims the returned capability
err := keeper.BindPort(ctx, state.PortID)
err := keeper.BindPort(ctx, state.PortId)
if err != nil {
panic(fmt.Sprintf("could not claim port capability: %v", err))
}
@ -33,6 +33,6 @@ func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, state types.GenesisState
// ExportGenesis exports transfer module's portID into its geneis state
func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) *types.GenesisState {
return &types.GenesisState{
PortID: keeper.GetPort(ctx),
PortId: keeper.GetPort(ctx),
}
}

2
x/ibc-transfer/simulation/genesis.go
View File

@ -23,7 +23,7 @@ func RandomizedGenState(simState *module.SimulationState) {
)
transferGenesis := types.GenesisState{
PortID: portID,
PortId: portID,
}
fmt.Printf("Selected randomly generated %s parameters:\n%s\n", types.ModuleName, codec.MustMarshalJSONIndent(simState.Cdc, &transferGenesis))

2
x/ibc-transfer/simulation/genesis_test.go
View File

@ -36,7 +36,7 @@ func TestRandomizedGenState(t *testing.T) {
var ibcTransferGenesis types.GenesisState
simState.Cdc.MustUnmarshalJSON(simState.GenState[types.ModuleName], &ibcTransferGenesis)
require.Equal(t, "euzxpfgkqegqiqwixnku", ibcTransferGenesis.PortID)
require.Equal(t, "euzxpfgkqegqiqwixnku", ibcTransferGenesis.PortId)
}

4
x/ibc-transfer/types/genesis.go
View File

@ -7,12 +7,12 @@ import (
// DefaultGenesisState returns a GenesisState with "transfer" as the default PortID.
func DefaultGenesisState() *GenesisState {
return &GenesisState{
PortID: PortID,
PortId: PortID,
}
}
// Validate performs basic genesis state validation returning an error upon any
// failure.
func (gs GenesisState) Validate() error {
return host.PortIdentifierValidator(gs.PortID)
return host.PortIdentifierValidator(gs.PortId)
}

42
x/ibc-transfer/types/genesis.pb.go
View File

@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// GenesisState is currently only used to ensure that the InitGenesis gets run
// by the module manager
type GenesisState struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
}
func (m *GenesisState) Reset() { *m = GenesisState{} }
@ -62,9 +62,9 @@ func (m *GenesisState) XXX_DiscardUnknown() {
var xxx_messageInfo_GenesisState proto.InternalMessageInfo
func (m *GenesisState) GetPortID() string {
func (m *GenesisState) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
@ -76,20 +76,20 @@ func init() {
func init() { proto.RegisterFile("ibc/transfer/genesis.proto", fileDescriptor_c13b8463155e05c2) }
var fileDescriptor_c13b8463155e05c2 = []byte{
// 204 bytes of a gzipped FileDescriptorProto
// 194 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xca, 0x4c, 0x4a, 0xd6,
0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xd2, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c,
0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xc9, 0x4c, 0x4a, 0xd6, 0x83, 0xc9, 0x49, 0x89,
0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x25, 0xf4, 0x41, 0x2c, 0x88, 0x1a, 0x25, 0x57, 0x2e, 0x1e, 0x77,
0x88, 0xa6, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x53, 0x2e, 0xf6, 0x82, 0xfc, 0xa2, 0x92, 0xf8,
0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0x99, 0x47, 0xf7, 0xe4, 0xd9, 0x02, 0xf2,
0x8b, 0x4a, 0x3c, 0x5d, 0x3e, 0xdd, 0x93, 0xe7, 0xab, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0x82, 0x2a,
0x51, 0x0a, 0x62, 0x03, 0xb1, 0x3c, 0x53, 0x9c, 0xbc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48,
0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1,
0x58, 0x8e, 0x21, 0xca, 0x30, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f,
0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x57, 0xe8, 0x67, 0x26,
0x25, 0xeb, 0xc2, 0xdd, 0x5f, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0x9a, 0x31, 0x20,
0x00, 0x00, 0xff, 0xff, 0x2e, 0x43, 0x78, 0xc7, 0xdc, 0x00, 0x00, 0x00,
0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x25, 0xf4, 0x41, 0x2c, 0x88, 0x1a, 0x25, 0x6b, 0x2e, 0x1e, 0x77,
0x88, 0xa6, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x6d, 0x2e, 0xf6, 0x82, 0xfc, 0xa2, 0x92, 0xf8,
0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0xa1, 0x4f, 0xf7, 0xe4, 0xf9, 0x2a, 0x13,
0x73, 0x73, 0xac, 0x94, 0xa0, 0x12, 0x4a, 0x41, 0x6c, 0x20, 0x96, 0x67, 0x8a, 0x93, 0xf7, 0x89,
0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3,
0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26,
0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x27, 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0x43, 0x29, 0xdd, 0xe2, 0x94,
0x6c, 0xfd, 0x0a, 0xfd, 0xcc, 0xa4, 0x64, 0x5d, 0xb8, 0xab, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93,
0xd8, 0xc0, 0x0e, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x68, 0xf3, 0x81, 0x61, 0xd2, 0x00,
0x00, 0x00,
}
func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@ -112,10 +112,10 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -139,7 +139,7 @@ func (m *GenesisState) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovGenesis(uint64(l))
}
@ -183,7 +183,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -211,7 +211,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex

4
x/ibc-transfer/types/genesis_test.go
View File

@ -22,14 +22,14 @@ func TestValidateGenesis(t *testing.T) {
{
"valid genesis",
&types.GenesisState{
PortID: "portidone",
PortId: "portidone",
},
true,
},
{
"invalid client",
&types.GenesisState{
PortID: "(INVALIDPORT)",
PortId: "(INVALIDPORT)",
},
false,
},

6
x/ibc/02-client/genesis.go
View File

@ -17,8 +17,8 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, gs types.GenesisState) {
panic("invalid client state")
}
k.SetClientState(ctx, client.ClientID, cs)
k.SetClientType(ctx, client.ClientID, cs.ClientType())
k.SetClientState(ctx, client.ClientId, cs)
k.SetClientType(ctx, client.ClientId, cs.ClientType())
}
for _, cs := range gs.ClientsConsensus {
@ -28,7 +28,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, gs types.GenesisState) {
panic("invalid consensus state")
}
k.SetClientConsensusState(ctx, cs.ClientID, consensusState.GetHeight(), consensusState)
k.SetClientConsensusState(ctx, cs.ClientId, consensusState.GetHeight(), consensusState)
}
}

2
x/ibc/02-client/keeper/keeper.go
View File

@ -140,7 +140,7 @@ func (k Keeper) GetAllConsensusStates(ctx sdk.Context) types.ClientsConsensusSta
}
clientConsState := types.ClientConsensusStates{
ClientID: clientID,
ClientId: clientID,
ConsensusStates: []*codectypes.Any{anyConsensusState},
}

2
x/ibc/02-client/types/client.go
View File

@ -24,7 +24,7 @@ func NewIdentifiedClientState(clientID string, clientState exported.ClientState)
}
return IdentifiedClientState{
ID: clientID,
Id: clientID,
ClientState: anyClientState,
}
}

42
x/ibc/02-client/types/client.pb.go
View File

@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// IdentifiedClientState defines a client state with additional client identifier field.
type IdentifiedClientState struct {
// client identifier
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id"`
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id"`
ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"`
}
@ -71,23 +71,23 @@ func init() {
func init() { proto.RegisterFile("ibc/client/client.proto", fileDescriptor_226f80e576f20abd) }
var fileDescriptor_226f80e576f20abd = []byte{
// 256 bytes of a gzipped FileDescriptorProto
// 250 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcf, 0x4c, 0x4a, 0xd6,
0x4f, 0xce, 0xc9, 0x4c, 0xcd, 0x2b, 0x81, 0x52, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0x5c,
0x99, 0x49, 0xc9, 0x7a, 0x10, 0x11, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xb0, 0x3e, 0x88,
0x05, 0x51, 0x21, 0x25, 0x99, 0x9e, 0x9f, 0x9f, 0x9e, 0x93, 0xaa, 0x0f, 0xe6, 0x25, 0x95, 0xa6,
0xe9, 0x27, 0xe6, 0x55, 0x42, 0xa4, 0x94, 0xaa, 0xb9, 0x44, 0x3d, 0x53, 0x52, 0xf3, 0x4a, 0x32,
0xd3, 0x32, 0x53, 0x53, 0x9c, 0xc1, 0x86, 0x04, 0x97, 0x24, 0x96, 0xa4, 0x0a, 0x29, 0x73, 0x31,
0x65, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x3a, 0x09, 0x3f, 0xba, 0x27, 0xcf, 0xe4, 0xe9,
0xf2, 0xe9, 0x9e, 0x3c, 0x67, 0x65, 0x62, 0x6e, 0x8e, 0x95, 0x52, 0x66, 0x8a, 0x52, 0x10, 0x53,
0x66, 0x8a, 0x90, 0x39, 0x17, 0x0f, 0xc4, 0xe2, 0xf8, 0x62, 0x90, 0x26, 0x09, 0x26, 0x05, 0x46,
0x0d, 0x6e, 0x23, 0x11, 0x3d, 0x88, 0x7d, 0x7a, 0x30, 0xfb, 0xf4, 0x1c, 0xf3, 0x2a, 0x83, 0xb8,
0x93, 0x11, 0xa6, 0x5b, 0xb1, 0x74, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x39, 0xf1, 0x48, 0x8e, 0xf1,
0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e,
0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xa3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc,
0x5c, 0xfd, 0xe4, 0xfc, 0xe2, 0xdc, 0xfc, 0x62, 0x28, 0xa5, 0x5b, 0x9c, 0x92, 0xad, 0x5f, 0xa1,
0x0f, 0x0a, 0x0b, 0x03, 0x23, 0x5d, 0x68, 0x70, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81,
0xad, 0x33, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x0c, 0x55, 0xf9, 0x29, 0x01, 0x00, 0x00,
0xe9, 0x27, 0xe6, 0x55, 0x42, 0xa4, 0x94, 0x4a, 0xb9, 0x44, 0x3d, 0x53, 0x52, 0xf3, 0x4a, 0x32,
0xd3, 0x32, 0x53, 0x53, 0x9c, 0xc1, 0x86, 0x04, 0x97, 0x24, 0x96, 0xa4, 0x0a, 0xc9, 0x72, 0x31,
0x65, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x3a, 0xf1, 0x7e, 0xba, 0x27, 0xcf, 0x59, 0x99,
0x98, 0x9b, 0x63, 0xa5, 0x94, 0x99, 0xa2, 0x14, 0xc4, 0x94, 0x99, 0x22, 0x64, 0xce, 0xc5, 0x03,
0xb1, 0x32, 0xbe, 0x18, 0xa4, 0x5c, 0x82, 0x49, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x44, 0x0f, 0x62,
0x93, 0x1e, 0xcc, 0x26, 0x3d, 0xc7, 0xbc, 0xca, 0x20, 0xee, 0x64, 0x84, 0xb9, 0x56, 0x2c, 0x1d,
0x0b, 0xe4, 0x19, 0x9c, 0x7c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23,
0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca,
0x28, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37,
0xbf, 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x57, 0xe8, 0x83, 0x42, 0xc1, 0xc0, 0x48, 0x17,
0x1a, 0x10, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xeb, 0x8c, 0x01, 0x01, 0x00, 0x00,
0xff, 0xff, 0x40, 0x46, 0x80, 0x22, 0x23, 0x01, 0x00, 0x00,
}
func (m *IdentifiedClientState) Marshal() (dAtA []byte, err error) {
@ -122,10 +122,10 @@ func (m *IdentifiedClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if len(m.ID) > 0 {
i -= len(m.ID)
copy(dAtA[i:], m.ID)
i = encodeVarintClient(dAtA, i, uint64(len(m.ID)))
if len(m.Id) > 0 {
i -= len(m.Id)
copy(dAtA[i:], m.Id)
i = encodeVarintClient(dAtA, i, uint64(len(m.Id)))
i--
dAtA[i] = 0xa
}
@ -149,7 +149,7 @@ func (m *IdentifiedClientState) Size() (n int) {
}
var l int
_ = l
l = len(m.ID)
l = len(m.Id)
if l > 0 {
n += 1 + l + sovClient(uint64(l))
}
@ -197,7 +197,7 @@ func (m *IdentifiedClientState) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -225,7 +225,7 @@ func (m *IdentifiedClientState) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ID = string(dAtA[iNdEx:postIndex])
m.Id = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {

14
x/ibc/02-client/types/genesis.go
View File

@ -31,7 +31,7 @@ func NewGenesisClientState(clientID string, clientState exported.ClientState) Ge
}
return GenesisClientState{
ClientID: clientID,
ClientId: clientID,
ClientState: anyClientState,
}
}
@ -55,7 +55,7 @@ type ClientsConsensusStates []ClientConsensusStates
func (ccs ClientsConsensusStates) Len() int { return len(ccs) }
// Less implements sort.Interface
func (ccs ClientsConsensusStates) Less(i, j int) bool { return ccs[i].ClientID < ccs[j].ClientID }
func (ccs ClientsConsensusStates) Less(i, j int) bool { return ccs[i].ClientId < ccs[j].ClientId }
// Swap implements sort.Interface
func (ccs ClientsConsensusStates) Swap(i, j int) { ccs[i], ccs[j] = ccs[j], ccs[i] }
@ -85,7 +85,7 @@ func NewClientConsensusStates(clientID string, consensusStates []exported.Consen
}
return ClientConsensusStates{
ClientID: clientID,
ClientId: clientID,
ConsensusStates: anyConsensusStates,
}
}
@ -137,8 +137,8 @@ func (gs GenesisState) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error {
// failure.
func (gs GenesisState) Validate() error {
for i, client := range gs.Clients {
if err := host.ClientIdentifierValidator(client.ClientID); err != nil {
return fmt.Errorf("invalid client consensus state identifier %s index %d: %w", client.ClientID, i, err)
if err := host.ClientIdentifierValidator(client.ClientId); err != nil {
return fmt.Errorf("invalid client consensus state identifier %s index %d: %w", client.ClientId, i, err)
}
clientState, ok := client.ClientState.GetCachedValue().(exported.ClientState)
@ -151,8 +151,8 @@ func (gs GenesisState) Validate() error {
}
for i, cs := range gs.ClientsConsensus {
if err := host.ClientIdentifierValidator(cs.ClientID); err != nil {
return fmt.Errorf("invalid client consensus state identifier %s index %d: %w", cs.ClientID, i, err)
if err := host.ClientIdentifierValidator(cs.ClientId); err != nil {
return fmt.Errorf("invalid client consensus state identifier %s index %d: %w", cs.ClientId, i, err)
}
for _, consensusState := range cs.ConsensusStates {

97
x/ibc/02-client/types/genesis.pb.go
View File

@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// GenesisClientState defines an identified ClientState as protobuf Any format.
type GenesisClientState struct {
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"`
}
@ -63,9 +63,9 @@ func (m *GenesisClientState) XXX_DiscardUnknown() {
var xxx_messageInfo_GenesisClientState proto.InternalMessageInfo
func (m *GenesisClientState) GetClientID() string {
func (m *GenesisClientState) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
@ -79,7 +79,7 @@ func (m *GenesisClientState) GetClientState() *types.Any {
// ClientConsensusStates defines all the stored consensus states for a given client.
type ClientConsensusStates struct {
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
ConsensusStates []*types.Any `protobuf:"bytes,2,rep,name=consensus_states,json=consensusStates,proto3" json:"consensus_states,omitempty" yaml:"consensus_states"`
}
@ -116,9 +116,9 @@ func (m *ClientConsensusStates) XXX_DiscardUnknown() {
var xxx_messageInfo_ClientConsensusStates proto.InternalMessageInfo
func (m *ClientConsensusStates) GetClientID() string {
func (m *ClientConsensusStates) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
@ -200,35 +200,34 @@ func init() {
func init() { proto.RegisterFile("ibc/client/genesis.proto", fileDescriptor_2eb5d7ff040be5c2) }
var fileDescriptor_2eb5d7ff040be5c2 = []byte{
// 445 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xc1, 0x6a, 0xd4, 0x40,
0x18, 0xc7, 0x33, 0x5b, 0xd1, 0xed, 0x74, 0xc1, 0x18, 0xab, 0x8d, 0x15, 0x92, 0x38, 0xa7, 0xf5,
0xd0, 0x19, 0x59, 0x6f, 0x05, 0x05, 0x53, 0x51, 0x0a, 0x3d, 0x48, 0xbc, 0x89, 0xb0, 0x24, 0xb3,
0x63, 0x1a, 0xcc, 0x66, 0x4a, 0x67, 0x16, 0xcc, 0x2b, 0x78, 0xf2, 0x11, 0x04, 0xf1, 0xe2, 0x93,
0xf4, 0xd8, 0xa3, 0xa7, 0x28, 0xd9, 0x37, 0xc8, 0x13, 0x48, 0x66, 0x92, 0xdd, 0x6c, 0xd6, 0x9e,
0x32, 0xf9, 0xbe, 0xef, 0xff, 0xff, 0x7e, 0xfc, 0x87, 0x81, 0x76, 0x12, 0x51, 0x42, 0xd3, 0x84,
0x65, 0x92, 0xc4, 0x2c, 0x63, 0x22, 0x11, 0xf8, 0xe2, 0x92, 0x4b, 0x6e, 0xc1, 0x24, 0xa2, 0x58,
0x77, 0x0e, 0xf7, 0x63, 0x1e, 0x73, 0x55, 0x26, 0xf5, 0x49, 0x4f, 0x1c, 0x3e, 0x8a, 0x39, 0x8f,
0x53, 0x46, 0xd4, 0x5f, 0xb4, 0xf8, 0x44, 0xc2, 0x2c, 0xd7, 0x2d, 0xf4, 0x13, 0x40, 0xeb, 0xad,
0xb6, 0x3b, 0x51, 0x16, 0xef, 0x65, 0x28, 0x99, 0xf5, 0x02, 0xee, 0x6a, 0xc7, 0x69, 0x32, 0xb3,
0x81, 0x07, 0xc6, 0xbb, 0xbe, 0x57, 0x16, 0xee, 0x50, 0xcf, 0x9c, 0xbe, 0xae, 0x0a, 0xd7, 0xcc,
0xc3, 0x79, 0x7a, 0x8c, 0x56, 0x63, 0x28, 0x18, 0xea, 0xf3, 0xe9, 0xcc, 0x7a, 0x07, 0x47, 0x4d,
0x5d, 0xd4, 0x76, 0xf6, 0xc0, 0x03, 0xe3, 0xbd, 0xc9, 0x3e, 0xd6, 0x1c, 0xb8, 0xe5, 0xc0, 0xaf,
0xb2, 0xdc, 0x3f, 0xa8, 0x0a, 0xf7, 0xfe, 0x86, 0x97, 0xd2, 0xa0, 0x60, 0x8f, 0xae, 0x81, 0xd0,
0x77, 0x00, 0x1f, 0xe8, 0xe5, 0x27, 0x3c, 0x13, 0x2c, 0x13, 0x0b, 0xa1, 0x1a, 0xc2, 0x7a, 0xba,
0x8d, 0x3a, 0xea, 0xa2, 0x76, 0xb0, 0x3e, 0x42, 0x93, 0xb6, 0x6a, 0xbd, 0x45, 0xd8, 0x03, 0x6f,
0xe7, 0x46, 0xb4, 0xc7, 0x55, 0xe1, 0x1e, 0x34, 0x68, 0x3d, 0x1d, 0x0a, 0xee, 0xd2, 0x4d, 0x10,
0xf4, 0x63, 0x00, 0x47, 0x4d, 0x94, 0x3a, 0xc4, 0x97, 0xf0, 0x8e, 0x5e, 0x2d, 0x6c, 0xa0, 0xb6,
0x38, 0x78, 0x7d, 0x55, 0x78, 0x3b, 0x75, 0xff, 0xd6, 0x55, 0xe1, 0x1a, 0x41, 0x2b, 0xb2, 0xbe,
0x02, 0x78, 0xaf, 0x39, 0x4f, 0x57, 0xcb, 0x1a, 0xe0, 0x27, 0x5d, 0xab, 0xff, 0x06, 0xe3, 0x1f,
0xd7, 0x6e, 0x55, 0xe1, 0xda, 0xdd, 0x70, 0x3b, 0x4e, 0xe8, 0xd7, 0x1f, 0xf7, 0xa1, 0x96, 0x8a,
0x9e, 0x36, 0x30, 0x69, 0xaf, 0x6e, 0xbd, 0x81, 0x26, 0xbd, 0x64, 0xa1, 0x64, 0xd3, 0x94, 0xd3,
0x30, 0x3d, 0xe7, 0x42, 0xda, 0x3b, 0x1e, 0x18, 0x0f, 0x37, 0x52, 0xea, 0x4d, 0xd4, 0x29, 0xa9,
0xd2, 0x59, 0x5b, 0xf1, 0xcf, 0xae, 0x4a, 0x07, 0x5c, 0x97, 0x0e, 0xf8, 0x5b, 0x3a, 0xe0, 0xdb,
0xd2, 0x31, 0xae, 0x97, 0x8e, 0xf1, 0x7b, 0xe9, 0x18, 0x1f, 0x26, 0x71, 0x22, 0xcf, 0x17, 0x11,
0xa6, 0x7c, 0x4e, 0x28, 0x17, 0x73, 0x2e, 0x9a, 0xcf, 0x91, 0x98, 0x7d, 0x26, 0x5f, 0x48, 0xfd,
0x00, 0x9e, 0x4d, 0x8e, 0x9a, 0x37, 0x20, 0xf3, 0x0b, 0x26, 0xa2, 0xdb, 0xea, 0xbe, 0x9e, 0xff,
0x0b, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x10, 0x3e, 0x4c, 0x1e, 0x03, 0x00, 0x00,
// 432 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbf, 0x8e, 0xd3, 0x30,
0x1c, 0x8e, 0x7b, 0x08, 0xee, 0x7c, 0x27, 0x11, 0x42, 0xe1, 0xc2, 0x9d, 0x94, 0x04, 0x4f, 0x5d,
0xce, 0x86, 0xb2, 0xdd, 0x80, 0x44, 0x4e, 0x02, 0x21, 0xdd, 0x80, 0xc2, 0x86, 0x90, 0xaa, 0xc4,
0x35, 0xb9, 0x88, 0x34, 0xae, 0x6a, 0x57, 0x22, 0xaf, 0xc0, 0x84, 0xd8, 0x98, 0xd9, 0x78, 0x92,
0x8e, 0x1d, 0x99, 0x02, 0x6a, 0xdf, 0x20, 0x4f, 0x80, 0x62, 0x27, 0x6d, 0x9a, 0x72, 0x53, 0x9c,
0xef, 0xf7, 0xfb, 0xfe, 0xe8, 0xb3, 0xa1, 0x9d, 0x44, 0x94, 0xd0, 0x34, 0x61, 0x99, 0x24, 0x31,
0xcb, 0x98, 0x48, 0x04, 0x9e, 0xce, 0xb8, 0xe4, 0x16, 0x4c, 0x22, 0x8a, 0xf5, 0xe4, 0xac, 0x1f,
0xf3, 0x98, 0x2b, 0x98, 0x54, 0x27, 0xbd, 0x71, 0xf6, 0x24, 0xe6, 0x3c, 0x4e, 0x19, 0x51, 0x7f,
0xd1, 0xfc, 0x13, 0x09, 0xb3, 0x5c, 0x8f, 0xd0, 0x0f, 0x00, 0xad, 0x37, 0x5a, 0xee, 0x4a, 0x49,
0xbc, 0x97, 0xa1, 0x64, 0xd6, 0x73, 0x78, 0xa4, 0x15, 0x47, 0xc9, 0xd8, 0x06, 0x1e, 0x18, 0x1c,
0xf9, 0xfd, 0xb2, 0x70, 0xcd, 0x3c, 0x9c, 0xa4, 0x97, 0x68, 0x33, 0x42, 0xc1, 0xa1, 0x3e, 0xbf,
0x1d, 0x5b, 0xef, 0xe0, 0x49, 0x8d, 0x8b, 0x4a, 0xc2, 0xee, 0x79, 0x60, 0x70, 0x3c, 0xec, 0x63,
0xed, 0x8d, 0x1b, 0x6f, 0xfc, 0x2a, 0xcb, 0xfd, 0xd3, 0xb2, 0x70, 0x1f, 0xee, 0x68, 0x29, 0x0e,
0x0a, 0x8e, 0xe9, 0x36, 0x04, 0xfa, 0x0e, 0xe0, 0x23, 0x1d, 0xea, 0x8a, 0x67, 0x82, 0x65, 0x62,
0x2e, 0xd4, 0x40, 0x58, 0xe7, 0x7b, 0xf1, 0x5a, 0x41, 0x3e, 0x42, 0x93, 0x36, 0xfb, 0x5a, 0x57,
0xd8, 0x3d, 0xef, 0xe0, 0xd6, 0x30, 0xe7, 0x65, 0xe1, 0x9e, 0xd6, 0x61, 0x3a, 0x3c, 0x14, 0xdc,
0xa7, 0xbb, 0xd6, 0xe8, 0x67, 0x0f, 0x9e, 0xd4, 0x85, 0xe9, 0xaa, 0x5e, 0xc2, 0x7b, 0xda, 0x5a,
0xd8, 0x40, 0xb9, 0x38, 0x78, 0x7b, 0x21, 0x78, 0xbf, 0x5b, 0xff, 0xce, 0xa2, 0x70, 0x8d, 0xa0,
0x21, 0x59, 0x5f, 0x01, 0x7c, 0x50, 0x9f, 0x47, 0x1b, 0xb3, 0x3a, 0xf0, 0xd3, 0xb6, 0xd4, 0x7f,
0xab, 0xf0, 0x2f, 0x2b, 0xb5, 0xb2, 0x70, 0xed, 0x76, 0x9d, 0x2d, 0x25, 0xf4, 0xeb, 0x8f, 0xfb,
0x58, 0x53, 0x45, 0x87, 0x1b, 0x98, 0xb4, 0x83, 0x5b, 0xaf, 0xa1, 0x49, 0x67, 0x2c, 0x94, 0x6c,
0x94, 0x72, 0x1a, 0xa6, 0x37, 0x5c, 0x48, 0xfb, 0xc0, 0x03, 0x83, 0xc3, 0x9d, 0x96, 0x3a, 0x1b,
0x55, 0x4b, 0x0a, 0xba, 0x6e, 0x10, 0xff, 0x7a, 0xb1, 0x72, 0xc0, 0x72, 0xe5, 0x80, 0xbf, 0x2b,
0x07, 0x7c, 0x5b, 0x3b, 0xc6, 0x72, 0xed, 0x18, 0xbf, 0xd7, 0x8e, 0xf1, 0x61, 0x18, 0x27, 0xf2,
0x66, 0x1e, 0x61, 0xca, 0x27, 0x84, 0x72, 0x31, 0xe1, 0xa2, 0xfe, 0x5c, 0x88, 0xf1, 0x67, 0xf2,
0x85, 0x54, 0xcf, 0xfc, 0xd9, 0xf0, 0xa2, 0x7e, 0xe9, 0x32, 0x9f, 0x32, 0x11, 0xdd, 0x55, 0xf7,
0xf5, 0xe2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x63, 0xf9, 0x67, 0x68, 0x04, 0x03, 0x00, 0x00,
}
func (m *GenesisClientState) Marshal() (dAtA []byte, err error) {
@ -263,10 +262,10 @@ func (m *GenesisClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -307,10 +306,10 @@ func (m *ClientConsensusStates) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x12
}
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -395,7 +394,7 @@ func (m *GenesisClientState) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovGenesis(uint64(l))
}
@ -412,7 +411,7 @@ func (m *ClientConsensusStates) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovGenesis(uint64(l))
}
@ -486,7 +485,7 @@ func (m *GenesisClientState) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -514,7 +513,7 @@ func (m *GenesisClientState) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
@ -607,7 +606,7 @@ func (m *ClientConsensusStates) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -635,7 +634,7 @@ func (m *ClientConsensusStates) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {

16
x/ibc/03-connection/client/utils/utils.go
View File

@ -30,7 +30,7 @@ func QueryConnection(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryConnectionRequest{
ConnectionID: connectionID,
ConnectionId: connectionID,
}
return queryClient.Connection(context.Background(), req)
@ -73,7 +73,7 @@ func QueryClientConnections(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryClientConnectionsRequest{
ClientID: clientID,
ClientId: clientID,
}
return queryClient.ClientConnections(context.Background(), req)
@ -113,7 +113,7 @@ func QueryConnectionClientState(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryConnectionClientStateRequest{
ConnectionID: connectionID,
ConnectionId: connectionID,
}
res, err := queryClient.ConnectionClientState(context.Background(), req)
@ -122,13 +122,13 @@ func QueryConnectionClientState(
}
if prove {
clientState, proof, proofHeight, err := clientutils.QueryClientStateABCI(clientCtx, res.IdentifiedClientState.ID)
clientState, proof, proofHeight, err := clientutils.QueryClientStateABCI(clientCtx, res.IdentifiedClientState.Id)
if err != nil {
return nil, err
}
// use client state returned from ABCI query in case query height differs
identifiedClientState := clienttypes.NewIdentifiedClientState(res.IdentifiedClientState.ID, clientState)
identifiedClientState := clienttypes.NewIdentifiedClientState(res.IdentifiedClientState.Id, clientState)
res = types.NewQueryConnectionClientStateResponse(identifiedClientState, proof, int64(proofHeight))
}
@ -144,7 +144,7 @@ func QueryConnectionConsensusState(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryConnectionConsensusStateRequest{
ConnectionID: connectionID,
ConnectionId: connectionID,
Height: height,
}
@ -159,7 +159,7 @@ func QueryConnectionConsensusState(
}
if prove {
consensusState, proof, proofHeight, err := clientutils.QueryConsensusStateABCI(clientCtx, res.ClientID, consensusState.GetHeight())
consensusState, proof, proofHeight, err := clientutils.QueryConsensusStateABCI(clientCtx, res.ClientId, consensusState.GetHeight())
if err != nil {
return nil, err
}
@ -170,7 +170,7 @@ func QueryConnectionConsensusState(
return nil, err
}
res = types.NewQueryConnectionConsensusStateResponse(res.ClientID, anyConsensusState, consensusState.GetHeight(), proof, int64(proofHeight))
res = types.NewQueryConnectionConsensusStateResponse(res.ClientId, anyConsensusState, consensusState.GetHeight(), proof, int64(proofHeight))
}
return res, nil

6
x/ibc/03-connection/genesis.go
View File

@ -10,11 +10,11 @@ import (
// state.
func InitGenesis(ctx sdk.Context, k keeper.Keeper, gs types.GenesisState) {
for _, connection := range gs.Connections {
conn := types.NewConnectionEnd(connection.State, connection.ClientID, connection.Counterparty, connection.Versions)
k.SetConnection(ctx, connection.ID, conn)
conn := types.NewConnectionEnd(connection.State, connection.ClientId, connection.Counterparty, connection.Versions)
k.SetConnection(ctx, connection.Id, conn)
}
for _, connPaths := range gs.ClientConnectionPaths {
k.SetClientConnectionPaths(ctx, connPaths.ClientID, connPaths.Paths)
k.SetClientConnectionPaths(ctx, connPaths.ClientId, connPaths.Paths)
}
}

44
x/ibc/03-connection/handler.go
View File

@ -10,7 +10,7 @@ import (
// HandleMsgConnectionOpenInit defines the sdk.Handler for MsgConnectionOpenInit
func HandleMsgConnectionOpenInit(ctx sdk.Context, k keeper.Keeper, msg *types.MsgConnectionOpenInit) (*sdk.Result, error) {
if err := k.ConnOpenInit(
ctx, msg.ConnectionID, msg.ClientID, msg.Counterparty,
ctx, msg.ConnectionId, msg.ClientId, msg.Counterparty,
); err != nil {
return nil, sdkerrors.Wrap(err, "connection handshake open init failed")
}
@ -18,10 +18,10 @@ func HandleMsgConnectionOpenInit(ctx sdk.Context, k keeper.Keeper, msg *types.Ms
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeConnectionOpenInit,
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionID),
sdk.NewAttribute(types.AttributeKeyClientID, msg.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, msg.Counterparty.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, msg.Counterparty.ConnectionID),
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionId),
sdk.NewAttribute(types.AttributeKeyClientID, msg.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, msg.Counterparty.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, msg.Counterparty.ConnectionId),
),
sdk.NewEvent(
sdk.EventTypeMessage,
@ -37,7 +37,7 @@ func HandleMsgConnectionOpenInit(ctx sdk.Context, k keeper.Keeper, msg *types.Ms
// HandleMsgConnectionOpenTry defines the sdk.Handler for MsgConnectionOpenTry
func HandleMsgConnectionOpenTry(ctx sdk.Context, k keeper.Keeper, msg *types.MsgConnectionOpenTry) (*sdk.Result, error) {
if err := k.ConnOpenTry(
ctx, msg.ConnectionID, msg.Counterparty, msg.ClientID,
ctx, msg.ConnectionId, msg.Counterparty, msg.ClientId,
msg.CounterpartyVersions, msg.ProofInit, msg.ProofConsensus,
msg.ProofHeight, msg.ConsensusHeight,
); err != nil {
@ -47,10 +47,10 @@ func HandleMsgConnectionOpenTry(ctx sdk.Context, k keeper.Keeper, msg *types.Msg
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeConnectionOpenTry,
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionID),
sdk.NewAttribute(types.AttributeKeyClientID, msg.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, msg.Counterparty.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, msg.Counterparty.ConnectionID),
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionId),
sdk.NewAttribute(types.AttributeKeyClientID, msg.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, msg.Counterparty.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, msg.Counterparty.ConnectionId),
),
sdk.NewEvent(
sdk.EventTypeMessage,
@ -66,21 +66,21 @@ func HandleMsgConnectionOpenTry(ctx sdk.Context, k keeper.Keeper, msg *types.Msg
// HandleMsgConnectionOpenAck defines the sdk.Handler for MsgConnectionOpenAck
func HandleMsgConnectionOpenAck(ctx sdk.Context, k keeper.Keeper, msg *types.MsgConnectionOpenAck) (*sdk.Result, error) {
if err := k.ConnOpenAck(
ctx, msg.ConnectionID, msg.Version, msg.ProofTry, msg.ProofConsensus,
ctx, msg.ConnectionId, msg.Version, msg.ProofTry, msg.ProofConsensus,
msg.ProofHeight, msg.ConsensusHeight,
); err != nil {
return nil, sdkerrors.Wrap(err, "connection handshake open ack failed")
}
connectionEnd, _ := k.GetConnection(ctx, msg.ConnectionID)
connectionEnd, _ := k.GetConnection(ctx, msg.ConnectionId)
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeConnectionOpenAck,
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionID),
sdk.NewAttribute(types.AttributeKeyClientID, connectionEnd.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, connectionEnd.Counterparty.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, connectionEnd.Counterparty.ConnectionID),
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionId),
sdk.NewAttribute(types.AttributeKeyClientID, connectionEnd.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, connectionEnd.Counterparty.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, connectionEnd.Counterparty.ConnectionId),
),
sdk.NewEvent(
sdk.EventTypeMessage,
@ -96,20 +96,20 @@ func HandleMsgConnectionOpenAck(ctx sdk.Context, k keeper.Keeper, msg *types.Msg
// HandleMsgConnectionOpenConfirm defines the sdk.Handler for MsgConnectionOpenConfirm
func HandleMsgConnectionOpenConfirm(ctx sdk.Context, k keeper.Keeper, msg *types.MsgConnectionOpenConfirm) (*sdk.Result, error) {
if err := k.ConnOpenConfirm(
ctx, msg.ConnectionID, msg.ProofAck, msg.ProofHeight,
ctx, msg.ConnectionId, msg.ProofAck, msg.ProofHeight,
); err != nil {
return nil, sdkerrors.Wrap(err, "connection handshake open confirm failed")
}
connectionEnd, _ := k.GetConnection(ctx, msg.ConnectionID)
connectionEnd, _ := k.GetConnection(ctx, msg.ConnectionId)
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeConnectionOpenConfirm,
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionID),
sdk.NewAttribute(types.AttributeKeyClientID, connectionEnd.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, connectionEnd.Counterparty.ClientID),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, connectionEnd.Counterparty.ConnectionID),
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.ConnectionId),
sdk.NewAttribute(types.AttributeKeyClientID, connectionEnd.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyClientID, connectionEnd.Counterparty.ClientId),
sdk.NewAttribute(types.AttributeKeyCounterpartyConnectionID, connectionEnd.Counterparty.ConnectionId),
),
sdk.NewEvent(
sdk.EventTypeMessage,

36
x/ibc/03-connection/keeper/grpc_query.go
View File

@ -23,16 +23,16 @@ func (q Keeper) Connection(c context.Context, req *types.QueryConnectionRequest)
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := host.ConnectionIdentifierValidator(req.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(req.ConnectionId); err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
ctx := sdk.UnwrapSDKContext(c)
connection, found := q.GetConnection(ctx, req.ConnectionID)
connection, found := q.GetConnection(ctx, req.ConnectionId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrap(types.ErrConnectionNotFound, req.ConnectionID).Error(),
sdkerrors.Wrap(types.ErrConnectionNotFound, req.ConnectionId).Error(),
)
}
@ -86,16 +86,16 @@ func (q Keeper) ClientConnections(c context.Context, req *types.QueryClientConne
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := host.ClientIdentifierValidator(req.ClientID); err != nil {
if err := host.ClientIdentifierValidator(req.ClientId); err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
ctx := sdk.UnwrapSDKContext(c)
clientConnectionPaths, found := q.GetClientConnectionPaths(ctx, req.ClientID)
clientConnectionPaths, found := q.GetClientConnectionPaths(ctx, req.ClientId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrap(types.ErrClientConnectionPathsNotFound, req.ClientID).Error(),
sdkerrors.Wrap(types.ErrClientConnectionPathsNotFound, req.ClientId).Error(),
)
}
@ -111,29 +111,29 @@ func (q Keeper) ConnectionClientState(c context.Context, req *types.QueryConnect
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := host.ConnectionIdentifierValidator(req.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(req.ConnectionId); err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
ctx := sdk.UnwrapSDKContext(c)
connection, found := q.GetConnection(ctx, req.ConnectionID)
connection, found := q.GetConnection(ctx, req.ConnectionId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(types.ErrConnectionNotFound, "connection-id: %s", req.ConnectionID).Error(),
sdkerrors.Wrapf(types.ErrConnectionNotFound, "connection-id: %s", req.ConnectionId).Error(),
)
}
clientState, found := q.clientKeeper.GetClientState(ctx, connection.ClientID)
clientState, found := q.clientKeeper.GetClientState(ctx, connection.ClientId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(clienttypes.ErrClientNotFound, "client-id: %s", connection.ClientID).Error(),
sdkerrors.Wrapf(clienttypes.ErrClientNotFound, "client-id: %s", connection.ClientId).Error(),
)
}
identifiedClientState := clienttypes.NewIdentifiedClientState(connection.ClientID, clientState)
identifiedClientState := clienttypes.NewIdentifiedClientState(connection.ClientId, clientState)
return types.NewQueryConnectionClientStateResponse(identifiedClientState, nil, ctx.BlockHeight()), nil
@ -145,25 +145,25 @@ func (q Keeper) ConnectionConsensusState(c context.Context, req *types.QueryConn
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := host.ConnectionIdentifierValidator(req.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(req.ConnectionId); err != nil {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
ctx := sdk.UnwrapSDKContext(c)
connection, found := q.GetConnection(ctx, req.ConnectionID)
connection, found := q.GetConnection(ctx, req.ConnectionId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(types.ErrConnectionNotFound, "connection-id: %s", req.ConnectionID).Error(),
sdkerrors.Wrapf(types.ErrConnectionNotFound, "connection-id: %s", req.ConnectionId).Error(),
)
}
consensusState, found := q.clientKeeper.GetClientConsensusState(ctx, connection.ClientID, req.Height)
consensusState, found := q.clientKeeper.GetClientConsensusState(ctx, connection.ClientId, req.Height)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(clienttypes.ErrConsensusStateNotFound, "client-id: %s", connection.ClientID).Error(),
sdkerrors.Wrapf(clienttypes.ErrConsensusStateNotFound, "client-id: %s", connection.ClientId).Error(),
)
}
@ -172,5 +172,5 @@ func (q Keeper) ConnectionConsensusState(c context.Context, req *types.QueryConn
return nil, status.Error(codes.Internal, err.Error())
}
return types.NewQueryConnectionConsensusStateResponse(connection.ClientID, anyConsensusState, consensusState.GetHeight(), nil, ctx.BlockHeight()), nil
return types.NewQueryConnectionConsensusStateResponse(connection.ClientId, anyConsensusState, consensusState.GetHeight(), nil, ctx.BlockHeight()), nil
}

26
x/ibc/03-connection/keeper/grpc_query_test.go
View File

@ -38,7 +38,7 @@ func (suite *KeeperTestSuite) TestQueryConnection() {
{"connection not found",
func() {
req = &types.QueryConnectionRequest{
ConnectionID: ibctesting.InvalidID,
ConnectionId: ibctesting.InvalidID,
}
},
false,
@ -55,7 +55,7 @@ func (suite *KeeperTestSuite) TestQueryConnection() {
suite.chainA.App.IBCKeeper.ConnectionKeeper.SetConnection(suite.chainA.GetContext(), connA.ID, expConnection)
req = &types.QueryConnectionRequest{
ConnectionID: connA.ID,
ConnectionId: connA.ID,
}
},
true,
@ -188,7 +188,7 @@ func (suite *KeeperTestSuite) TestQueryClientConnections() {
{"connection not found",
func() {
req = &types.QueryClientConnectionsRequest{
ClientID: ibctesting.InvalidID,
ClientId: ibctesting.InvalidID,
}
},
false,
@ -202,7 +202,7 @@ func (suite *KeeperTestSuite) TestQueryClientConnections() {
suite.chainA.App.IBCKeeper.ConnectionKeeper.SetClientConnectionPaths(suite.chainA.GetContext(), clientA, expPaths)
req = &types.QueryClientConnectionsRequest{
ClientID: clientA,
ClientId: clientA,
}
},
true,
@ -251,7 +251,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionClientState() {
"invalid connection ID",
func() {
req = &types.QueryConnectionClientStateRequest{
ConnectionID: "",
ConnectionId: "",
}
},
false,
@ -260,7 +260,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionClientState() {
"connection not found",
func() {
req = &types.QueryConnectionClientStateRequest{
ConnectionID: "test-connection-id",
ConnectionId: "test-connection-id",
}
},
false,
@ -274,7 +274,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionClientState() {
suite.chainA.App.IBCKeeper.ConnectionKeeper.SetConnection(suite.chainA.GetContext(), connA.ID, types.ConnectionEnd{})
req = &types.QueryConnectionClientStateRequest{
ConnectionID: connA.ID,
ConnectionId: connA.ID,
}
}, false,
},
@ -287,7 +287,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionClientState() {
expIdentifiedClientState = clienttypes.NewIdentifiedClientState(clientA, expClientState)
req = &types.QueryConnectionClientStateRequest{
ConnectionID: connA.ID,
ConnectionId: connA.ID,
}
},
true,
@ -337,7 +337,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() {
"invalid connection ID",
func() {
req = &types.QueryConnectionConsensusStateRequest{
ConnectionID: "",
ConnectionId: "",
Height: 1,
}
},
@ -347,7 +347,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() {
"connection not found",
func() {
req = &types.QueryConnectionConsensusStateRequest{
ConnectionID: "test-connection-id",
ConnectionId: "test-connection-id",
Height: 1,
}
},
@ -359,7 +359,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() {
_, _, connA, _, _, _ := suite.coordinator.Setup(suite.chainA, suite.chainB)
req = &types.QueryConnectionConsensusStateRequest{
ConnectionID: connA.ID,
ConnectionId: connA.ID,
Height: uint64(suite.chainA.GetContext().BlockHeight()), // use current height
}
}, false,
@ -375,7 +375,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() {
expClientID = clientA
req = &types.QueryConnectionConsensusStateRequest{
ConnectionID: connA.ID,
ConnectionId: connA.ID,
Height: expConsensusState.GetHeight(),
}
},
@ -398,7 +398,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionConsensusState() {
consensusState, err := clienttypes.UnpackConsensusState(res.ConsensusState)
suite.Require().NoError(err)
suite.Require().Equal(expConsensusState, consensusState)
suite.Require().Equal(expClientID, res.ClientID)
suite.Require().Equal(expClientID, res.ClientId)
} else {
suite.Require().Error(err)
}

22
x/ibc/03-connection/keeper/handshake.go
View File

@ -70,7 +70,7 @@ func (k Keeper) ConnOpenTry(
// NOTE: chain A's counterparty is chain B (i.e where this code is executed)
prefix := k.GetCommitmentPrefix()
expectedCounterparty := types.NewCounterparty(clientID, connectionID, commitmenttypes.NewMerklePrefix(prefix.Bytes()))
expectedConnection := types.NewConnectionEnd(types.INIT, counterparty.ClientID, expectedCounterparty, counterpartyVersions)
expectedConnection := types.NewConnectionEnd(types.INIT, counterparty.ClientId, expectedCounterparty, counterpartyVersions)
// chain B picks a version from Chain A's available versions that is compatible
// with the supported IBC versions
@ -84,7 +84,7 @@ func (k Keeper) ConnOpenTry(
// Check that ChainA committed expectedConnectionEnd to its state
if err := k.VerifyConnectionState(
ctx, connection, proofHeight, proofInit, counterparty.ConnectionID,
ctx, connection, proofHeight, proofInit, counterparty.ConnectionId,
expectedConnection,
); err != nil {
return err
@ -102,10 +102,10 @@ func (k Keeper) ConnOpenTry(
// Check that existing connection version is on desired version of current handshake
previousConnection, found := k.GetConnection(ctx, connectionID)
if found && !(previousConnection.State == types.INIT &&
previousConnection.Counterparty.ConnectionID == counterparty.ConnectionID &&
previousConnection.Counterparty.ConnectionId == counterparty.ConnectionId &&
bytes.Equal(previousConnection.Counterparty.Prefix.Bytes(), counterparty.Prefix.Bytes()) &&
previousConnection.ClientID == clientID &&
previousConnection.Counterparty.ClientID == counterparty.ClientID &&
previousConnection.ClientId == clientID &&
previousConnection.Counterparty.ClientId == counterparty.ClientId &&
previousConnection.Versions[0] == version) {
return sdkerrors.Wrap(types.ErrInvalidConnection, "cannot relay connection attempt")
}
@ -182,12 +182,12 @@ func (k Keeper) ConnOpenAck(
}
prefix := k.GetCommitmentPrefix()
expectedCounterparty := types.NewCounterparty(connection.ClientID, connectionID, commitmenttypes.NewMerklePrefix(prefix.Bytes()))
expectedConnection := types.NewConnectionEnd(types.TRYOPEN, connection.Counterparty.ClientID, expectedCounterparty, []string{encodedVersion})
expectedCounterparty := types.NewCounterparty(connection.ClientId, connectionID, commitmenttypes.NewMerklePrefix(prefix.Bytes()))
expectedConnection := types.NewConnectionEnd(types.TRYOPEN, connection.Counterparty.ClientId, expectedCounterparty, []string{encodedVersion})
// Ensure that ChainB stored expected connectionEnd in its state during ConnOpenTry
if err := k.VerifyConnectionState(
ctx, connection, proofHeight, proofTry, connection.Counterparty.ConnectionID,
ctx, connection, proofHeight, proofTry, connection.Counterparty.ConnectionId,
expectedConnection,
); err != nil {
return err
@ -234,12 +234,12 @@ func (k Keeper) ConnOpenConfirm(
}
prefix := k.GetCommitmentPrefix()
expectedCounterparty := types.NewCounterparty(connection.ClientID, connectionID, commitmenttypes.NewMerklePrefix(prefix.Bytes()))
expectedConnection := types.NewConnectionEnd(types.OPEN, connection.Counterparty.ClientID, expectedCounterparty, connection.Versions)
expectedCounterparty := types.NewCounterparty(connection.ClientId, connectionID, commitmenttypes.NewMerklePrefix(prefix.Bytes()))
expectedConnection := types.NewConnectionEnd(types.OPEN, connection.Counterparty.ClientId, expectedCounterparty, connection.Versions)
// Check that connection on ChainA is open
if err := k.VerifyConnectionState(
ctx, connection, proofHeight, proofAck, connection.Counterparty.ConnectionID,
ctx, connection, proofHeight, proofAck, connection.Counterparty.ConnectionId,
expectedConnection,
); err != nil {
return err

14
x/ibc/03-connection/keeper/verify_test.go
View File

@ -70,7 +70,7 @@ func (suite *KeeperTestSuite) TestVerifyClientConsensusState() {
connection := suite.chainA.GetConnection(connA)
if changeClientID {
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
}
proof, consensusHeight := suite.chainB.QueryConsensusStateProof(connB.ClientID)
@ -118,7 +118,7 @@ func (suite *KeeperTestSuite) TestVerifyConnectionState() {
connection := suite.chainA.GetConnection(connA)
if tc.changeClientID {
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
}
expectedConnection := suite.chainB.GetConnection(connB)
@ -168,7 +168,7 @@ func (suite *KeeperTestSuite) TestVerifyChannelState() {
_, _, connA, _, _, channelB := suite.coordinator.Setup(suite.chainA, suite.chainB)
connection := suite.chainA.GetConnection(connA)
if tc.changeClientID {
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
}
channelKey := host.KeyChannel(channelB.PortID, channelB.ID)
@ -219,7 +219,7 @@ func (suite *KeeperTestSuite) TestVerifyPacketCommitment() {
_, clientB, _, connB, channelA, channelB := suite.coordinator.Setup(suite.chainA, suite.chainB)
connection := suite.chainB.GetConnection(connB)
if tc.changeClientID {
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
}
packet := channeltypes.NewPacket(ibctesting.TestHash, 1, channelA.PortID, channelA.ID, channelB.PortID, channelB.ID, 100000, 0)
@ -273,7 +273,7 @@ func (suite *KeeperTestSuite) TestVerifyPacketAcknowledgement() {
clientA, clientB, connA, _, channelA, channelB := suite.coordinator.Setup(suite.chainA, suite.chainB)
connection := suite.chainA.GetConnection(connA)
if tc.changeClientID {
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
}
// send and receive packet
@ -332,7 +332,7 @@ func (suite *KeeperTestSuite) TestVerifyPacketAcknowledgementAbsence() {
clientA, clientB, connA, _, channelA, channelB := suite.coordinator.Setup(suite.chainA, suite.chainB)
connection := suite.chainA.GetConnection(connA)
if tc.changeClientID {
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
}
// send, only receive if specified
@ -392,7 +392,7 @@ func (suite *KeeperTestSuite) TestVerifyNextSequenceRecv() {
clientA, clientB, connA, _, channelA, channelB := suite.coordinator.Setup(suite.chainA, suite.chainB)
connection := suite.chainA.GetConnection(connA)
if tc.changeClientID {
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
}
// send and receive packet

4
x/ibc/03-connection/simulation/decoder_test.go
View File

@ -20,7 +20,7 @@ func TestDecodeStore(t *testing.T) {
connectionID := "connectionidone"
connection := types.ConnectionEnd{
ClientID: "clientidone",
ClientId: "clientidone",
Versions: []string{"1.0"},
}
@ -31,7 +31,7 @@ func TestDecodeStore(t *testing.T) {
kvPairs := kv.Pairs{
Pairs: []kv.Pair{
{
Key: host.KeyClientConnections(connection.ClientID),
Key: host.KeyClientConnections(connection.ClientId),
Value: cdc.MustMarshalBinaryBare(&paths),
},
{

26
x/ibc/03-connection/types/connection.go
View File

@ -13,7 +13,7 @@ var _ exported.ConnectionI = (*ConnectionEnd)(nil)
// NewConnectionEnd creates a new ConnectionEnd instance.
func NewConnectionEnd(state State, clientID string, counterparty Counterparty, versions []string) ConnectionEnd {
return ConnectionEnd{
ClientID: clientID,
ClientId: clientID,
Versions: versions,
State: state,
Counterparty: counterparty,
@ -27,7 +27,7 @@ func (c ConnectionEnd) GetState() int32 {
// GetClientID implements the Connection interface
func (c ConnectionEnd) GetClientID() string {
return c.ClientID
return c.ClientId
}
// GetCounterparty implements the Connection interface
@ -44,7 +44,7 @@ func (c ConnectionEnd) GetVersions() []string {
// NOTE: the protocol supports that the connection and client IDs match the
// counterparty's.
func (c ConnectionEnd) ValidateBasic() error {
if err := host.ClientIdentifierValidator(c.ClientID); err != nil {
if err := host.ClientIdentifierValidator(c.ClientId); err != nil {
return sdkerrors.Wrap(err, "invalid client ID")
}
if len(c.Versions) == 0 {
@ -63,20 +63,20 @@ var _ exported.CounterpartyI = (*Counterparty)(nil)
// NewCounterparty creates a new Counterparty instance.
func NewCounterparty(clientID, connectionID string, prefix commitmenttypes.MerklePrefix) Counterparty {
return Counterparty{
ClientID: clientID,
ConnectionID: connectionID,
ClientId: clientID,
ConnectionId: connectionID,
Prefix: prefix,
}
}
// GetClientID implements the CounterpartyI interface
func (c Counterparty) GetClientID() string {
return c.ClientID
return c.ClientId
}
// GetConnectionID implements the CounterpartyI interface
func (c Counterparty) GetConnectionID() string {
return c.ConnectionID
return c.ConnectionId
}
// GetPrefix implements the CounterpartyI interface
@ -86,10 +86,10 @@ func (c Counterparty) GetPrefix() commitmentexported.Prefix {
// ValidateBasic performs a basic validation check of the identifiers and prefix
func (c Counterparty) ValidateBasic() error {
if err := host.ConnectionIdentifierValidator(c.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(c.ConnectionId); err != nil {
return sdkerrors.Wrap(err, "invalid counterparty connection ID")
}
if err := host.ClientIdentifierValidator(c.ClientID); err != nil {
if err := host.ClientIdentifierValidator(c.ClientId); err != nil {
return sdkerrors.Wrap(err, "invalid counterparty client ID")
}
if c.Prefix.Empty() {
@ -101,8 +101,8 @@ func (c Counterparty) ValidateBasic() error {
// NewIdentifiedConnection creates a new IdentifiedConnection instance
func NewIdentifiedConnection(connectionID string, conn ConnectionEnd) IdentifiedConnection {
return IdentifiedConnection{
ID: connectionID,
ClientID: conn.ClientID,
Id: connectionID,
ClientId: conn.ClientId,
Versions: conn.Versions,
State: conn.State,
Counterparty: conn.Counterparty,
@ -111,9 +111,9 @@ func NewIdentifiedConnection(connectionID string, conn ConnectionEnd) Identified
// ValidateBasic performs a basic validation of the connection identifier and connection fields.
func (ic IdentifiedConnection) ValidateBasic() error {
if err := host.ConnectionIdentifierValidator(ic.ID); err != nil {
if err := host.ConnectionIdentifierValidator(ic.Id); err != nil {
return sdkerrors.Wrap(err, "invalid connection ID")
}
connection := NewConnectionEnd(ic.State, ic.ClientID, ic.Counterparty, ic.Versions)
connection := NewConnectionEnd(ic.State, ic.ClientId, ic.Counterparty, ic.Versions)
return connection.ValidateBasic()
}

339
x/ibc/03-connection/types/connection.pb.go
View File

@ -66,8 +66,8 @@ func (State) EnumDescriptor() ([]byte, []int) {
// MsgConnectionOpenInit defines the msg sent by an account on Chain A to
// initialize a connection with Chain B.
type MsgConnectionOpenInit struct {
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ConnectionID string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
Counterparty Counterparty `protobuf:"bytes,3,opt,name=counterparty,proto3" json:"counterparty"`
Signer github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,4,opt,name=signer,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"signer,omitempty"`
}
@ -105,16 +105,16 @@ func (m *MsgConnectionOpenInit) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgConnectionOpenInit proto.InternalMessageInfo
func (m *MsgConnectionOpenInit) GetClientID() string {
func (m *MsgConnectionOpenInit) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
func (m *MsgConnectionOpenInit) GetConnectionID() string {
func (m *MsgConnectionOpenInit) GetConnectionId() string {
if m != nil {
return m.ConnectionID
return m.ConnectionId
}
return ""
}
@ -136,8 +136,8 @@ func (m *MsgConnectionOpenInit) GetSigner() github_com_cosmos_cosmos_sdk_types.A
// MsgConnectionOpenTry defines a msg sent by a Relayer to try to open a
// connection on Chain B.
type MsgConnectionOpenTry struct {
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ConnectionID string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
Counterparty Counterparty `protobuf:"bytes,3,opt,name=counterparty,proto3" json:"counterparty"`
CounterpartyVersions []string `protobuf:"bytes,4,rep,name=counterparty_versions,json=counterpartyVersions,proto3" json:"counterparty_versions,omitempty" yaml:"counterparty_versions"`
// proof of the initialization the connection on Chain A: `UNITIALIZED ->
@ -183,16 +183,16 @@ func (m *MsgConnectionOpenTry) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgConnectionOpenTry proto.InternalMessageInfo
func (m *MsgConnectionOpenTry) GetClientID() string {
func (m *MsgConnectionOpenTry) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
func (m *MsgConnectionOpenTry) GetConnectionID() string {
func (m *MsgConnectionOpenTry) GetConnectionId() string {
if m != nil {
return m.ConnectionID
return m.ConnectionId
}
return ""
}
@ -249,7 +249,7 @@ func (m *MsgConnectionOpenTry) GetSigner() github_com_cosmos_cosmos_sdk_types.Ac
// MsgConnectionOpenAck defines a msg sent by a Relayer to Chain A to
// acknowledge the change of connection state to TRYOPEN on Chain B.
type MsgConnectionOpenAck struct {
ConnectionID string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
// proof of the initialization the connection on Chain B: `UNITIALIZED ->
// TRYOPEN`
@ -294,9 +294,9 @@ func (m *MsgConnectionOpenAck) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgConnectionOpenAck proto.InternalMessageInfo
func (m *MsgConnectionOpenAck) GetConnectionID() string {
func (m *MsgConnectionOpenAck) GetConnectionId() string {
if m != nil {
return m.ConnectionID
return m.ConnectionId
}
return ""
}
@ -346,7 +346,7 @@ func (m *MsgConnectionOpenAck) GetSigner() github_com_cosmos_cosmos_sdk_types.Ac
// MsgConnectionOpenConfirm defines a msg sent by a Relayer to Chain B to
// acknowledge the change of connection state to OPEN on Chain A.
type MsgConnectionOpenConfirm struct {
ConnectionID string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
// proof for the change of the connection state on Chain A: `INIT -> OPEN`
ProofAck []byte `protobuf:"bytes,2,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty" yaml:"proof_ack"`
ProofHeight uint64 `protobuf:"varint,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height,omitempty" yaml:"proof_height"`
@ -386,9 +386,9 @@ func (m *MsgConnectionOpenConfirm) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgConnectionOpenConfirm proto.InternalMessageInfo
func (m *MsgConnectionOpenConfirm) GetConnectionID() string {
func (m *MsgConnectionOpenConfirm) GetConnectionId() string {
if m != nil {
return m.ConnectionID
return m.ConnectionId
}
return ""
}
@ -419,7 +419,7 @@ func (m *MsgConnectionOpenConfirm) GetSigner() github_com_cosmos_cosmos_sdk_type
// a connection between two chains.
type ConnectionEnd struct {
// client associated with this connection.
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
// IBC version which can be utilised to determine encodings or protocols for
// channels or packets utilising this connection
Versions []string `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"`
@ -466,9 +466,9 @@ var xxx_messageInfo_ConnectionEnd proto.InternalMessageInfo
// identifier field.
type IdentifiedConnection struct {
// connection identifier.
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id"`
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id"`
// client associated with this connection.
ClientID string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
// IBC version which can be utilised to determine encodings or protocols for
// channels or packets utilising this connection
Versions []string `protobuf:"bytes,3,rep,name=versions,proto3" json:"versions,omitempty"`
@ -515,10 +515,10 @@ var xxx_messageInfo_IdentifiedConnection proto.InternalMessageInfo
type Counterparty struct {
// identifies the client on the counterparty chain associated with a given
// connection.
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
// identifies the connection end on the counterparty chain associated with a
// given connection.
ConnectionID string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
// commitment merkle prefix of the counterparty chain
Prefix types.MerklePrefix `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix"`
}
@ -605,7 +605,7 @@ func (m *ClientPaths) GetPaths() []string {
// ConnectionPaths define all the connection paths for a given client state.
type ConnectionPaths struct {
// client state unique identifier
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"`
// list of connection paths
Paths []string `protobuf:"bytes,2,rep,name=paths,proto3" json:"paths,omitempty"`
}
@ -643,9 +643,9 @@ func (m *ConnectionPaths) XXX_DiscardUnknown() {
var xxx_messageInfo_ConnectionPaths proto.InternalMessageInfo
func (m *ConnectionPaths) GetClientID() string {
func (m *ConnectionPaths) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
@ -716,66 +716,65 @@ func init() {
func init() { proto.RegisterFile("ibc/connection/connection.proto", fileDescriptor_3bf62bacf5a27ee9) }
var fileDescriptor_3bf62bacf5a27ee9 = []byte{
// 936 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
0x14, 0x8f, 0x1d, 0xe7, 0xdf, 0x6b, 0xda, 0x66, 0xbd, 0x29, 0x6b, 0x85, 0x95, 0x6d, 0xbc, 0x97,
0x08, 0xd4, 0x84, 0xdd, 0x45, 0x7b, 0xa8, 0xc4, 0x21, 0x49, 0x53, 0x61, 0x41, 0xbb, 0x91, 0x9b,
0x22, 0xb1, 0x97, 0x28, 0xb5, 0x27, 0xe9, 0x28, 0x8d, 0x1d, 0xd9, 0x53, 0xb4, 0xfd, 0x06, 0xab,
0x9e, 0xe0, 0xc8, 0xa1, 0x12, 0xd2, 0x7e, 0x09, 0x3e, 0x01, 0xda, 0xe3, 0x1e, 0x39, 0x59, 0x28,
0x15, 0x5f, 0x20, 0xe2, 0xc4, 0x09, 0x79, 0xc6, 0xb1, 0xdd, 0xb4, 0x80, 0xa8, 0x7b, 0x40, 0x9c,
0xf2, 0xfe, 0xfc, 0xe6, 0xbd, 0x79, 0xef, 0xf7, 0xf2, 0x3c, 0xa0, 0xe0, 0x63, 0xb3, 0x69, 0x3a,
0xb6, 0x8d, 0x4c, 0x82, 0x1d, 0x3b, 0x21, 0x36, 0x66, 0xae, 0x43, 0x1c, 0x71, 0x03, 0x1f, 0x9b,
0x8d, 0xd8, 0x5a, 0xab, 0x8e, 0x9d, 0xb1, 0x43, 0x5d, 0xcd, 0x40, 0x62, 0xa8, 0x5a, 0x18, 0x66,
0x3a, 0xc5, 0x64, 0x8a, 0x6c, 0x92, 0x10, 0x19, 0x40, 0xfb, 0x89, 0x87, 0xad, 0x7d, 0x6f, 0xdc,
0x89, 0x02, 0xbd, 0x9c, 0x21, 0x5b, 0xb7, 0x31, 0x11, 0x3f, 0x87, 0x92, 0x79, 0x8a, 0x91, 0x4d,
0x06, 0xd8, 0x92, 0x38, 0x95, 0xab, 0x97, 0xda, 0xea, 0xdc, 0x57, 0x8a, 0x1d, 0x6a, 0xd4, 0x77,
0x17, 0xbe, 0x52, 0x39, 0x1f, 0x4e, 0x4f, 0x77, 0xb4, 0x08, 0xa6, 0x19, 0x45, 0x26, 0xeb, 0x96,
0xb8, 0x0f, 0xeb, 0xf1, 0xed, 0x82, 0x10, 0x3c, 0x0d, 0x51, 0x9f, 0xfb, 0x4a, 0x39, 0xce, 0x46,
0xc3, 0x54, 0xc3, 0x30, 0x49, 0xb8, 0x66, 0x94, 0x63, 0x5d, 0xb7, 0xc4, 0x3d, 0x28, 0x9b, 0xce,
0x99, 0x4d, 0x90, 0x3b, 0x1b, 0xba, 0xe4, 0x5c, 0xca, 0xaa, 0x5c, 0x7d, 0xed, 0xd9, 0xe3, 0xc6,
0xf5, 0x2e, 0x34, 0x3a, 0x09, 0x4c, 0x5b, 0x78, 0xe7, 0x2b, 0x19, 0xe3, 0xda, 0x39, 0x51, 0x87,
0xbc, 0x87, 0xc7, 0x36, 0x72, 0x25, 0x41, 0xe5, 0xea, 0xe5, 0xf6, 0xd3, 0x3f, 0x7c, 0x65, 0x7b,
0x8c, 0xc9, 0xc9, 0xd9, 0x71, 0xc3, 0x74, 0xa6, 0x4d, 0xd3, 0xf1, 0xa6, 0x8e, 0x17, 0xfe, 0x6c,
0x7b, 0xd6, 0xa4, 0x49, 0xce, 0x67, 0xc8, 0x6b, 0xb4, 0x4c, 0xb3, 0x65, 0x59, 0x2e, 0xf2, 0x3c,
0x23, 0x0c, 0xa0, 0xfd, 0x2e, 0x40, 0xf5, 0x46, 0xeb, 0xfa, 0xee, 0xf9, 0xff, 0xb4, 0x73, 0x47,
0xb0, 0x95, 0xd4, 0x07, 0xdf, 0x22, 0xd7, 0xc3, 0x8e, 0xed, 0x49, 0x82, 0x9a, 0x0d, 0x2a, 0x5c,
0xf8, 0xca, 0xe3, 0xe5, 0x75, 0x6e, 0x81, 0x69, 0x46, 0x35, 0x69, 0xff, 0x3a, 0x34, 0x8b, 0x9f,
0x01, 0xcc, 0x5c, 0xc7, 0x19, 0x0d, 0xb0, 0x8d, 0x89, 0x94, 0xa3, 0xa4, 0x6c, 0x2d, 0x7c, 0xe5,
0x01, 0x8b, 0x15, 0xfb, 0x34, 0xa3, 0x44, 0x15, 0x3a, 0x9c, 0x1f, 0x41, 0x99, 0x79, 0x4e, 0x10,
0x1e, 0x9f, 0x10, 0x29, 0xaf, 0x72, 0x75, 0xc1, 0x58, 0xa3, 0xb6, 0x2f, 0xa8, 0x49, 0xec, 0xc0,
0x26, 0x83, 0x98, 0x8e, 0xed, 0x21, 0xdb, 0x3b, 0xf3, 0xa4, 0x02, 0x8d, 0x5e, 0x5b, 0xf8, 0xca,
0x07, 0xc9, 0xe8, 0x11, 0x40, 0x33, 0x36, 0xa8, 0xa5, 0xb3, 0x34, 0x88, 0x7b, 0x50, 0x89, 0xbc,
0xcb, 0x5c, 0xc5, 0x20, 0x57, 0xfb, 0xc3, 0x85, 0xaf, 0x3c, 0x8a, 0xda, 0x7f, 0x0d, 0xa1, 0x19,
0x9b, 0x91, 0x29, 0xbc, 0x4c, 0x3c, 0x76, 0xa5, 0xb4, 0x63, 0xf7, 0x73, 0xf6, 0x96, 0xb1, 0x6b,
0x99, 0x93, 0x9b, 0x73, 0xc3, 0xa5, 0x9a, 0x1b, 0x09, 0x0a, 0x21, 0x77, 0x6c, 0x00, 0x8d, 0xa5,
0x2a, 0x3e, 0x05, 0xc6, 0xc4, 0x80, 0xb8, 0x6c, 0x9c, 0xca, 0xed, 0x6a, 0x3c, 0xd3, 0x91, 0x4b,
0x33, 0x8a, 0x54, 0x0e, 0xfe, 0x12, 0x3b, 0x2b, 0x7c, 0x09, 0xb4, 0x87, 0x8f, 0x16, 0xbe, 0xf2,
0x30, 0x79, 0x6a, 0xd9, 0xbf, 0x7f, 0x22, 0x32, 0x77, 0x2f, 0x44, 0xe6, 0x53, 0x11, 0x59, 0x48,
0x4b, 0xe4, 0x5b, 0x1e, 0xa4, 0x1b, 0x44, 0x76, 0x1c, 0x7b, 0x84, 0xdd, 0xe9, 0x7d, 0x93, 0x19,
0x51, 0x36, 0x34, 0x27, 0x94, 0xce, 0x5b, 0x28, 0x1b, 0x9a, 0x93, 0x25, 0x65, 0xc1, 0x38, 0xad,
0x52, 0x96, 0xfd, 0x17, 0x94, 0xdd, 0xe3, 0x96, 0xfd, 0x8d, 0x83, 0xf5, 0xb8, 0xe0, 0xae, 0x6d,
0xa5, 0x5d, 0xaf, 0x35, 0x28, 0x46, 0xab, 0x8b, 0x0f, 0x56, 0x97, 0x11, 0xe9, 0xe2, 0x27, 0x90,
0xf3, 0xc8, 0x90, 0x20, 0x5a, 0xec, 0xc6, 0xb3, 0xad, 0xd5, 0x25, 0x79, 0x18, 0x38, 0x0d, 0x86,
0xb9, 0xb1, 0x58, 0x85, 0xbb, 0x2d, 0xd6, 0x1d, 0xe1, 0xcd, 0x8f, 0x4a, 0x46, 0xfb, 0x9e, 0x87,
0xaa, 0x6e, 0x21, 0x9b, 0xe0, 0x11, 0x46, 0x56, 0x5c, 0xb1, 0xf8, 0x04, 0xf8, 0xa8, 0xce, 0x87,
0x73, 0x5f, 0xe1, 0x69, 0x85, 0x25, 0x56, 0x61, 0x50, 0x1a, 0x8f, 0x57, 0x7a, 0xc2, 0xa7, 0xea,
0x49, 0xf6, 0xaf, 0x7a, 0x22, 0xdc, 0xa1, 0x27, 0xb9, 0x54, 0x3d, 0xf1, 0x39, 0x28, 0x27, 0xa1,
0xff, 0xb1, 0x2f, 0xeb, 0x0e, 0xe4, 0x67, 0x2e, 0x1a, 0xe1, 0xd7, 0x2b, 0xdf, 0xd4, 0xe8, 0x89,
0xb5, 0x8f, 0xdc, 0xc9, 0x29, 0xea, 0x51, 0x4c, 0x58, 0x66, 0x78, 0x22, 0x2c, 0xf0, 0x09, 0xac,
0xb1, 0xab, 0xf7, 0x86, 0xe4, 0xc4, 0x13, 0xab, 0x90, 0x9b, 0x05, 0x82, 0xc4, 0x51, 0x0e, 0x98,
0xa2, 0x8d, 0x60, 0x33, 0xbe, 0x1c, 0x03, 0xa6, 0xec, 0x43, 0x94, 0x87, 0x4f, 0xe6, 0xf9, 0x12,
0x0a, 0xe1, 0x57, 0x59, 0x94, 0x01, 0xf0, 0x72, 0x16, 0x5d, 0x96, 0xc0, 0x48, 0x58, 0x82, 0x79,
0x19, 0xa1, 0x21, 0x39, 0x73, 0x51, 0xf4, 0x1f, 0x5a, 0xea, 0xac, 0xb2, 0x8f, 0x7f, 0xe0, 0x20,
0x47, 0x27, 0x43, 0x7c, 0x01, 0xca, 0x61, 0xbf, 0xd5, 0xef, 0x0e, 0x8e, 0x0e, 0xf4, 0x03, 0xbd,
0xaf, 0xb7, 0xbe, 0xd2, 0x5f, 0x75, 0x77, 0x07, 0x47, 0x07, 0x87, 0xbd, 0x6e, 0x47, 0xdf, 0xd3,
0xbb, 0xbb, 0x95, 0x4c, 0xed, 0xc1, 0xc5, 0xa5, 0xba, 0x7e, 0x0d, 0x20, 0x4a, 0x00, 0xec, 0x5c,
0x60, 0xac, 0x70, 0xb5, 0xe2, 0xc5, 0xa5, 0x2a, 0x04, 0xb2, 0x28, 0xc3, 0x3a, 0xf3, 0xf4, 0x8d,
0x6f, 0x5e, 0xf6, 0xba, 0x07, 0x15, 0xbe, 0xb6, 0x76, 0x71, 0xa9, 0x16, 0x42, 0x35, 0x3e, 0x49,
0x9d, 0x59, 0x76, 0x32, 0x90, 0x6b, 0xc2, 0x9b, 0xb7, 0x72, 0xa6, 0xdd, 0x7b, 0x37, 0x97, 0xb9,
0xf7, 0x73, 0x99, 0xfb, 0x75, 0x2e, 0x73, 0xdf, 0x5d, 0xc9, 0x99, 0xf7, 0x57, 0x72, 0xe6, 0x97,
0x2b, 0x39, 0xf3, 0xea, 0xc5, 0xdf, 0xee, 0xa8, 0xd7, 0xcd, 0xe0, 0x35, 0xfd, 0xe9, 0xf3, 0xed,
0xc4, 0xbb, 0x9c, 0xee, 0xad, 0xe3, 0x3c, 0x7d, 0x4c, 0x3f, 0xff, 0x33, 0x00, 0x00, 0xff, 0xff,
0x7a, 0xce, 0x37, 0x62, 0xb6, 0x0b, 0x00, 0x00,
// 919 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x6e, 0xe3, 0x54,
0x14, 0x8e, 0x1d, 0xe7, 0xef, 0x34, 0x69, 0x33, 0x26, 0x65, 0xac, 0x30, 0xd8, 0xc6, 0x6c, 0x22,
0x50, 0x13, 0x66, 0x06, 0xcd, 0xa2, 0x12, 0x8b, 0x24, 0x93, 0x0a, 0x0b, 0xa6, 0x13, 0xb9, 0x29,
0x12, 0xdd, 0x44, 0xa9, 0x7d, 0x93, 0x5e, 0xa5, 0xb1, 0x23, 0xfb, 0x16, 0x4d, 0xdf, 0x60, 0xd4,
0x15, 0x12, 0x2b, 0x24, 0x2a, 0x21, 0xf1, 0x0e, 0x3c, 0x00, 0xab, 0x59, 0xce, 0x72, 0xd8, 0x58,
0xa8, 0x7d, 0x83, 0x2c, 0xd9, 0x80, 0x7c, 0xaf, 0xff, 0x9a, 0x16, 0x50, 0x9b, 0x91, 0xd0, 0xac,
0x72, 0xfe, 0x7d, 0xcf, 0xf9, 0xbe, 0x9c, 0x7b, 0x41, 0xc1, 0x87, 0x66, 0xcb, 0x74, 0x6c, 0x1b,
0x99, 0x04, 0x3b, 0x76, 0x4a, 0x6c, 0xce, 0x5d, 0x87, 0x38, 0xe2, 0x3a, 0x3e, 0x34, 0x9b, 0x89,
0xb5, 0x5e, 0x9b, 0x38, 0x13, 0x87, 0xba, 0x5a, 0x81, 0xc4, 0xa2, 0xea, 0x61, 0x99, 0xd9, 0x0c,
0x93, 0x19, 0xb2, 0x49, 0x4a, 0x64, 0x01, 0xda, 0x4f, 0x3c, 0x6c, 0x3e, 0xf3, 0x26, 0xdd, 0xb8,
0xd0, 0xf3, 0x39, 0xb2, 0x75, 0x1b, 0x13, 0xf1, 0x21, 0x94, 0xcc, 0x63, 0x8c, 0x6c, 0x32, 0xc4,
0x96, 0xc4, 0xa9, 0x5c, 0xa3, 0xd4, 0xa9, 0x2d, 0x7c, 0xa5, 0x7a, 0x3a, 0x9a, 0x1d, 0x6f, 0x6b,
0xb1, 0x4b, 0x33, 0x8a, 0x4c, 0xd6, 0x2d, 0xf1, 0x0b, 0xa8, 0x24, 0x27, 0x0a, 0xd2, 0x78, 0x9a,
0x26, 0x2d, 0x7c, 0xa5, 0x16, 0xa6, 0xa5, 0xdd, 0x9a, 0x51, 0x4e, 0x74, 0xdd, 0x12, 0x77, 0xa0,
0x6c, 0x3a, 0x27, 0x36, 0x41, 0xee, 0x7c, 0xe4, 0x92, 0x53, 0x29, 0xab, 0x72, 0x8d, 0xb5, 0x47,
0x0f, 0x9a, 0x57, 0x3b, 0x6d, 0x76, 0x53, 0x31, 0x1d, 0xe1, 0x95, 0xaf, 0x64, 0x8c, 0x2b, 0x79,
0xa2, 0x0e, 0x79, 0x0f, 0x4f, 0x6c, 0xe4, 0x4a, 0x82, 0xca, 0x35, 0xca, 0x9d, 0x87, 0x7f, 0xfa,
0xca, 0xd6, 0x04, 0x93, 0xa3, 0x93, 0xc3, 0xa6, 0xe9, 0xcc, 0x5a, 0xa6, 0xe3, 0xcd, 0x1c, 0x2f,
0xfc, 0xd9, 0xf2, 0xac, 0x69, 0x8b, 0x9c, 0xce, 0x91, 0xd7, 0x6c, 0x9b, 0x66, 0xdb, 0xb2, 0x5c,
0xe4, 0x79, 0x46, 0x58, 0x40, 0x7b, 0x23, 0x40, 0xed, 0xda, 0x78, 0x06, 0xee, 0xe9, 0x3b, 0x3c,
0x9d, 0x7d, 0xd8, 0x4c, 0xeb, 0xc3, 0xef, 0x90, 0xeb, 0x61, 0xc7, 0xf6, 0x24, 0x41, 0xcd, 0x36,
0x4a, 0x1d, 0x75, 0xe1, 0x2b, 0x0f, 0xa2, 0xe3, 0xdc, 0x10, 0xa6, 0x19, 0xb5, 0xb4, 0xfd, 0x9b,
0xd0, 0x2c, 0x7e, 0x0e, 0x30, 0x77, 0x1d, 0x67, 0x3c, 0xc4, 0x36, 0x26, 0x52, 0x8e, 0x0e, 0x7e,
0x73, 0xe1, 0x2b, 0xf7, 0x58, 0xad, 0xc4, 0xa7, 0x19, 0x25, 0xaa, 0x50, 0x92, 0x7d, 0x04, 0x65,
0xe6, 0x39, 0x42, 0x78, 0x72, 0x44, 0xa4, 0xbc, 0xca, 0x35, 0x04, 0x63, 0x8d, 0xda, 0xbe, 0xa4,
0x26, 0xb1, 0x0b, 0x1b, 0x2c, 0xc4, 0x74, 0x6c, 0x0f, 0xd9, 0xde, 0x89, 0x27, 0x15, 0x68, 0xf5,
0xfa, 0xc2, 0x57, 0xde, 0x4f, 0x57, 0x8f, 0x03, 0x34, 0x63, 0x9d, 0x5a, 0xba, 0x91, 0x41, 0xdc,
0x81, 0x6a, 0xec, 0x8d, 0xbe, 0x55, 0x0c, 0xbe, 0xd5, 0xf9, 0x60, 0xe1, 0x2b, 0xf7, 0xe3, 0xf1,
0x5f, 0x89, 0xd0, 0x8c, 0x8d, 0xd8, 0x14, 0x1e, 0x26, 0xa1, 0x56, 0x69, 0x55, 0x6a, 0xfd, 0x9a,
0xbd, 0x81, 0x5a, 0x6d, 0x73, 0x7a, 0x9d, 0x27, 0xdc, 0xad, 0x78, 0x22, 0x41, 0x21, 0xc4, 0x8a,
0x11, 0xcc, 0x88, 0xd4, 0x80, 0xb3, 0x6c, 0x50, 0xc4, 0x65, 0xf4, 0x29, 0xa7, 0x39, 0x1b, 0xbb,
0x34, 0xa3, 0x48, 0xe5, 0x80, 0xe6, 0xdb, 0x4b, 0xf8, 0x08, 0x74, 0x66, 0xf7, 0x17, 0xbe, 0xf2,
0x5e, 0x3a, 0x2b, 0x9a, 0xd7, 0x7f, 0x01, 0x97, 0x7b, 0x2b, 0xc0, 0xe5, 0x57, 0x02, 0xae, 0xb0,
0x2a, 0x70, 0x3f, 0xf0, 0x20, 0x5d, 0x03, 0xae, 0xeb, 0xd8, 0x63, 0xec, 0xce, 0x56, 0x05, 0x2f,
0x86, 0x68, 0x64, 0x4e, 0x29, 0x7c, 0x37, 0x40, 0x34, 0x32, 0xa7, 0x11, 0x44, 0x01, 0x5d, 0x96,
0x21, 0xca, 0xde, 0x02, 0xa2, 0xb7, 0xb8, 0x29, 0x7f, 0xe7, 0xa0, 0x92, 0x8c, 0xa4, 0x67, 0x5b,
0x77, 0x59, 0x91, 0x75, 0x28, 0xc6, 0xeb, 0x88, 0x0f, 0xd6, 0x91, 0x11, 0xeb, 0xe2, 0xa7, 0x90,
0xf3, 0xc8, 0x88, 0x20, 0xda, 0xe0, 0xfa, 0xa3, 0xcd, 0xe5, 0xc5, 0xb7, 0x17, 0x38, 0x0d, 0x16,
0x73, 0x6d, 0x59, 0x0a, 0x77, 0x5b, 0x96, 0xdb, 0xc2, 0xcb, 0x9f, 0x95, 0x8c, 0xf6, 0x17, 0x07,
0x35, 0xdd, 0x42, 0x36, 0xc1, 0x63, 0x8c, 0xac, 0xa4, 0x4b, 0xf1, 0x43, 0xe0, 0xe3, 0xde, 0x2a,
0x0b, 0x5f, 0x29, 0xb1, 0xde, 0x82, 0xa6, 0x78, 0xbc, 0x34, 0x01, 0xfe, 0xd6, 0x13, 0xc8, 0xfe,
0xd3, 0x04, 0x84, 0x3b, 0x4c, 0x20, 0xb7, 0xd2, 0x04, 0x7e, 0xe3, 0xa0, 0x9c, 0x0e, 0xfd, 0x1f,
0xee, 0xbf, 0x6d, 0xc8, 0xcf, 0x5d, 0x34, 0xc6, 0x2f, 0x96, 0x6e, 0xbe, 0xf8, 0x41, 0xf3, 0x0c,
0xb9, 0xd3, 0x63, 0xd4, 0xa7, 0x31, 0x61, 0x2b, 0x61, 0x46, 0xd8, 0xc4, 0xc7, 0xb0, 0xd6, 0xa5,
0x87, 0xe9, 0x8f, 0xc8, 0x91, 0x27, 0xd6, 0x20, 0x37, 0x0f, 0x04, 0x89, 0xa3, 0x73, 0x66, 0x8a,
0x76, 0x00, 0x1b, 0x09, 0xc0, 0x2c, 0xf0, 0x0e, 0xbd, 0xc6, 0xb5, 0xf9, 0x74, 0xed, 0xaf, 0xa0,
0x10, 0xde, 0x97, 0xa2, 0x0c, 0x80, 0x23, 0x46, 0xb9, 0xac, 0xa8, 0x91, 0xb2, 0x04, 0x3c, 0x18,
0xa3, 0x11, 0x39, 0x71, 0x51, 0xfc, 0x4f, 0x88, 0x74, 0xd6, 0xcd, 0x27, 0x3f, 0x72, 0x90, 0xa3,
0x88, 0x8b, 0x4f, 0x40, 0xd9, 0x1b, 0xb4, 0x07, 0xbd, 0xe1, 0xfe, 0xae, 0xbe, 0xab, 0x0f, 0xf4,
0xf6, 0xd7, 0xfa, 0x41, 0xef, 0xe9, 0x70, 0x7f, 0x77, 0xaf, 0xdf, 0xeb, 0xea, 0x3b, 0x7a, 0xef,
0x69, 0x35, 0x53, 0xbf, 0x77, 0x76, 0xae, 0x56, 0xae, 0x04, 0x88, 0x12, 0x00, 0xcb, 0x0b, 0x8c,
0x55, 0xae, 0x5e, 0x3c, 0x3b, 0x57, 0x85, 0x40, 0x16, 0x65, 0xa8, 0x30, 0xcf, 0xc0, 0xf8, 0xf6,
0x79, 0xbf, 0xb7, 0x5b, 0xe5, 0xeb, 0x6b, 0x67, 0xe7, 0x6a, 0x21, 0x54, 0x93, 0x4c, 0xea, 0xcc,
0xb2, 0xcc, 0x40, 0xae, 0x0b, 0x2f, 0x7f, 0x91, 0x33, 0x9d, 0xfe, 0xab, 0x0b, 0x99, 0x7b, 0x7d,
0x21, 0x73, 0x7f, 0x5c, 0xc8, 0xdc, 0xf7, 0x97, 0x72, 0xe6, 0xf5, 0xa5, 0x9c, 0x79, 0x73, 0x29,
0x67, 0x0e, 0x9e, 0xfc, 0xeb, 0x76, 0x79, 0xd1, 0x0a, 0xde, 0xab, 0x9f, 0x3d, 0xde, 0x4a, 0xbd,
0x7c, 0xe9, 0xc6, 0x39, 0xcc, 0xd3, 0xe7, 0xea, 0xe3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xe7,
0x61, 0x72, 0x2b, 0x18, 0x0b, 0x00, 0x00,
}
func (m *MsgConnectionOpenInit) Marshal() (dAtA []byte, err error) {
@ -815,17 +814,17 @@ func (m *MsgConnectionOpenInit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
}
i--
dAtA[i] = 0x1a
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0x12
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -902,17 +901,17 @@ func (m *MsgConnectionOpenTry) MarshalToSizedBuffer(dAtA []byte) (int, error) {
}
i--
dAtA[i] = 0x1a
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0x12
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -977,10 +976,10 @@ func (m *MsgConnectionOpenAck) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0xa
}
@ -1026,10 +1025,10 @@ func (m *MsgConnectionOpenConfirm) MarshalToSizedBuffer(dAtA []byte) (int, error
i--
dAtA[i] = 0x12
}
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0xa
}
@ -1080,10 +1079,10 @@ func (m *ConnectionEnd) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x12
}
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -1134,17 +1133,17 @@ func (m *IdentifiedConnection) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x1a
}
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0x12
}
if len(m.ID) > 0 {
i -= len(m.ID)
copy(dAtA[i:], m.ID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ID)))
if len(m.Id) > 0 {
i -= len(m.Id)
copy(dAtA[i:], m.Id)
i = encodeVarintConnection(dAtA, i, uint64(len(m.Id)))
i--
dAtA[i] = 0xa
}
@ -1181,17 +1180,17 @@ func (m *Counterparty) MarshalToSizedBuffer(dAtA []byte) (int, error) {
}
i--
dAtA[i] = 0x1a
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0x12
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -1259,10 +1258,10 @@ func (m *ConnectionPaths) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x12
}
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintConnection(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -1325,11 +1324,11 @@ func (m *MsgConnectionOpenInit) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1348,11 +1347,11 @@ func (m *MsgConnectionOpenTry) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1391,7 +1390,7 @@ func (m *MsgConnectionOpenAck) Size() (n int) {
}
var l int
_ = l
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1426,7 +1425,7 @@ func (m *MsgConnectionOpenConfirm) Size() (n int) {
}
var l int
_ = l
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1450,7 +1449,7 @@ func (m *ConnectionEnd) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1474,11 +1473,11 @@ func (m *IdentifiedConnection) Size() (n int) {
}
var l int
_ = l
l = len(m.ID)
l = len(m.Id)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1502,11 +1501,11 @@ func (m *Counterparty) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1536,7 +1535,7 @@ func (m *ConnectionPaths) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovConnection(uint64(l))
}
@ -1605,7 +1604,7 @@ func (m *MsgConnectionOpenInit) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -1633,11 +1632,11 @@ func (m *MsgConnectionOpenInit) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -1665,7 +1664,7 @@ func (m *MsgConnectionOpenInit) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -1789,7 +1788,7 @@ func (m *MsgConnectionOpenTry) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -1817,11 +1816,11 @@ func (m *MsgConnectionOpenTry) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -1849,7 +1848,7 @@ func (m *MsgConnectionOpenTry) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -2111,7 +2110,7 @@ func (m *MsgConnectionOpenAck) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2139,7 +2138,7 @@ func (m *MsgConnectionOpenAck) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
@ -2368,7 +2367,7 @@ func (m *MsgConnectionOpenConfirm) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2396,7 +2395,7 @@ func (m *MsgConnectionOpenConfirm) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
@ -2540,7 +2539,7 @@ func (m *ConnectionEnd) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2568,7 +2567,7 @@ func (m *ConnectionEnd) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
@ -2709,7 +2708,7 @@ func (m *IdentifiedConnection) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2737,11 +2736,11 @@ func (m *IdentifiedConnection) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ID = string(dAtA[iNdEx:postIndex])
m.Id = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2769,7 +2768,7 @@ func (m *IdentifiedConnection) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -2910,7 +2909,7 @@ func (m *Counterparty) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2938,11 +2937,11 @@ func (m *Counterparty) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2970,7 +2969,7 @@ func (m *Counterparty) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -3145,7 +3144,7 @@ func (m *ConnectionPaths) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3173,7 +3172,7 @@ func (m *ConnectionPaths) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {

4
x/ibc/03-connection/types/genesis.go
View File

@ -9,7 +9,7 @@ import (
// NewConnectionPaths creates a ConnectionPaths instance.
func NewConnectionPaths(id string, paths []string) ConnectionPaths {
return ConnectionPaths{
ClientID: id,
ClientId: id,
Paths: paths,
}
}
@ -42,7 +42,7 @@ func (gs GenesisState) Validate() error {
}
for i, conPaths := range gs.ClientConnectionPaths {
if err := host.ClientIdentifierValidator(conPaths.ClientID); err != nil {
if err := host.ClientIdentifierValidator(conPaths.ClientId); err != nil {
return fmt.Errorf("invalid client connection path %d: %w", i, err)
}
for _, path := range conPaths.Paths {

24
x/ibc/03-connection/types/msgs.go
View File

@ -17,8 +17,8 @@ func NewMsgConnectionOpenInit(
) *MsgConnectionOpenInit {
counterparty := NewCounterparty(counterpartyClientID, counterpartyConnectionID, counterpartyPrefix)
return &MsgConnectionOpenInit{
ConnectionID: connectionID,
ClientID: clientID,
ConnectionId: connectionID,
ClientId: clientID,
Counterparty: counterparty,
Signer: signer,
}
@ -36,10 +36,10 @@ func (msg MsgConnectionOpenInit) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgConnectionOpenInit) ValidateBasic() error {
if err := host.ConnectionIdentifierValidator(msg.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(msg.ConnectionId); err != nil {
return sdkerrors.Wrap(err, "invalid connection ID")
}
if err := host.ClientIdentifierValidator(msg.ClientID); err != nil {
if err := host.ClientIdentifierValidator(msg.ClientId); err != nil {
return sdkerrors.Wrap(err, "invalid client ID")
}
if msg.Signer.Empty() {
@ -69,8 +69,8 @@ func NewMsgConnectionOpenTry(
) *MsgConnectionOpenTry {
counterparty := NewCounterparty(counterpartyClientID, counterpartyConnectionID, counterpartyPrefix)
return &MsgConnectionOpenTry{
ConnectionID: connectionID,
ClientID: clientID,
ConnectionId: connectionID,
ClientId: clientID,
Counterparty: counterparty,
CounterpartyVersions: counterpartyVersions,
ProofInit: proofInit,
@ -93,10 +93,10 @@ func (msg MsgConnectionOpenTry) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgConnectionOpenTry) ValidateBasic() error {
if err := host.ConnectionIdentifierValidator(msg.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(msg.ConnectionId); err != nil {
return sdkerrors.Wrap(err, "invalid connection ID")
}
if err := host.ClientIdentifierValidator(msg.ClientID); err != nil {
if err := host.ClientIdentifierValidator(msg.ClientId); err != nil {
return sdkerrors.Wrap(err, "invalid client ID")
}
if len(msg.CounterpartyVersions) == 0 {
@ -144,7 +144,7 @@ func NewMsgConnectionOpenAck(
signer sdk.AccAddress,
) *MsgConnectionOpenAck {
return &MsgConnectionOpenAck{
ConnectionID: connectionID,
ConnectionId: connectionID,
ProofTry: proofTry,
ProofConsensus: proofConsensus,
ProofHeight: proofHeight,
@ -166,7 +166,7 @@ func (msg MsgConnectionOpenAck) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgConnectionOpenAck) ValidateBasic() error {
if err := host.ConnectionIdentifierValidator(msg.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(msg.ConnectionId); err != nil {
return sdkerrors.Wrap(err, "invalid connection ID")
}
if err := ValidateVersion(msg.Version); err != nil {
@ -208,7 +208,7 @@ func NewMsgConnectionOpenConfirm(
signer sdk.AccAddress,
) *MsgConnectionOpenConfirm {
return &MsgConnectionOpenConfirm{
ConnectionID: connectionID,
ConnectionId: connectionID,
ProofAck: proofAck,
ProofHeight: proofHeight,
Signer: signer,
@ -227,7 +227,7 @@ func (msg MsgConnectionOpenConfirm) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgConnectionOpenConfirm) ValidateBasic() error {
if err := host.ConnectionIdentifierValidator(msg.ConnectionID); err != nil {
if err := host.ConnectionIdentifierValidator(msg.ConnectionId); err != nil {
return sdkerrors.Wrap(err, "invalid connection ID")
}
if len(msg.ProofAck) == 0 {

6
x/ibc/03-connection/types/query.go
View File

@ -38,13 +38,13 @@ func NewQueryClientConnectionsResponse(
// NewQueryClientConnectionsRequest creates a new QueryClientConnectionsRequest instance
func NewQueryClientConnectionsRequest(clientID string) *QueryClientConnectionsRequest {
return &QueryClientConnectionsRequest{
ClientID: clientID,
ClientId: clientID,
}
}
// NewQueryConnectionClientStateResponse creates a newQueryConnectionClientStateResponse instance
func NewQueryConnectionClientStateResponse(identifiedClientState clienttypes.IdentifiedClientState, proof []byte, height int64) *QueryConnectionClientStateResponse {
path := commitmenttypes.NewMerklePath(strings.Split(host.FullClientPath(identifiedClientState.ID, host.ClientStatePath()), "/"))
path := commitmenttypes.NewMerklePath(strings.Split(host.FullClientPath(identifiedClientState.Id, host.ClientStatePath()), "/"))
return &QueryConnectionClientStateResponse{
IdentifiedClientState: &identifiedClientState,
Proof: proof,
@ -58,7 +58,7 @@ func NewQueryConnectionConsensusStateResponse(clientID string, anyConsensusState
path := commitmenttypes.NewMerklePath(strings.Split(host.FullClientPath(clientID, host.ConsensusStatePath(consensusStateHeight)), "/"))
return &QueryConnectionConsensusStateResponse{
ConsensusState: anyConsensusState,
ClientID: clientID,
ClientId: clientID,
Proof: proof,
ProofPath: path.Pretty(),
ProofHeight: uint64(height),

199
x/ibc/03-connection/types/query.pb.go
View File

@ -35,7 +35,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// method
type QueryConnectionRequest struct {
// connection unique identifier
ConnectionID string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"`
}
func (m *QueryConnectionRequest) Reset() { *m = QueryConnectionRequest{} }
@ -71,9 +71,9 @@ func (m *QueryConnectionRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryConnectionRequest proto.InternalMessageInfo
func (m *QueryConnectionRequest) GetConnectionID() string {
func (m *QueryConnectionRequest) GetConnectionId() string {
if m != nil {
return m.ConnectionID
return m.ConnectionId
}
return ""
}
@ -268,7 +268,7 @@ func (m *QueryConnectionsResponse) GetHeight() int64 {
// Query/ClientConnections RPC method
type QueryClientConnectionsRequest struct {
// client identifier associated with a connection
ClientID string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
}
func (m *QueryClientConnectionsRequest) Reset() { *m = QueryClientConnectionsRequest{} }
@ -304,9 +304,9 @@ func (m *QueryClientConnectionsRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryClientConnectionsRequest proto.InternalMessageInfo
func (m *QueryClientConnectionsRequest) GetClientID() string {
func (m *QueryClientConnectionsRequest) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
@ -389,7 +389,7 @@ func (m *QueryClientConnectionsResponse) GetProofHeight() uint64 {
// Query/ConnectionClientState RPC method
type QueryConnectionClientStateRequest struct {
// connection identifier
ConnectionID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"connection_id"`
ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
}
func (m *QueryConnectionClientStateRequest) Reset() { *m = QueryConnectionClientStateRequest{} }
@ -425,9 +425,9 @@ func (m *QueryConnectionClientStateRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryConnectionClientStateRequest proto.InternalMessageInfo
func (m *QueryConnectionClientStateRequest) GetConnectionID() string {
func (m *QueryConnectionClientStateRequest) GetConnectionId() string {
if m != nil {
return m.ConnectionID
return m.ConnectionId
}
return ""
}
@ -510,7 +510,7 @@ func (m *QueryConnectionClientStateResponse) GetProofHeight() uint64 {
// Query/ConnectionConsensusState RPC method
type QueryConnectionConsensusStateRequest struct {
// connection identifier
ConnectionID string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"`
Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
}
@ -547,9 +547,9 @@ func (m *QueryConnectionConsensusStateRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryConnectionConsensusStateRequest proto.InternalMessageInfo
func (m *QueryConnectionConsensusStateRequest) GetConnectionID() string {
func (m *QueryConnectionConsensusStateRequest) GetConnectionId() string {
if m != nil {
return m.ConnectionID
return m.ConnectionId
}
return ""
}
@ -567,7 +567,7 @@ type QueryConnectionConsensusStateResponse struct {
// consensus state associated with the channel
ConsensusState *types1.Any `protobuf:"bytes,1,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
// client ID associated with the consensus state
ClientID string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
// merkle proof of existence
Proof []byte `protobuf:"bytes,3,opt,name=proof,proto3" json:"proof,omitempty"`
// merkle proof path
@ -616,9 +616,9 @@ func (m *QueryConnectionConsensusStateResponse) GetConsensusState() *types1.Any
return nil
}
func (m *QueryConnectionConsensusStateResponse) GetClientID() string {
func (m *QueryConnectionConsensusStateResponse) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
@ -660,57 +660,54 @@ func init() {
func init() { proto.RegisterFile("ibc/connection/query.proto", fileDescriptor_5ee60d8b08ce3606) }
var fileDescriptor_5ee60d8b08ce3606 = []byte{
// 787 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xd3, 0x4a,
0x14, 0xce, 0x24, 0x69, 0xd5, 0x9c, 0xe4, 0xf6, 0xf6, 0x8e, 0xd2, 0x36, 0xd7, 0x52, 0x93, 0xd4,
0xea, 0x6d, 0xd3, 0x2b, 0xd5, 0xa6, 0x29, 0x45, 0x08, 0x89, 0x05, 0xa5, 0x14, 0x82, 0x84, 0x28,
0x66, 0x05, 0x12, 0x8a, 0xec, 0xd8, 0x75, 0x2c, 0x5a, 0x4f, 0xda, 0x99, 0x20, 0xb2, 0x63, 0xcb,
0x02, 0x89, 0x77, 0xe0, 0x05, 0x78, 0x07, 0x36, 0x2c, 0xcb, 0x0a, 0x56, 0x15, 0x4a, 0x57, 0x6c,
0x79, 0x02, 0x64, 0xcf, 0x24, 0xb6, 0x13, 0xa7, 0x6e, 0x17, 0x5d, 0xd9, 0x9e, 0xf3, 0x33, 0xdf,
0xf9, 0xce, 0x39, 0x9f, 0x0c, 0x92, 0x63, 0xb4, 0xd4, 0x16, 0x71, 0x5d, 0xab, 0xc5, 0x1c, 0xe2,
0xaa, 0xc7, 0x5d, 0xeb, 0xa4, 0xa7, 0x74, 0x4e, 0x08, 0x23, 0x78, 0xd6, 0x31, 0x5a, 0x4a, 0x60,
0x93, 0x8a, 0x36, 0xb1, 0x89, 0x6f, 0x52, 0xbd, 0x37, 0xee, 0x25, 0xfd, 0xdf, 0x22, 0xf4, 0x88,
0x50, 0xd5, 0xd0, 0xa9, 0xc5, 0xc3, 0xd5, 0x37, 0x9b, 0x86, 0xc5, 0xf4, 0x4d, 0xb5, 0xa3, 0xdb,
0x8e, 0xab, 0x7b, 0xb1, 0xc2, 0x77, 0xd1, 0xbf, 0xed, 0xd0, 0xb1, 0x5c, 0x26, 0x1e, 0xc2, 0x50,
0x19, 0x81, 0x11, 0xbc, 0x0a, 0x87, 0x7f, 0x6d, 0x42, 0xec, 0x43, 0x4b, 0xf5, 0xbf, 0x8c, 0xee,
0x81, 0xaa, 0xbb, 0x02, 0xa6, 0xfc, 0x14, 0x16, 0x9e, 0x79, 0xd7, 0xde, 0x1f, 0xc6, 0x68, 0xd6,
0x71, 0xd7, 0xa2, 0x0c, 0x6f, 0xc3, 0x5f, 0x41, 0xa2, 0xa6, 0x63, 0x96, 0x50, 0x15, 0xd5, 0x72,
0x3b, 0x73, 0xfd, 0xb3, 0x4a, 0x21, 0xf0, 0x6e, 0xec, 0x6a, 0x85, 0xc0, 0xad, 0x61, 0xca, 0x9f,
0x11, 0x2c, 0x8e, 0x65, 0xa4, 0x1d, 0xe2, 0x52, 0x0b, 0xdf, 0x05, 0x08, 0x7c, 0xfd, 0x7c, 0xf9,
0xfa, 0x92, 0x12, 0x25, 0x4a, 0x09, 0xe2, 0x1e, 0xb8, 0xa6, 0x16, 0x0a, 0xc0, 0x45, 0x98, 0xea,
0x9c, 0x10, 0x72, 0x50, 0x4a, 0x57, 0x51, 0xad, 0xa0, 0xf1, 0x0f, 0xbc, 0x04, 0xe0, 0xbf, 0x34,
0x3b, 0x3a, 0x6b, 0x97, 0x32, 0x1e, 0x48, 0x2d, 0xe7, 0x9f, 0xec, 0xeb, 0xac, 0x8d, 0x97, 0xa1,
0xc0, 0xcd, 0x6d, 0xcb, 0xb1, 0xdb, 0xac, 0x94, 0xad, 0xa2, 0x5a, 0x56, 0xcb, 0xfb, 0x67, 0x8f,
0xfc, 0x23, 0x59, 0x1f, 0x43, 0x4c, 0x07, 0x24, 0xec, 0x01, 0x04, 0x7d, 0x10, 0x88, 0x57, 0x15,
0xde, 0x34, 0xc5, 0x6b, 0x9a, 0xc2, 0x7b, 0x2e, 0x9a, 0xa6, 0xec, 0xeb, 0xb6, 0x25, 0x62, 0xb5,
0x50, 0xa4, 0xfc, 0x05, 0x41, 0x69, 0xfc, 0x0e, 0x41, 0xcb, 0x1e, 0xe4, 0x83, 0x2a, 0x69, 0x09,
0x55, 0x33, 0xb5, 0x7c, 0x7d, 0x65, 0x94, 0x97, 0x86, 0x69, 0xb9, 0xcc, 0x39, 0x70, 0x2c, 0x33,
0xc4, 0x6c, 0x38, 0x10, 0x3f, 0x8c, 0x80, 0x4d, 0xfb, 0x60, 0xd7, 0x12, 0xc1, 0x72, 0x10, 0x61,
0xb4, 0x78, 0x01, 0xa6, 0x05, 0x5b, 0x1e, 0x9d, 0x19, 0x4d, 0x7c, 0xc9, 0x8f, 0x61, 0x89, 0x17,
0xe1, 0x4f, 0x5f, 0x0c, 0x5d, 0xeb, 0x90, 0xe3, 0x93, 0x19, 0xcc, 0x4b, 0xa1, 0x7f, 0x56, 0x99,
0xe1, 0x01, 0x8d, 0x5d, 0x6d, 0x86, 0x9b, 0x1b, 0xa6, 0xfc, 0x09, 0x41, 0x79, 0x52, 0x32, 0xc1,
0xcb, 0x3a, 0xcc, 0x85, 0x26, 0xd0, 0x6b, 0x2f, 0x27, 0x27, 0xa7, 0xfd, 0x1d, 0x9c, 0x7b, 0x4d,
0xa6, 0xd7, 0x36, 0x1a, 0xaf, 0x60, 0x79, 0xa4, 0x6d, 0x1c, 0xee, 0x73, 0xa6, 0xb3, 0x41, 0xa3,
0xf1, 0x6d, 0x48, 0x0f, 0xcb, 0xad, 0x8d, 0xae, 0xc7, 0xef, 0xb3, 0x4a, 0xb1, 0xa7, 0x1f, 0x1d,
0xde, 0x91, 0x23, 0xdb, 0x24, 0x6b, 0x69, 0xc7, 0x94, 0xbf, 0x23, 0x90, 0x2f, 0xca, 0x2f, 0x88,
0x78, 0x01, 0x8b, 0xce, 0xb0, 0xfb, 0x4d, 0xc1, 0x30, 0xf5, 0x5c, 0xc4, 0x48, 0x2e, 0xf3, 0x61,
0xe1, 0xa2, 0x10, 0x1a, 0x94, 0x50, 0xae, 0x79, 0x27, 0xee, 0xf8, 0xda, 0x88, 0xfb, 0x80, 0x60,
0x65, 0xb4, 0x32, 0xaf, 0x16, 0x97, 0x76, 0x69, 0x84, 0xbc, 0x27, 0xf1, 0x32, 0x73, 0x79, 0x1e,
0x23, 0xf2, 0x13, 0x1a, 0xdd, 0xb4, 0x0f, 0x6a, 0x30, 0xba, 0xbf, 0x10, 0xfc, 0x97, 0x80, 0x67,
0x28, 0x52, 0xde, 0x74, 0x71, 0x4b, 0x84, 0xe4, 0xa2, 0xc2, 0x65, 0x54, 0x19, 0xc8, 0xa8, 0x72,
0xcf, 0xed, 0x69, 0xb3, 0xad, 0x48, 0x9a, 0xe8, 0x0a, 0xa4, 0x2f, 0x5a, 0x81, 0x80, 0xfb, 0xcc,
0x64, 0xee, 0xb3, 0x49, 0xdc, 0x4f, 0x8d, 0x71, 0x5f, 0xff, 0x96, 0x85, 0x29, 0xbf, 0x56, 0xdc,
0x04, 0x08, 0xea, 0xc5, 0xab, 0xa3, 0x92, 0x12, 0xaf, 0xfc, 0xd2, 0x5a, 0xa2, 0x1f, 0xa7, 0x4a,
0x4e, 0x61, 0x03, 0xf2, 0xa1, 0xcd, 0xc5, 0x49, 0x91, 0x03, 0xa1, 0x90, 0x6a, 0xc9, 0x8e, 0xc3,
0x3b, 0x18, 0xfc, 0x33, 0xa6, 0x11, 0x78, 0x23, 0x3e, 0xc1, 0x04, 0x61, 0x92, 0x94, 0xcb, 0xba,
0x0f, 0x6f, 0x7d, 0x87, 0x60, 0x3e, 0x76, 0x2b, 0xf1, 0x66, 0x02, 0xf6, 0x71, 0x85, 0x90, 0xea,
0x57, 0x09, 0x19, 0x42, 0x78, 0x8f, 0xa0, 0x34, 0x69, 0x5c, 0xf1, 0xcd, 0xa4, 0x94, 0x71, 0xdb,
0x26, 0x6d, 0x5f, 0x31, 0x6a, 0x80, 0x65, 0x67, 0xff, 0x6b, 0xbf, 0x8c, 0x4e, 0xfb, 0x65, 0xf4,
0xb3, 0x5f, 0x46, 0x1f, 0xcf, 0xcb, 0xa9, 0xd3, 0xf3, 0x72, 0xea, 0xc7, 0x79, 0x39, 0xf5, 0xf2,
0x96, 0xed, 0xb0, 0x76, 0xd7, 0x50, 0x5a, 0xe4, 0x48, 0x15, 0x7f, 0x33, 0xfc, 0xb1, 0x41, 0xcd,
0xd7, 0xea, 0x5b, 0xd5, 0xfb, 0x39, 0xb9, 0xb1, 0xb5, 0x11, 0xfa, 0x3f, 0x61, 0xbd, 0x8e, 0x45,
0x8d, 0x69, 0x7f, 0x8d, 0xb6, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x52, 0x4d, 0x28, 0x45,
0x09, 0x00, 0x00,
// 749 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xc1, 0x6e, 0xd3, 0x4a,
0x14, 0xcd, 0x24, 0x69, 0xf5, 0x72, 0xd3, 0xd7, 0xf7, 0x18, 0xa5, 0xad, 0x31, 0x6a, 0x9a, 0x9a,
0xd2, 0x06, 0xa4, 0xda, 0x34, 0x05, 0x16, 0x88, 0x2e, 0x28, 0xa2, 0xd0, 0x5d, 0x31, 0x2b, 0xd8,
0x44, 0x76, 0x32, 0x75, 0x2c, 0x5a, 0x4f, 0xda, 0x99, 0x20, 0xb2, 0x40, 0x62, 0xcb, 0x8e, 0x7f,
0xe0, 0x07, 0xf8, 0x07, 0x36, 0x2c, 0xcb, 0x0a, 0x24, 0x24, 0x84, 0xda, 0x3f, 0xe0, 0x0b, 0x90,
0x67, 0x26, 0xb1, 0x9d, 0x38, 0x98, 0x4a, 0x74, 0x65, 0x7b, 0xe6, 0x9e, 0x99, 0x73, 0xcf, 0x3d,
0xf7, 0xca, 0xa0, 0xfb, 0x6e, 0xcb, 0x6a, 0xd1, 0x20, 0x20, 0x2d, 0xee, 0xd3, 0xc0, 0x3a, 0xea,
0x91, 0xe3, 0xbe, 0xd9, 0x3d, 0xa6, 0x9c, 0xe2, 0x59, 0xdf, 0x6d, 0x99, 0xd1, 0x9e, 0x5e, 0xf1,
0xa8, 0x47, 0xc5, 0x96, 0x15, 0xbe, 0xc9, 0x28, 0xfd, 0x46, 0x8b, 0xb2, 0x43, 0xca, 0x2c, 0xd7,
0x61, 0x44, 0xc2, 0xad, 0x97, 0x1b, 0x2e, 0xe1, 0xce, 0x86, 0xd5, 0x75, 0x3c, 0x3f, 0x70, 0x42,
0xac, 0x8a, 0x5d, 0x10, 0xb7, 0x1d, 0xf8, 0x24, 0xe0, 0xea, 0xa1, 0x36, 0x96, 0x46, 0x68, 0x44,
0xaf, 0x2a, 0xe0, 0xb2, 0x47, 0xa9, 0x77, 0x40, 0x2c, 0xf1, 0xe5, 0xf6, 0xf6, 0x2d, 0x27, 0x50,
0x34, 0x8d, 0x2d, 0x98, 0x7f, 0x12, 0x5e, 0xfb, 0x60, 0x88, 0xb1, 0xc9, 0x51, 0x8f, 0x30, 0x8e,
0xaf, 0xc2, 0xbf, 0xd1, 0x41, 0x4d, 0xbf, 0xad, 0xa1, 0x1a, 0xaa, 0x97, 0xec, 0x99, 0x68, 0x71,
0xb7, 0x6d, 0x7c, 0x40, 0xb0, 0x30, 0x86, 0x67, 0x5d, 0x1a, 0x30, 0x82, 0xb7, 0x00, 0xa2, 0x58,
0x81, 0x2e, 0x37, 0x16, 0xcd, 0xa4, 0x2c, 0x66, 0x84, 0x7b, 0x18, 0xb4, 0xed, 0x18, 0x00, 0x57,
0x60, 0xaa, 0x7b, 0x4c, 0xe9, 0xbe, 0x96, 0xaf, 0xa1, 0xfa, 0x8c, 0x2d, 0x3f, 0xf0, 0x22, 0x80,
0x78, 0x69, 0x76, 0x1d, 0xde, 0xd1, 0x0a, 0x82, 0x52, 0x49, 0xac, 0xec, 0x39, 0xbc, 0x83, 0x97,
0x61, 0x46, 0x6e, 0x77, 0x88, 0xef, 0x75, 0xb8, 0x56, 0xac, 0xa1, 0x7a, 0xd1, 0x2e, 0x8b, 0xb5,
0xc7, 0x62, 0xc9, 0x70, 0xc6, 0x18, 0xb3, 0x41, 0xca, 0x3b, 0x00, 0x91, 0xea, 0x8a, 0xf1, 0xaa,
0x29, 0x4b, 0x64, 0x86, 0x25, 0x32, 0x65, 0x85, 0x55, 0x89, 0xcc, 0x3d, 0xc7, 0x23, 0x0a, 0x6b,
0xc7, 0x90, 0xc6, 0x47, 0x04, 0xda, 0xf8, 0x1d, 0x4a, 0x96, 0x1d, 0x28, 0x47, 0x59, 0x32, 0x0d,
0xd5, 0x0a, 0xf5, 0x72, 0x63, 0x65, 0x54, 0x97, 0xdd, 0x36, 0x09, 0xb8, 0xbf, 0xef, 0x93, 0x76,
0x4c, 0xd9, 0x38, 0x10, 0x3f, 0x4a, 0x90, 0xcd, 0x0b, 0xb2, 0x6b, 0x99, 0x64, 0x25, 0x89, 0x38,
0x5b, 0x3c, 0x0f, 0xd3, 0x4a, 0xad, 0x50, 0xce, 0x82, 0xad, 0xbe, 0x8c, 0x7b, 0xb0, 0x28, 0x93,
0x10, 0x5e, 0x4b, 0x91, 0xeb, 0x0a, 0x94, 0xa4, 0x0f, 0x23, 0x77, 0xfc, 0x23, 0x17, 0x76, 0xdb,
0xc6, 0x7b, 0x04, 0xd5, 0x49, 0x70, 0xa5, 0xc4, 0x75, 0xf8, 0x3f, 0xe6, 0xb0, 0xb0, 0xa0, 0x52,
0x8e, 0x92, 0xfd, 0x5f, 0xb4, 0x1e, 0x96, 0x95, 0x5d, 0x98, 0x19, 0x5c, 0x58, 0x1e, 0x29, 0x94,
0xa4, 0xfb, 0x94, 0x3b, 0x7c, 0x50, 0x5a, 0xbc, 0x95, 0xda, 0x09, 0xdb, 0xda, 0xcf, 0xef, 0x4b,
0x95, 0xbe, 0x73, 0x78, 0x70, 0xd7, 0x48, 0x6c, 0x1b, 0x23, 0x3d, 0xf2, 0x05, 0x81, 0xf1, 0xbb,
0x4b, 0x94, 0x1a, 0xcf, 0x60, 0xc1, 0x1f, 0x16, 0xbd, 0xa9, 0x84, 0x65, 0x61, 0x88, 0x72, 0xe2,
0xb2, 0xf4, 0x88, 0xec, 0xfc, 0x98, 0x3f, 0x62, 0x67, 0xcd, 0xf9, 0x69, 0xcb, 0x17, 0xa6, 0xde,
0x6b, 0x58, 0x19, 0x4d, 0x2c, 0x4c, 0x25, 0x60, 0x3d, 0xf6, 0x17, 0x05, 0x8c, 0x19, 0x34, 0x2f,
0x38, 0x0c, 0x0c, 0xfa, 0x0d, 0xc1, 0xb5, 0x8c, 0xfb, 0x87, 0xa3, 0x28, 0x74, 0x94, 0xdc, 0x49,
0x68, 0x5a, 0x31, 0xe5, 0x68, 0x34, 0x07, 0xa3, 0xd1, 0xbc, 0x1f, 0xf4, 0xed, 0xd9, 0x56, 0xe2,
0x98, 0xa4, 0xd1, 0xf3, 0x49, 0xa3, 0x47, 0xe2, 0x16, 0x26, 0x8b, 0x5b, 0xcc, 0x12, 0x77, 0x6a,
0x4c, 0xdc, 0xc6, 0xe7, 0x22, 0x4c, 0x89, 0xec, 0x70, 0x13, 0x20, 0xca, 0x10, 0xaf, 0x8e, 0x8e,
0x8a, 0xf4, 0xf9, 0xad, 0xaf, 0x65, 0xc6, 0x49, 0x71, 0x8c, 0x1c, 0x76, 0xa1, 0x1c, 0xeb, 0x4f,
0x9c, 0x85, 0x1c, 0x0c, 0x00, 0xbd, 0x9e, 0x1d, 0x38, 0xbc, 0x83, 0xc3, 0xa5, 0xb1, 0x49, 0x80,
0xd7, 0xd3, 0x0f, 0x98, 0x30, 0x70, 0x74, 0xf3, 0x4f, 0xc3, 0x87, 0xb7, 0xbe, 0x41, 0x30, 0x97,
0xda, 0x76, 0x78, 0x23, 0x83, 0xfb, 0xf8, 0x1c, 0xd0, 0x1b, 0xe7, 0x81, 0x0c, 0x29, 0xbc, 0x45,
0xa0, 0x4d, 0x32, 0x28, 0xbe, 0x95, 0x75, 0x64, 0x5a, 0x3f, 0xe9, 0xb7, 0xcf, 0x89, 0x1a, 0x70,
0xd9, 0xde, 0xfb, 0x74, 0x5a, 0x45, 0x27, 0xa7, 0x55, 0xf4, 0xe3, 0xb4, 0x8a, 0xde, 0x9d, 0x55,
0x73, 0x27, 0x67, 0xd5, 0xdc, 0xd7, 0xb3, 0x6a, 0xee, 0xf9, 0x1d, 0xcf, 0xe7, 0x9d, 0x9e, 0x6b,
0xb6, 0xe8, 0xa1, 0xa5, 0xfe, 0x49, 0xe4, 0x63, 0x9d, 0xb5, 0x5f, 0x58, 0xaf, 0xac, 0xf0, 0x17,
0xe3, 0xe6, 0xe6, 0x7a, 0xec, 0x2f, 0x83, 0xf7, 0xbb, 0x84, 0xb9, 0xd3, 0xa2, 0x71, 0x36, 0x7f,
0x05, 0x00, 0x00, 0xff, 0xff, 0x08, 0x00, 0x8a, 0xb3, 0x0b, 0x09, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -973,10 +970,10 @@ func (m *QueryConnectionRequest) MarshalToSizedBuffer(dAtA []byte) (int, error)
_ = i
var l int
_ = l
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0xa
}
@ -1146,10 +1143,10 @@ func (m *QueryClientConnectionsRequest) MarshalToSizedBuffer(dAtA []byte) (int,
_ = i
var l int
_ = l
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0xa
}
@ -1227,10 +1224,10 @@ func (m *QueryConnectionClientStateRequest) MarshalToSizedBuffer(dAtA []byte) (i
_ = i
var l int
_ = l
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0xa
}
@ -1316,10 +1313,10 @@ func (m *QueryConnectionConsensusStateRequest) MarshalToSizedBuffer(dAtA []byte)
i--
dAtA[i] = 0x10
}
if len(m.ConnectionID) > 0 {
i -= len(m.ConnectionID)
copy(dAtA[i:], m.ConnectionID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ConnectionID)))
if len(m.ConnectionId) > 0 {
i -= len(m.ConnectionId)
copy(dAtA[i:], m.ConnectionId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ConnectionId)))
i--
dAtA[i] = 0xa
}
@ -1365,10 +1362,10 @@ func (m *QueryConnectionConsensusStateResponse) MarshalToSizedBuffer(dAtA []byte
i--
dAtA[i] = 0x1a
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0x12
}
@ -1404,7 +1401,7 @@ func (m *QueryConnectionRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -1476,7 +1473,7 @@ func (m *QueryClientConnectionsRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -1515,7 +1512,7 @@ func (m *QueryConnectionClientStateRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -1552,7 +1549,7 @@ func (m *QueryConnectionConsensusStateRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.ConnectionID)
l = len(m.ConnectionId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -1572,7 +1569,7 @@ func (m *QueryConnectionConsensusStateResponse) Size() (n int) {
l = m.ConsensusState.Size()
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -1627,7 +1624,7 @@ func (m *QueryConnectionRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -1655,7 +1652,7 @@ func (m *QueryConnectionRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@ -2117,7 +2114,7 @@ func (m *QueryClientConnectionsRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2145,7 +2142,7 @@ func (m *QueryClientConnectionsRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@ -2372,7 +2369,7 @@ func (m *QueryConnectionClientStateRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2400,7 +2397,7 @@ func (m *QueryConnectionClientStateRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@ -2631,7 +2628,7 @@ func (m *QueryConnectionConsensusStateRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ConnectionId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2659,7 +2656,7 @@ func (m *QueryConnectionConsensusStateRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConnectionID = string(dAtA[iNdEx:postIndex])
m.ConnectionId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 0 {
@ -2771,7 +2768,7 @@ func (m *QueryConnectionConsensusStateResponse) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2799,7 +2796,7 @@ func (m *QueryConnectionConsensusStateResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {

8
x/ibc/04-channel/client/cli/query.go
View File

@ -192,8 +192,8 @@ func GetCmdQueryPacketCommitments() *cobra.Command {
}
req := &types.QueryPacketCommitmentsRequest{
PortID: args[0],
ChannelID: args[1],
PortId: args[0],
ChannelId: args[1],
Pagination: pageReq,
}
@ -292,8 +292,8 @@ Otherwise, the return value represents:
}
req := &types.QueryUnrelayedPacketsRequest{
PortID: args[0],
ChannelID: args[1],
PortId: args[0],
ChannelId: args[1],
PacketCommitmentSequences: seqs,
Acknowledgements: acknowledgements,
}

30
x/ibc/04-channel/client/utils/utils.go
View File

@ -27,8 +27,8 @@ func QueryPacketCommitment(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryPacketCommitmentRequest{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
Sequence: sequence,
}
@ -71,8 +71,8 @@ func QueryChannel(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryChannelRequest{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
}
return queryClient.Channel(context.Background(), req)
@ -112,8 +112,8 @@ func QueryChannelClientState(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryChannelClientStateRequest{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
}
res, err := queryClient.ChannelClientState(context.Background(), req)
@ -122,13 +122,13 @@ func QueryChannelClientState(
}
if prove {
clientState, proof, proofHeight, err := clientutils.QueryClientStateABCI(clientCtx, res.IdentifiedClientState.ID)
clientState, proof, proofHeight, err := clientutils.QueryClientStateABCI(clientCtx, res.IdentifiedClientState.Id)
if err != nil {
return nil, err
}
// use client state returned from ABCI query in case query height differs
identifiedClientState := clienttypes.NewIdentifiedClientState(res.IdentifiedClientState.ID, clientState)
identifiedClientState := clienttypes.NewIdentifiedClientState(res.IdentifiedClientState.Id, clientState)
res = types.NewQueryChannelClientStateResponse(identifiedClientState, proof, int64(proofHeight))
}
@ -144,8 +144,8 @@ func QueryChannelConsensusState(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryChannelConsensusStateRequest{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
Height: height,
}
@ -160,7 +160,7 @@ func QueryChannelConsensusState(
}
if prove {
consensusState, proof, proofHeight, err := clientutils.QueryConsensusStateABCI(clientCtx, res.ClientID, consensusState.GetHeight())
consensusState, proof, proofHeight, err := clientutils.QueryConsensusStateABCI(clientCtx, res.ClientId, consensusState.GetHeight())
if err != nil {
return nil, err
}
@ -171,7 +171,7 @@ func QueryChannelConsensusState(
return nil, err
}
res = types.NewQueryChannelConsensusStateResponse(res.ClientID, anyConsensusState, consensusState.GetHeight(), proof, int64(proofHeight))
res = types.NewQueryChannelConsensusStateResponse(res.ClientId, anyConsensusState, consensusState.GetHeight(), proof, int64(proofHeight))
}
return res, nil
@ -188,7 +188,7 @@ func QueryCounterpartyConsensusState(
}
counterparty := channelRes.Channel.Counterparty
res, err := QueryChannelConsensusState(clientCtx, counterparty.PortID, counterparty.ChannelID, height, false)
res, err := QueryChannelConsensusState(clientCtx, counterparty.PortId, counterparty.ChannelId, height, false)
if err != nil {
return nil, 0, err
}
@ -213,8 +213,8 @@ func QueryNextSequenceReceive(
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryNextSequenceReceiveRequest{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
}
return queryClient.NextSequenceReceive(context.Background(), req)

12
x/ibc/04-channel/genesis.go
View File

@ -11,22 +11,22 @@ import (
func InitGenesis(ctx sdk.Context, k keeper.Keeper, gs types.GenesisState) {
for _, channel := range gs.Channels {
ch := types.NewChannel(channel.State, channel.Ordering, channel.Counterparty, channel.ConnectionHops, channel.Version)
k.SetChannel(ctx, channel.PortID, channel.ChannelID, ch)
k.SetChannel(ctx, channel.PortId, channel.ChannelId, ch)
}
for _, ack := range gs.Acknowledgements {
k.SetPacketAcknowledgement(ctx, ack.PortID, ack.ChannelID, ack.Sequence, ack.Hash)
k.SetPacketAcknowledgement(ctx, ack.PortId, ack.ChannelId, ack.Sequence, ack.Hash)
}
for _, commitment := range gs.Commitments {
k.SetPacketCommitment(ctx, commitment.PortID, commitment.ChannelID, commitment.Sequence, commitment.Hash)
k.SetPacketCommitment(ctx, commitment.PortId, commitment.ChannelId, commitment.Sequence, commitment.Hash)
}
for _, ss := range gs.SendSequences {
k.SetNextSequenceSend(ctx, ss.PortID, ss.ChannelID, ss.Sequence)
k.SetNextSequenceSend(ctx, ss.PortId, ss.ChannelId, ss.Sequence)
}
for _, rs := range gs.RecvSequences {
k.SetNextSequenceRecv(ctx, rs.PortID, rs.ChannelID, rs.Sequence)
k.SetNextSequenceRecv(ctx, rs.PortId, rs.ChannelId, rs.Sequence)
}
for _, as := range gs.AckSequences {
k.SetNextSequenceAck(ctx, as.PortID, as.ChannelID, as.Sequence)
k.SetNextSequenceAck(ctx, as.PortId, as.ChannelId, as.Sequence)
}
}

68
x/ibc/04-channel/handler.go
View File

@ -11,7 +11,7 @@ import (
// HandleMsgChannelOpenInit defines the sdk.Handler for MsgChannelOpenInit
func HandleMsgChannelOpenInit(ctx sdk.Context, k keeper.Keeper, portCap *capabilitytypes.Capability, msg *types.MsgChannelOpenInit) (*sdk.Result, *capabilitytypes.Capability, error) {
capKey, err := k.ChanOpenInit(
ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID,
ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortId, msg.ChannelId,
portCap, msg.Channel.Counterparty, msg.Channel.Version,
)
if err != nil {
@ -21,10 +21,10 @@ func HandleMsgChannelOpenInit(ctx sdk.Context, k keeper.Keeper, portCap *capabil
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeChannelOpenInit,
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortID),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, msg.Channel.Counterparty.PortID),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, msg.Channel.Counterparty.ChannelID),
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortId),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelId),
sdk.NewAttribute(types.AttributeCounterpartyPortID, msg.Channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, msg.Channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.Channel.ConnectionHops[0]),
),
sdk.NewEvent(
@ -40,7 +40,7 @@ func HandleMsgChannelOpenInit(ctx sdk.Context, k keeper.Keeper, portCap *capabil
// HandleMsgChannelOpenTry defines the sdk.Handler for MsgChannelOpenTry
func HandleMsgChannelOpenTry(ctx sdk.Context, k keeper.Keeper, portCap *capabilitytypes.Capability, msg *types.MsgChannelOpenTry) (*sdk.Result, *capabilitytypes.Capability, error) {
capKey, err := k.ChanOpenTry(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID,
capKey, err := k.ChanOpenTry(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortId, msg.ChannelId,
portCap, msg.Channel.Counterparty, msg.Channel.Version, msg.CounterpartyVersion, msg.ProofInit, msg.ProofHeight,
)
if err != nil {
@ -50,10 +50,10 @@ func HandleMsgChannelOpenTry(ctx sdk.Context, k keeper.Keeper, portCap *capabili
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeChannelOpenTry,
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortID),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, msg.Channel.Counterparty.PortID),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, msg.Channel.Counterparty.ChannelID),
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortId),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelId),
sdk.NewAttribute(types.AttributeCounterpartyPortID, msg.Channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, msg.Channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionID, msg.Channel.ConnectionHops[0]),
),
sdk.NewEvent(
@ -70,21 +70,21 @@ func HandleMsgChannelOpenTry(ctx sdk.Context, k keeper.Keeper, portCap *capabili
// HandleMsgChannelOpenAck defines the sdk.Handler for MsgChannelOpenAck
func HandleMsgChannelOpenAck(ctx sdk.Context, k keeper.Keeper, channelCap *capabilitytypes.Capability, msg *types.MsgChannelOpenAck) (*sdk.Result, error) {
err := k.ChanOpenAck(
ctx, msg.PortID, msg.ChannelID, channelCap, msg.CounterpartyVersion, msg.ProofTry, msg.ProofHeight,
ctx, msg.PortId, msg.ChannelId, channelCap, msg.CounterpartyVersion, msg.ProofTry, msg.ProofHeight,
)
if err != nil {
return nil, sdkerrors.Wrap(err, "channel handshake open ack failed")
}
channel, _ := k.GetChannel(ctx, msg.PortID, msg.ChannelID)
channel, _ := k.GetChannel(ctx, msg.PortId, msg.ChannelId)
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeChannelOpenAck,
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortID),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortID),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelID),
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortId),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelId),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
),
sdk.NewEvent(
@ -100,20 +100,20 @@ func HandleMsgChannelOpenAck(ctx sdk.Context, k keeper.Keeper, channelCap *capab
// HandleMsgChannelOpenConfirm defines the sdk.Handler for MsgChannelOpenConfirm
func HandleMsgChannelOpenConfirm(ctx sdk.Context, k keeper.Keeper, channelCap *capabilitytypes.Capability, msg *types.MsgChannelOpenConfirm) (*sdk.Result, error) {
err := k.ChanOpenConfirm(ctx, msg.PortID, msg.ChannelID, channelCap, msg.ProofAck, msg.ProofHeight)
err := k.ChanOpenConfirm(ctx, msg.PortId, msg.ChannelId, channelCap, msg.ProofAck, msg.ProofHeight)
if err != nil {
return nil, sdkerrors.Wrap(err, "channel handshake open confirm failed")
}
channel, _ := k.GetChannel(ctx, msg.PortID, msg.ChannelID)
channel, _ := k.GetChannel(ctx, msg.PortId, msg.ChannelId)
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeChannelOpenConfirm,
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortID),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortID),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelID),
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortId),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelId),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
),
sdk.NewEvent(
@ -129,20 +129,20 @@ func HandleMsgChannelOpenConfirm(ctx sdk.Context, k keeper.Keeper, channelCap *c
// HandleMsgChannelCloseInit defines the sdk.Handler for MsgChannelCloseInit
func HandleMsgChannelCloseInit(ctx sdk.Context, k keeper.Keeper, channelCap *capabilitytypes.Capability, msg *types.MsgChannelCloseInit) (*sdk.Result, error) {
err := k.ChanCloseInit(ctx, msg.PortID, msg.ChannelID, channelCap)
err := k.ChanCloseInit(ctx, msg.PortId, msg.ChannelId, channelCap)
if err != nil {
return nil, sdkerrors.Wrap(err, "channel handshake close init failed")
}
channel, _ := k.GetChannel(ctx, msg.PortID, msg.ChannelID)
channel, _ := k.GetChannel(ctx, msg.PortId, msg.ChannelId)
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeChannelCloseInit,
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortID),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortID),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelID),
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortId),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelId),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
),
sdk.NewEvent(
@ -158,20 +158,20 @@ func HandleMsgChannelCloseInit(ctx sdk.Context, k keeper.Keeper, channelCap *cap
// HandleMsgChannelCloseConfirm defines the sdk.Handler for MsgChannelCloseConfirm
func HandleMsgChannelCloseConfirm(ctx sdk.Context, k keeper.Keeper, channelCap *capabilitytypes.Capability, msg *types.MsgChannelCloseConfirm) (*sdk.Result, error) {
err := k.ChanCloseConfirm(ctx, msg.PortID, msg.ChannelID, channelCap, msg.ProofInit, msg.ProofHeight)
err := k.ChanCloseConfirm(ctx, msg.PortId, msg.ChannelId, channelCap, msg.ProofInit, msg.ProofHeight)
if err != nil {
return nil, sdkerrors.Wrap(err, "channel handshake close confirm failed")
}
channel, _ := k.GetChannel(ctx, msg.PortID, msg.ChannelID)
channel, _ := k.GetChannel(ctx, msg.PortId, msg.ChannelId)
ctx.EventManager().EmitEvents(sdk.Events{
sdk.NewEvent(
types.EventTypeChannelCloseConfirm,
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortID),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelID),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortID),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelID),
sdk.NewAttribute(types.AttributeKeyPortID, msg.PortId),
sdk.NewAttribute(types.AttributeKeyChannelID, msg.ChannelId),
sdk.NewAttribute(types.AttributeCounterpartyPortID, channel.Counterparty.PortId),
sdk.NewAttribute(types.AttributeCounterpartyChannelID, channel.Counterparty.ChannelId),
sdk.NewAttribute(types.AttributeKeyConnectionID, channel.ConnectionHops[0]),
),
sdk.NewEvent(

62
x/ibc/04-channel/keeper/grpc_query.go
View File

@ -26,20 +26,20 @@ func (q Keeper) Channel(c context.Context, req *types.QueryChannelRequest) (*typ
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
ctx := sdk.UnwrapSDKContext(c)
channel, found := q.GetChannel(ctx, req.PortID, req.ChannelID)
channel, found := q.GetChannel(ctx, req.PortId, req.ChannelId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(types.ErrChannelNotFound, "port-id: %s, channel-id %s", req.PortID, req.ChannelID).Error(),
sdkerrors.Wrapf(types.ErrChannelNotFound, "port-id: %s, channel-id %s", req.PortId, req.ChannelId).Error(),
)
}
return types.NewQueryChannelResponse(req.PortID, req.ChannelID, channel, nil, ctx.BlockHeight()), nil
return types.NewQueryChannelResponse(req.PortId, req.ChannelId, channel, nil, ctx.BlockHeight()), nil
}
// Channels implements the Query/Channels gRPC method
@ -134,17 +134,17 @@ func (q Keeper) ChannelClientState(c context.Context, req *types.QueryChannelCli
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
ctx := sdk.UnwrapSDKContext(c)
channel, found := q.GetChannel(ctx, req.PortID, req.ChannelID)
channel, found := q.GetChannel(ctx, req.PortId, req.ChannelId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(types.ErrChannelNotFound, "port-id: %s, channel-id %s", req.PortID, req.ChannelID).Error(),
sdkerrors.Wrapf(types.ErrChannelNotFound, "port-id: %s, channel-id %s", req.PortId, req.ChannelId).Error(),
)
}
@ -156,15 +156,15 @@ func (q Keeper) ChannelClientState(c context.Context, req *types.QueryChannelCli
)
}
clientState, found := q.clientKeeper.GetClientState(ctx, connection.ClientID)
clientState, found := q.clientKeeper.GetClientState(ctx, connection.ClientId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(clienttypes.ErrClientNotFound, "client-id: %s", connection.ClientID).Error(),
sdkerrors.Wrapf(clienttypes.ErrClientNotFound, "client-id: %s", connection.ClientId).Error(),
)
}
identifiedClientState := clienttypes.NewIdentifiedClientState(connection.ClientID, clientState)
identifiedClientState := clienttypes.NewIdentifiedClientState(connection.ClientId, clientState)
return types.NewQueryChannelClientStateResponse(identifiedClientState, nil, ctx.BlockHeight()), nil
@ -176,17 +176,17 @@ func (q Keeper) ChannelConsensusState(c context.Context, req *types.QueryChannel
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
ctx := sdk.UnwrapSDKContext(c)
channel, found := q.GetChannel(ctx, req.PortID, req.ChannelID)
channel, found := q.GetChannel(ctx, req.PortId, req.ChannelId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(types.ErrChannelNotFound, "port-id: %s, channel-id %s", req.PortID, req.ChannelID).Error(),
sdkerrors.Wrapf(types.ErrChannelNotFound, "port-id: %s, channel-id %s", req.PortId, req.ChannelId).Error(),
)
}
@ -198,11 +198,11 @@ func (q Keeper) ChannelConsensusState(c context.Context, req *types.QueryChannel
)
}
consensusState, found := q.clientKeeper.GetClientConsensusState(ctx, connection.ClientID, req.Height)
consensusState, found := q.clientKeeper.GetClientConsensusState(ctx, connection.ClientId, req.Height)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(clienttypes.ErrConsensusStateNotFound, "client-id: %s", connection.ClientID).Error(),
sdkerrors.Wrapf(clienttypes.ErrConsensusStateNotFound, "client-id: %s", connection.ClientId).Error(),
)
}
@ -211,7 +211,7 @@ func (q Keeper) ChannelConsensusState(c context.Context, req *types.QueryChannel
return nil, status.Error(codes.Internal, err.Error())
}
return types.NewQueryChannelConsensusStateResponse(connection.ClientID, anyConsensusState, consensusState.GetHeight(), nil, ctx.BlockHeight()), nil
return types.NewQueryChannelConsensusStateResponse(connection.ClientId, anyConsensusState, consensusState.GetHeight(), nil, ctx.BlockHeight()), nil
}
// PacketCommitment implements the Query/PacketCommitment gRPC method
@ -220,7 +220,7 @@ func (q Keeper) PacketCommitment(c context.Context, req *types.QueryPacketCommit
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
@ -230,12 +230,12 @@ func (q Keeper) PacketCommitment(c context.Context, req *types.QueryPacketCommit
ctx := sdk.UnwrapSDKContext(c)
commitmentBz := q.GetPacketCommitment(ctx, req.PortID, req.ChannelID, req.Sequence)
commitmentBz := q.GetPacketCommitment(ctx, req.PortId, req.ChannelId, req.Sequence)
if len(commitmentBz) == 0 {
return nil, status.Error(codes.NotFound, "packet commitment hash not found")
}
return types.NewQueryPacketCommitmentResponse(req.PortID, req.ChannelID, req.Sequence, commitmentBz, nil, ctx.BlockHeight()), nil
return types.NewQueryPacketCommitmentResponse(req.PortId, req.ChannelId, req.Sequence, commitmentBz, nil, ctx.BlockHeight()), nil
}
// PacketCommitments implements the Query/PacketCommitments gRPC method
@ -244,14 +244,14 @@ func (q Keeper) PacketCommitments(c context.Context, req *types.QueryPacketCommi
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
ctx := sdk.UnwrapSDKContext(c)
commitments := []*types.PacketAckCommitment{}
store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.PacketCommitmentPrefixPath(req.PortID, req.ChannelID)))
store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.PacketCommitmentPrefixPath(req.PortId, req.ChannelId)))
pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
keySplit := strings.Split(string(key), "/")
@ -261,7 +261,7 @@ func (q Keeper) PacketCommitments(c context.Context, req *types.QueryPacketCommi
return err
}
commitment := types.NewPacketAckCommitment(req.PortID, req.ChannelID, sequence, value)
commitment := types.NewPacketAckCommitment(req.PortId, req.ChannelId, sequence, value)
commitments = append(commitments, &commitment)
return nil
})
@ -283,7 +283,7 @@ func (q Keeper) PacketAcknowledgement(c context.Context, req *types.QueryPacketA
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
@ -293,12 +293,12 @@ func (q Keeper) PacketAcknowledgement(c context.Context, req *types.QueryPacketA
ctx := sdk.UnwrapSDKContext(c)
acknowledgementBz, found := q.GetPacketAcknowledgement(ctx, req.PortID, req.ChannelID, req.Sequence)
acknowledgementBz, found := q.GetPacketAcknowledgement(ctx, req.PortId, req.ChannelId, req.Sequence)
if !found || len(acknowledgementBz) == 0 {
return nil, status.Error(codes.NotFound, "packet acknowledgement hash not found")
}
return types.NewQueryPacketAcknowledgementResponse(req.PortID, req.ChannelID, req.Sequence, acknowledgementBz, nil, ctx.BlockHeight()), nil
return types.NewQueryPacketAcknowledgementResponse(req.PortId, req.ChannelId, req.Sequence, acknowledgementBz, nil, ctx.BlockHeight()), nil
}
// UnrelayedPackets implements the Query/UnrelayedPackets gRPC method. Given
@ -316,7 +316,7 @@ func (q Keeper) UnrelayedPackets(c context.Context, req *types.QueryUnrelayedPac
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
@ -331,7 +331,7 @@ func (q Keeper) UnrelayedPackets(c context.Context, req *types.QueryUnrelayedPac
// if req.Acknowledgements is true append sequences with an existing acknowledgement
// otherwise append sequences without an existing acknowledgement.
if _, found := q.GetPacketAcknowledgement(ctx, req.PortID, req.ChannelID, seq); found == req.Acknowledgements {
if _, found := q.GetPacketAcknowledgement(ctx, req.PortId, req.ChannelId, seq); found == req.Acknowledgements {
unrelayedSequences = append(unrelayedSequences, seq)
}
@ -348,20 +348,20 @@ func (q Keeper) NextSequenceReceive(c context.Context, req *types.QueryNextSeque
return nil, status.Error(codes.InvalidArgument, "empty request")
}
if err := validategRPCRequest(req.PortID, req.ChannelID); err != nil {
if err := validategRPCRequest(req.PortId, req.ChannelId); err != nil {
return nil, err
}
ctx := sdk.UnwrapSDKContext(c)
sequence, found := q.GetNextSequenceRecv(ctx, req.PortID, req.ChannelID)
sequence, found := q.GetNextSequenceRecv(ctx, req.PortId, req.ChannelId)
if !found {
return nil, status.Error(
codes.NotFound,
sdkerrors.Wrapf(types.ErrSequenceReceiveNotFound, "port-id: %s, channel-id %s", req.PortID, req.ChannelID).Error(),
sdkerrors.Wrapf(types.ErrSequenceReceiveNotFound, "port-id: %s, channel-id %s", req.PortId, req.ChannelId).Error(),
)
}
return types.NewQueryNextSequenceReceiveResponse(req.PortID, req.ChannelID, sequence, nil, ctx.BlockHeight()), nil
return types.NewQueryNextSequenceReceiveResponse(req.PortId, req.ChannelId, sequence, nil, ctx.BlockHeight()), nil
}
func validategRPCRequest(portID, channelID string) error {

188
x/ibc/04-channel/keeper/grpc_query_test.go
View File

@ -34,8 +34,8 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
"invalid port ID",
func() {
req = &types.QueryChannelRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
}
},
false,
@ -44,8 +44,8 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
"invalid channel ID",
func() {
req = &types.QueryChannelRequest{
PortID: "test-port-id",
ChannelID: "",
PortId: "test-port-id",
ChannelId: "",
}
},
false,
@ -53,8 +53,8 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
{"channel not found",
func() {
req = &types.QueryChannelRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
}
},
false,
@ -70,8 +70,8 @@ func (suite *KeeperTestSuite) TestQueryChannel() {
expChannel = suite.chainA.GetChannel(channelA)
req = &types.QueryChannelRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
}
},
true,
@ -129,15 +129,15 @@ func (suite *KeeperTestSuite) TestQueryChannels() {
_, _, connA0, connB0, testchannel0, _ := suite.coordinator.Setup(suite.chainA, suite.chainB)
// channel0 on first connection on chainA
counterparty0 := types.Counterparty{
PortID: connB0.Channels[0].PortID,
ChannelID: connB0.Channels[0].ID,
PortId: connB0.Channels[0].PortID,
ChannelId: connB0.Channels[0].ID,
}
// channel1 is second channel on first connection on chainA
testchannel1, _ := suite.coordinator.CreateChannel(suite.chainA, suite.chainB, connA0, connB0, types.ORDERED)
counterparty1 := types.Counterparty{
PortID: connB0.Channels[1].PortID,
ChannelID: connB0.Channels[1].ID,
PortId: connB0.Channels[1].PortID,
ChannelId: connB0.Channels[1].ID,
}
channel0 := types.NewChannel(
@ -220,15 +220,15 @@ func (suite *KeeperTestSuite) TestQueryConnectionChannels() {
_, _, connA0, connB0, testchannel0, _ := suite.coordinator.Setup(suite.chainA, suite.chainB)
// channel0 on first connection on chainA
counterparty0 := types.Counterparty{
PortID: connB0.Channels[0].PortID,
ChannelID: connB0.Channels[0].ID,
PortId: connB0.Channels[0].PortID,
ChannelId: connB0.Channels[0].ID,
}
// channel1 is second channel on first connection on chainA
testchannel1, _ := suite.coordinator.CreateChannel(suite.chainA, suite.chainB, connA0, connB0, types.ORDERED)
counterparty1 := types.Counterparty{
PortID: connB0.Channels[1].PortID,
ChannelID: connB0.Channels[1].ID,
PortId: connB0.Channels[1].PortID,
ChannelId: connB0.Channels[1].ID,
}
channel0 := types.NewChannel(
@ -316,8 +316,8 @@ func (suite *KeeperTestSuite) TestQueryChannelClientState() {
"invalid port ID",
func() {
req = &types.QueryChannelClientStateRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
}
},
false,
@ -326,8 +326,8 @@ func (suite *KeeperTestSuite) TestQueryChannelClientState() {
"invalid channel ID",
func() {
req = &types.QueryChannelClientStateRequest{
PortID: "test-port-id",
ChannelID: "",
PortId: "test-port-id",
ChannelId: "",
}
},
false,
@ -336,8 +336,8 @@ func (suite *KeeperTestSuite) TestQueryChannelClientState() {
"channel not found",
func() {
req = &types.QueryChannelClientStateRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
}
},
false,
@ -355,8 +355,8 @@ func (suite *KeeperTestSuite) TestQueryChannelClientState() {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetChannel(suite.chainA.GetContext(), channelA.PortID, channelA.ID, channel)
req = &types.QueryChannelClientStateRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
}
}, false,
},
@ -369,8 +369,8 @@ func (suite *KeeperTestSuite) TestQueryChannelClientState() {
suite.chainA.App.IBCKeeper.ConnectionKeeper.SetConnection(suite.chainA.GetContext(), connA.ID, connectiontypes.ConnectionEnd{})
req = &types.QueryChannelClientStateRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
}
}, false,
},
@ -386,8 +386,8 @@ func (suite *KeeperTestSuite) TestQueryChannelClientState() {
expIdentifiedClientState = clienttypes.NewIdentifiedClientState(clientA, expClientState)
req = &types.QueryChannelClientStateRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
}
},
true,
@ -437,8 +437,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() {
"invalid port ID",
func() {
req = &types.QueryChannelConsensusStateRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
Height: 1,
}
},
@ -448,8 +448,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() {
"invalid channel ID",
func() {
req = &types.QueryChannelConsensusStateRequest{
PortID: "test-port-id",
ChannelID: "",
PortId: "test-port-id",
ChannelId: "",
Height: 1,
}
},
@ -459,8 +459,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() {
"channel not found",
func() {
req = &types.QueryChannelConsensusStateRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
Height: 1,
}
},
@ -479,8 +479,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetChannel(suite.chainA.GetContext(), channelA.PortID, channelA.ID, channel)
req = &types.QueryChannelConsensusStateRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
Height: 1,
}
}, false,
@ -491,8 +491,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() {
_, _, _, _, channelA, _ := suite.coordinator.Setup(suite.chainA, suite.chainB)
req = &types.QueryChannelConsensusStateRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
Height: uint64(suite.chainA.GetContext().BlockHeight()), // use current height
}
}, false,
@ -511,8 +511,8 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() {
expClientID = clientA
req = &types.QueryChannelConsensusStateRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
Height: expConsensusState.GetHeight(),
}
},
@ -535,7 +535,7 @@ func (suite *KeeperTestSuite) TestQueryChannelConsensusState() {
consensusState, err := clienttypes.UnpackConsensusState(res.ConsensusState)
suite.Require().NoError(err)
suite.Require().Equal(expConsensusState, consensusState)
suite.Require().Equal(expClientID, res.ClientID)
suite.Require().Equal(expClientID, res.ClientId)
} else {
suite.Require().Error(err)
}
@ -565,8 +565,8 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitment() {
"invalid port ID",
func() {
req = &types.QueryPacketCommitmentRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
Sequence: 0,
}
},
@ -576,8 +576,8 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitment() {
"invalid channel ID",
func() {
req = &types.QueryPacketCommitmentRequest{
PortID: "test-port-id",
ChannelID: "",
PortId: "test-port-id",
ChannelId: "",
Sequence: 0,
}
},
@ -586,8 +586,8 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitment() {
{"invalid sequence",
func() {
req = &types.QueryPacketCommitmentRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
Sequence: 0,
}
},
@ -596,8 +596,8 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitment() {
{"channel not found",
func() {
req = &types.QueryPacketCommitmentRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
Sequence: 1,
}
},
@ -611,8 +611,8 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitment() {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketCommitment(suite.chainA.GetContext(), channelA.PortID, channelA.ID, 1, expCommitment)
req = &types.QueryPacketCommitmentRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
Sequence: 1,
}
},
@ -662,8 +662,8 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitments() {
"invalid ID",
func() {
req = &types.QueryPacketCommitmentsRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
}
},
false,
@ -674,8 +674,8 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitments() {
expCommitments = []*types.PacketAckCommitment{}
req = &types.QueryPacketCommitmentsRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
Pagination: &query.PageRequest{
Key: nil,
Limit: 2,
@ -694,13 +694,13 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitments() {
for i := uint64(0); i < 9; i++ {
commitment := types.NewPacketAckCommitment(channelA.PortID, channelA.ID, i, []byte(fmt.Sprintf("hash_%d", i)))
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketCommitment(suite.chainA.GetContext(), commitment.PortID, commitment.ChannelID, commitment.Sequence, commitment.Hash)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketCommitment(suite.chainA.GetContext(), commitment.PortId, commitment.ChannelId, commitment.Sequence, commitment.Hash)
expCommitments[i] = &commitment
}
req = &types.QueryPacketCommitmentsRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
Pagination: &query.PageRequest{
Key: nil,
Limit: 11,
@ -754,8 +754,8 @@ func (suite *KeeperTestSuite) TestQueryPacketAcknowledgement() {
"invalid port ID",
func() {
req = &types.QueryPacketAcknowledgementRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
Sequence: 0,
}
},
@ -765,8 +765,8 @@ func (suite *KeeperTestSuite) TestQueryPacketAcknowledgement() {
"invalid channel ID",
func() {
req = &types.QueryPacketAcknowledgementRequest{
PortID: "test-port-id",
ChannelID: "",
PortId: "test-port-id",
ChannelId: "",
Sequence: 0,
}
},
@ -775,8 +775,8 @@ func (suite *KeeperTestSuite) TestQueryPacketAcknowledgement() {
{"invalid sequence",
func() {
req = &types.QueryPacketAcknowledgementRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
Sequence: 0,
}
},
@ -785,8 +785,8 @@ func (suite *KeeperTestSuite) TestQueryPacketAcknowledgement() {
{"channel not found",
func() {
req = &types.QueryPacketAcknowledgementRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
Sequence: 1,
}
},
@ -800,8 +800,8 @@ func (suite *KeeperTestSuite) TestQueryPacketAcknowledgement() {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketAcknowledgement(suite.chainA.GetContext(), channelA.PortID, channelA.ID, 1, expAck)
req = &types.QueryPacketAcknowledgementRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
Sequence: 1,
}
},
@ -851,8 +851,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
"invalid port ID",
func() {
req = &types.QueryUnrelayedPacketsRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
}
},
false,
@ -861,8 +861,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
"invalid channel ID",
func() {
req = &types.QueryUnrelayedPacketsRequest{
PortID: "test-port-id",
ChannelID: "",
PortId: "test-port-id",
ChannelId: "",
}
},
false,
@ -871,8 +871,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
"invalid seq",
func() {
req = &types.QueryUnrelayedPacketsRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
PacketCommitmentSequences: []uint64{0},
}
},
@ -887,8 +887,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
expSeq = []uint64{1}
req = &types.QueryUnrelayedPacketsRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
PacketCommitmentSequences: []uint64{1},
Acknowledgements: false,
}
@ -906,8 +906,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
expSeq = []uint64{}
req = &types.QueryUnrelayedPacketsRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
PacketCommitmentSequences: []uint64{1},
Acknowledgements: false,
}
@ -925,8 +925,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
expSeq = []uint64{1}
req = &types.QueryUnrelayedPacketsRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
PacketCommitmentSequences: []uint64{1},
Acknowledgements: true,
}
@ -942,8 +942,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
expSeq = []uint64{}
req = &types.QueryUnrelayedPacketsRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
PacketCommitmentSequences: []uint64{1},
Acknowledgements: true,
}
@ -970,8 +970,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
}
req = &types.QueryUnrelayedPacketsRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
PacketCommitmentSequences: packetCommitments,
Acknowledgements: false,
}
@ -997,8 +997,8 @@ func (suite *KeeperTestSuite) TestQueryUnrelayedPackets() {
}
req = &types.QueryUnrelayedPacketsRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
PacketCommitmentSequences: packetCommitments,
Acknowledgements: true,
}
@ -1049,8 +1049,8 @@ func (suite *KeeperTestSuite) TestQueryNextSequenceReceive() {
"invalid port ID",
func() {
req = &types.QueryNextSequenceReceiveRequest{
PortID: "",
ChannelID: "test-channel-id",
PortId: "",
ChannelId: "test-channel-id",
}
},
false,
@ -1059,8 +1059,8 @@ func (suite *KeeperTestSuite) TestQueryNextSequenceReceive() {
"invalid channel ID",
func() {
req = &types.QueryNextSequenceReceiveRequest{
PortID: "test-port-id",
ChannelID: "",
PortId: "test-port-id",
ChannelId: "",
}
},
false,
@ -1068,8 +1068,8 @@ func (suite *KeeperTestSuite) TestQueryNextSequenceReceive() {
{"channel not found",
func() {
req = &types.QueryNextSequenceReceiveRequest{
PortID: "test-port-id",
ChannelID: "test-channel-id",
PortId: "test-port-id",
ChannelId: "test-channel-id",
}
},
false,
@ -1082,8 +1082,8 @@ func (suite *KeeperTestSuite) TestQueryNextSequenceReceive() {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetNextSequenceRecv(suite.chainA.GetContext(), channelA.PortID, channelA.ID, expSeq)
req = &types.QueryNextSequenceReceiveRequest{
PortID: channelA.PortID,
ChannelID: channelA.ID,
PortId: channelA.PortID,
ChannelId: channelA.ID,
}
},
true,

12
x/ibc/04-channel/keeper/handshake.go
View File

@ -111,8 +111,8 @@ func (k Keeper) ChanOpenTry(
previousChannel, found := k.GetChannel(ctx, portID, channelID)
if found && !(previousChannel.State == types.INIT &&
previousChannel.Ordering == order &&
previousChannel.Counterparty.PortID == counterparty.PortID &&
previousChannel.Counterparty.ChannelID == counterparty.ChannelID &&
previousChannel.Counterparty.PortId == counterparty.PortId &&
previousChannel.Counterparty.ChannelId == counterparty.ChannelId &&
previousChannel.ConnectionHops[0] == connectionHops[0] &&
previousChannel.Version == version) {
return nil, sdkerrors.Wrap(types.ErrInvalidChannel, "cannot relay connection attempt")
@ -170,7 +170,7 @@ func (k Keeper) ChanOpenTry(
if err := k.connectionKeeper.VerifyChannelState(
ctx, connectionEnd, proofHeight, proofInit,
counterparty.PortID, counterparty.ChannelID, expectedChannel,
counterparty.PortId, counterparty.ChannelId, expectedChannel,
); err != nil {
return nil, err
}
@ -244,7 +244,7 @@ func (k Keeper) ChanOpenAck(
if err := k.connectionKeeper.VerifyChannelState(
ctx, connectionEnd, proofHeight, proofTry,
channel.Counterparty.PortID, channel.Counterparty.ChannelID,
channel.Counterparty.PortId, channel.Counterparty.ChannelId,
expectedChannel,
); err != nil {
return err
@ -311,7 +311,7 @@ func (k Keeper) ChanOpenConfirm(
if err := k.connectionKeeper.VerifyChannelState(
ctx, connectionEnd, proofHeight, proofAck,
channel.Counterparty.PortID, channel.Counterparty.ChannelID,
channel.Counterparty.PortId, channel.Counterparty.ChannelId,
expectedChannel,
); err != nil {
return err
@ -419,7 +419,7 @@ func (k Keeper) ChanCloseConfirm(
if err := k.connectionKeeper.VerifyChannelState(
ctx, connectionEnd, proofHeight, proofInit,
channel.Counterparty.PortID, channel.Counterparty.ChannelID,
channel.Counterparty.PortId, channel.Counterparty.ChannelId,
expectedChannel,
); err != nil {
return err

2
x/ibc/04-channel/keeper/handshake_test.go
View File

@ -257,7 +257,7 @@ func (suite *KeeperTestSuite) TestChanOpenTry() {
counterparty := types.NewCounterparty(connA.FirstOrNextTestChannel().PortID, connA.FirstOrNextTestChannel().ID)
channelB := connB.FirstOrNextTestChannel()
channelKey := host.KeyChannel(counterparty.PortID, counterparty.ChannelID)
channelKey := host.KeyChannel(counterparty.PortId, counterparty.ChannelId)
proof, proofHeight := suite.chainA.QueryProof(channelKey)
cap, err := suite.chainB.App.IBCKeeper.ChannelKeeper.ChanOpenTry(

26
x/ibc/04-channel/keeper/keeper_test.go
View File

@ -63,15 +63,15 @@ func (suite KeeperTestSuite) TestGetAllChannels() {
clientA, clientB, connA0, connB0, testchannel0, _ := suite.coordinator.Setup(suite.chainA, suite.chainB)
// channel0 on first connection on chainA
counterparty0 := types.Counterparty{
PortID: connB0.Channels[0].PortID,
ChannelID: connB0.Channels[0].ID,
PortId: connB0.Channels[0].PortID,
ChannelId: connB0.Channels[0].ID,
}
// channel1 is second channel on first connection on chainA
testchannel1, _ := suite.coordinator.CreateChannel(suite.chainA, suite.chainB, connA0, connB0, types.ORDERED)
counterparty1 := types.Counterparty{
PortID: connB0.Channels[1].PortID,
ChannelID: connB0.Channels[1].ID,
PortId: connB0.Channels[1].PortID,
ChannelId: connB0.Channels[1].ID,
}
connA1, connB1 := suite.coordinator.CreateConnection(suite.chainA, suite.chainB, clientA, clientB)
@ -81,8 +81,8 @@ func (suite KeeperTestSuite) TestGetAllChannels() {
suite.Require().NoError(err)
counterparty2 := types.Counterparty{
PortID: connB1.Channels[0].PortID,
ChannelID: connB1.Channels[0].ID,
PortId: connB1.Channels[0].PortID,
ChannelId: connB1.Channels[0].ID,
}
channel0 := types.NewChannel(
@ -127,9 +127,9 @@ func (suite KeeperTestSuite) TestGetAllSequences() {
ctxA := suite.chainA.GetContext()
for _, seq := range []types.PacketSequence{seq1, seq2, seq3} {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetNextSequenceSend(ctxA, seq.PortID, seq.ChannelID, seq.Sequence)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetNextSequenceRecv(ctxA, seq.PortID, seq.ChannelID, seq.Sequence)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetNextSequenceAck(ctxA, seq.PortID, seq.ChannelID, seq.Sequence)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetNextSequenceSend(ctxA, seq.PortId, seq.ChannelId, seq.Sequence)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetNextSequenceRecv(ctxA, seq.PortId, seq.ChannelId, seq.Sequence)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetNextSequenceAck(ctxA, seq.PortId, seq.ChannelId, seq.Sequence)
}
sendSeqs := suite.chainA.App.IBCKeeper.ChannelKeeper.GetAllPacketSendSeqs(ctxA)
@ -175,12 +175,12 @@ func (suite KeeperTestSuite) TestGetAllCommitmentsAcks() {
// set acknowledgements
for _, ack := range []types.PacketAckCommitment{ack1, ack2, ack2dup, ack3} {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketAcknowledgement(ctxA, ack.PortID, ack.ChannelID, ack.Sequence, ack.Hash)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketAcknowledgement(ctxA, ack.PortId, ack.ChannelId, ack.Sequence, ack.Hash)
}
// set packet commitments
for _, comm := range expCommitments {
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketCommitment(ctxA, comm.PortID, comm.ChannelID, comm.Sequence, comm.Hash)
suite.chainA.App.IBCKeeper.ChannelKeeper.SetPacketCommitment(ctxA, comm.PortId, comm.ChannelId, comm.Sequence, comm.Hash)
}
acks := suite.chainA.App.IBCKeeper.ChannelKeeper.GetAllPacketAcks(ctxA)
@ -274,8 +274,8 @@ func (suite *KeeperTestSuite) TestGetAllPacketCommitmentsAtChannel() {
// verify that all the packet commitments were stored
for _, packet := range commitments {
suite.True(expectedSeqs[packet.Sequence])
suite.Equal(channelA.PortID, packet.PortID)
suite.Equal(channelA.ID, packet.ChannelID)
suite.Equal(channelA.PortID, packet.PortId)
suite.Equal(channelA.ID, packet.ChannelId)
suite.Equal(hash, packet.Hash)
// prevent duplicates from passing checks

24
x/ibc/04-channel/keeper/packet.go
View File

@ -43,17 +43,17 @@ func (k Keeper) SendPacket(
return sdkerrors.Wrapf(types.ErrChannelCapabilityNotFound, "caller does not own capability for channel, port ID (%s) channel ID (%s)", packet.GetSourcePort(), packet.GetSourceChannel())
}
if packet.GetDestPort() != channel.Counterparty.PortID {
if packet.GetDestPort() != channel.Counterparty.PortId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortID,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortId,
)
}
if packet.GetDestChannel() != channel.Counterparty.ChannelID {
if packet.GetDestChannel() != channel.Counterparty.ChannelId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelID,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelId,
)
}
@ -164,17 +164,17 @@ func (k Keeper) RecvPacket(
// so the capability authentication can be omitted here
// packet must come from the channel's counterparty
if packet.GetSourcePort() != channel.Counterparty.PortID {
if packet.GetSourcePort() != channel.Counterparty.PortId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet source port doesn't match the counterparty's port (%s ≠ %s)", packet.GetSourcePort(), channel.Counterparty.PortID,
"packet source port doesn't match the counterparty's port (%s ≠ %s)", packet.GetSourcePort(), channel.Counterparty.PortId,
)
}
if packet.GetSourceChannel() != channel.Counterparty.ChannelID {
if packet.GetSourceChannel() != channel.Counterparty.ChannelId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet source channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetSourceChannel(), channel.Counterparty.ChannelID,
"packet source channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetSourceChannel(), channel.Counterparty.ChannelId,
)
}
@ -361,17 +361,17 @@ func (k Keeper) AcknowledgePacket(
// so the capability authentication can be omitted here
// packet must have been sent to the channel's counterparty
if packet.GetDestPort() != channel.Counterparty.PortID {
if packet.GetDestPort() != channel.Counterparty.PortId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortID,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortId,
)
}
if packet.GetDestChannel() != channel.Counterparty.ChannelID {
if packet.GetDestChannel() != channel.Counterparty.ChannelId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelID,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelId,
)
}

2
x/ibc/04-channel/keeper/packet_test.go
View File

@ -125,7 +125,7 @@ func (suite *KeeperTestSuite) TestSendPacket() {
// change connection client ID
connection := suite.chainA.GetConnection(connA)
connection.ClientID = ibctesting.InvalidID
connection.ClientId = ibctesting.InvalidID
suite.chainA.App.IBCKeeper.ConnectionKeeper.SetConnection(suite.chainA.GetContext(), connA.ID, connection)
packet = types.NewPacket(validPacketData, 1, channelA.PortID, channelA.ID, channelB.PortID, channelB.ID, timeoutHeight, disabledTimeoutTimestamp)

18
x/ibc/04-channel/keeper/timeout.go
View File

@ -44,17 +44,17 @@ func (k Keeper) TimeoutPacket(
// NOTE: TimeoutPacket is called by the AnteHandler which acts upon the packet.Route(),
// so the capability authentication can be omitted here
if packet.GetDestPort() != channel.Counterparty.PortID {
if packet.GetDestPort() != channel.Counterparty.PortId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortID,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortId,
)
}
if packet.GetDestChannel() != channel.Counterparty.ChannelID {
if packet.GetDestChannel() != channel.Counterparty.ChannelId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelID,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelId,
)
}
@ -194,17 +194,17 @@ func (k Keeper) TimeoutOnClose(
)
}
if packet.GetDestPort() != channel.Counterparty.PortID {
if packet.GetDestPort() != channel.Counterparty.PortId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortID,
"packet destination port doesn't match the counterparty's port (%s ≠ %s)", packet.GetDestPort(), channel.Counterparty.PortId,
)
}
if packet.GetDestChannel() != channel.Counterparty.ChannelID {
if packet.GetDestChannel() != channel.Counterparty.ChannelId {
return sdkerrors.Wrapf(
types.ErrInvalidPacket,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelID,
"packet destination channel doesn't match the counterparty's channel (%s ≠ %s)", packet.GetDestChannel(), channel.Counterparty.ChannelId,
)
}
@ -234,7 +234,7 @@ func (k Keeper) TimeoutOnClose(
// check that the opposing channel end has closed
if err := k.connectionKeeper.VerifyChannelState(
ctx, connectionEnd, proofHeight, proofClosed,
channel.Counterparty.PortID, channel.Counterparty.ChannelID,
channel.Counterparty.PortId, channel.Counterparty.ChannelId,
expectedChannel,
); err != nil {
return err

20
x/ibc/04-channel/types/channel.go
View File

@ -73,27 +73,27 @@ func (ch Channel) ValidateBasic() error {
// NewCounterparty returns a new Counterparty instance
func NewCounterparty(portID, channelID string) Counterparty {
return Counterparty{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
}
}
// GetPortID implements CounterpartyI interface
func (c Counterparty) GetPortID() string {
return c.PortID
return c.PortId
}
// GetChannelID implements CounterpartyI interface
func (c Counterparty) GetChannelID() string {
return c.ChannelID
return c.ChannelId
}
// ValidateBasic performs a basic validation check of the identifiers
func (c Counterparty) ValidateBasic() error {
if err := host.PortIdentifierValidator(c.PortID); err != nil {
if err := host.PortIdentifierValidator(c.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid counterparty port ID")
}
if err := host.ChannelIdentifierValidator(c.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(c.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid counterparty channel ID")
}
return nil
@ -107,17 +107,17 @@ func NewIdentifiedChannel(portID, channelID string, ch Channel) IdentifiedChanne
Counterparty: ch.Counterparty,
ConnectionHops: ch.ConnectionHops,
Version: ch.Version,
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
}
}
// ValidateBasic performs a basic validation of the identifiers and channel fields.
func (ic IdentifiedChannel) ValidateBasic() error {
if err := host.ChannelIdentifierValidator(ic.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(ic.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid channel ID")
}
if err := host.PortIdentifierValidator(ic.PortID); err != nil {
if err := host.PortIdentifierValidator(ic.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid port ID")
}
channel := NewChannel(ic.State, ic.Ordering, ic.Counterparty, ic.ConnectionHops, ic.Version)

498
x/ibc/04-channel/types/channel.pb.go
View File

@ -101,8 +101,8 @@ func (Order) EnumDescriptor() ([]byte, []int) {
// MsgChannelOpenInit defines an sdk.Msg to initialize a channel handshake. It is
// called by a relayer on Chain A.
type MsgChannelOpenInit struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
Channel Channel `protobuf:"bytes,3,opt,name=channel,proto3" json:"channel"`
Signer github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,4,opt,name=signer,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"signer,omitempty"`
}
@ -140,16 +140,16 @@ func (m *MsgChannelOpenInit) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgChannelOpenInit proto.InternalMessageInfo
func (m *MsgChannelOpenInit) GetPortID() string {
func (m *MsgChannelOpenInit) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *MsgChannelOpenInit) GetChannelID() string {
func (m *MsgChannelOpenInit) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -171,8 +171,8 @@ func (m *MsgChannelOpenInit) GetSigner() github_com_cosmos_cosmos_sdk_types.AccA
// MsgChannelOpenInit defines a msg sent by a Relayer to try to open a channel
// on Chain B.
type MsgChannelOpenTry struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
Channel Channel `protobuf:"bytes,3,opt,name=channel,proto3" json:"channel"`
CounterpartyVersion string `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty" yaml:"counterparty_version"`
ProofInit []byte `protobuf:"bytes,5,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"`
@ -213,16 +213,16 @@ func (m *MsgChannelOpenTry) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgChannelOpenTry proto.InternalMessageInfo
func (m *MsgChannelOpenTry) GetPortID() string {
func (m *MsgChannelOpenTry) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *MsgChannelOpenTry) GetChannelID() string {
func (m *MsgChannelOpenTry) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -265,8 +265,8 @@ func (m *MsgChannelOpenTry) GetSigner() github_com_cosmos_cosmos_sdk_types.AccAd
// MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge
// the change of channel state to TRYOPEN on Chain B.
type MsgChannelOpenAck struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
CounterpartyVersion string `protobuf:"bytes,3,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty" yaml:"counterparty_version"`
ProofTry []byte `protobuf:"bytes,4,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty" yaml:"proof_try"`
ProofHeight uint64 `protobuf:"varint,5,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height,omitempty" yaml:"proof_height"`
@ -306,16 +306,16 @@ func (m *MsgChannelOpenAck) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgChannelOpenAck proto.InternalMessageInfo
func (m *MsgChannelOpenAck) GetPortID() string {
func (m *MsgChannelOpenAck) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *MsgChannelOpenAck) GetChannelID() string {
func (m *MsgChannelOpenAck) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -351,8 +351,8 @@ func (m *MsgChannelOpenAck) GetSigner() github_com_cosmos_cosmos_sdk_types.AccAd
// MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain B to acknowledge
// the change of channel state to OPEN on Chain A.
type MsgChannelOpenConfirm struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
ProofAck []byte `protobuf:"bytes,3,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty" yaml:"proof_ack"`
ProofHeight uint64 `protobuf:"varint,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height,omitempty" yaml:"proof_height"`
Signer github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,5,opt,name=signer,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"signer,omitempty"`
@ -391,16 +391,16 @@ func (m *MsgChannelOpenConfirm) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgChannelOpenConfirm proto.InternalMessageInfo
func (m *MsgChannelOpenConfirm) GetPortID() string {
func (m *MsgChannelOpenConfirm) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *MsgChannelOpenConfirm) GetChannelID() string {
func (m *MsgChannelOpenConfirm) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -429,8 +429,8 @@ func (m *MsgChannelOpenConfirm) GetSigner() github_com_cosmos_cosmos_sdk_types.A
// MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain A
// to close a channel with Chain B.
type MsgChannelCloseInit struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
Signer github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,3,opt,name=signer,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"signer,omitempty"`
}
@ -467,16 +467,16 @@ func (m *MsgChannelCloseInit) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgChannelCloseInit proto.InternalMessageInfo
func (m *MsgChannelCloseInit) GetPortID() string {
func (m *MsgChannelCloseInit) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *MsgChannelCloseInit) GetChannelID() string {
func (m *MsgChannelCloseInit) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -491,8 +491,8 @@ func (m *MsgChannelCloseInit) GetSigner() github_com_cosmos_cosmos_sdk_types.Acc
// MsgChannelCloseConfirm defines a msg sent by a Relayer to Chain B
// to acknowledge the change of channel state to CLOSED on Chain A.
type MsgChannelCloseConfirm struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
ProofInit []byte `protobuf:"bytes,3,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"`
ProofHeight uint64 `protobuf:"varint,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height,omitempty" yaml:"proof_height"`
Signer github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,5,opt,name=signer,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"signer,omitempty"`
@ -531,16 +531,16 @@ func (m *MsgChannelCloseConfirm) XXX_DiscardUnknown() {
var xxx_messageInfo_MsgChannelCloseConfirm proto.InternalMessageInfo
func (m *MsgChannelCloseConfirm) GetPortID() string {
func (m *MsgChannelCloseConfirm) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *MsgChannelCloseConfirm) GetChannelID() string {
func (m *MsgChannelCloseConfirm) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -854,9 +854,9 @@ type IdentifiedChannel struct {
// opaque channel version, which is agreed upon during the handshake
Version string `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"`
// port identifier
PortID string `protobuf:"bytes,6,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,6,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel identifier
ChannelID string `protobuf:"bytes,7,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,7,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
}
func (m *IdentifiedChannel) Reset() { *m = IdentifiedChannel{} }
@ -895,9 +895,9 @@ var xxx_messageInfo_IdentifiedChannel proto.InternalMessageInfo
// Counterparty defines a channel end counterparty
type Counterparty struct {
// port on the counterparty chain which owns the other end of the channel.
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
// channel end on the counterparty chain
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
}
func (m *Counterparty) Reset() { *m = Counterparty{} }
@ -992,9 +992,9 @@ var xxx_messageInfo_Packet proto.InternalMessageInfo
// acknowlegements.
type PacketAckCommitment struct {
// channel port identifier.
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
// channel unique identifier.
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
// packet sequence.
Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
// packet commitment hash.
@ -1056,88 +1056,86 @@ func init() {
func init() { proto.RegisterFile("ibc/channel/channel.proto", fileDescriptor_9277922ccfb7f043) }
var fileDescriptor_9277922ccfb7f043 = []byte{
// 1284 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4f, 0x6f, 0x1b, 0x45,
0x14, 0xf7, 0xfa, 0x6f, 0xfc, 0x12, 0x27, 0xce, 0x24, 0x4d, 0x1d, 0xb7, 0x78, 0xad, 0x85, 0x83,
0x55, 0x51, 0x87, 0xfe, 0x01, 0xa4, 0x9e, 0xb0, 0x1d, 0x57, 0x5d, 0xd1, 0xd8, 0xd1, 0xc4, 0x45,
0xa2, 0x17, 0x6b, 0xb3, 0x3b, 0xb5, 0x57, 0x8e, 0x77, 0xcc, 0xee, 0xa6, 0x6d, 0xbe, 0x41, 0x15,
0x89, 0xc2, 0x1d, 0x45, 0x42, 0xe2, 0xc4, 0x27, 0xe0, 0x13, 0x20, 0x55, 0xe2, 0x40, 0x0f, 0x1c,
0x10, 0x87, 0x2d, 0x4a, 0x6f, 0x1c, 0x7d, 0xe4, 0x84, 0x76, 0x66, 0xd6, 0xde, 0x75, 0x4a, 0x0f,
0x09, 0x92, 0x41, 0xe2, 0xb4, 0xf3, 0xde, 0xfb, 0xcd, 0xcc, 0x7b, 0xbf, 0xf7, 0xf2, 0xde, 0xc4,
0xb0, 0x69, 0xee, 0xeb, 0x5b, 0x7a, 0x5f, 0xb3, 0x2c, 0x72, 0x10, 0x7c, 0xab, 0x23, 0x9b, 0xba,
0x14, 0x2d, 0x9a, 0xfb, 0x7a, 0x55, 0xa8, 0x8a, 0xeb, 0x3d, 0xda, 0xa3, 0x4c, 0xbf, 0xe5, 0xaf,
0x38, 0x44, 0xf9, 0x2a, 0x0e, 0x68, 0xc7, 0xe9, 0x35, 0x38, 0xa8, 0x3d, 0x22, 0x96, 0x6a, 0x99,
0x2e, 0xfa, 0x10, 0x32, 0x23, 0x6a, 0xbb, 0x5d, 0xd3, 0x28, 0x48, 0x65, 0xa9, 0x92, 0xad, 0x5f,
0x3d, 0xf5, 0xe4, 0xf4, 0x2e, 0xb5, 0x5d, 0x75, 0x7b, 0xec, 0xc9, 0xcb, 0x47, 0xda, 0xf0, 0xe0,
0x8e, 0x22, 0x20, 0x0a, 0x4e, 0xfb, 0x2b, 0xd5, 0x40, 0x35, 0x00, 0x71, 0x9d, 0xbf, 0x33, 0xce,
0x76, 0x2a, 0xa7, 0x9e, 0x9c, 0x15, 0xe7, 0xb3, 0xcd, 0xab, 0x7c, 0xf3, 0x14, 0xa8, 0xe0, 0xac,
0x10, 0x54, 0x03, 0xdd, 0x86, 0x8c, 0x10, 0x0a, 0x89, 0xb2, 0x54, 0x59, 0xbc, 0xb9, 0x5e, 0x0d,
0x45, 0x51, 0x15, 0x07, 0xd5, 0x93, 0x2f, 0x3c, 0x39, 0x86, 0x03, 0x28, 0x52, 0x21, 0xed, 0x98,
0x3d, 0x8b, 0xd8, 0x85, 0x64, 0x59, 0xaa, 0x2c, 0xd5, 0x6f, 0xfc, 0xe9, 0xc9, 0xd7, 0x7b, 0xa6,
0xdb, 0x3f, 0xdc, 0xaf, 0xea, 0x74, 0xb8, 0xa5, 0x53, 0x67, 0x48, 0x1d, 0xf1, 0xb9, 0xee, 0x18,
0x83, 0x2d, 0xf7, 0x68, 0x44, 0x9c, 0x6a, 0x4d, 0xd7, 0x6b, 0x86, 0x61, 0x13, 0xc7, 0xc1, 0xe2,
0x00, 0xe5, 0x97, 0x04, 0xac, 0x46, 0x19, 0xe9, 0xd8, 0x47, 0xff, 0x39, 0x42, 0x30, 0xac, 0xeb,
0xf4, 0xd0, 0x72, 0x89, 0x3d, 0xd2, 0x6c, 0xf7, 0xa8, 0xfb, 0x98, 0xd8, 0x8e, 0x49, 0x2d, 0x46,
0x4f, 0xb6, 0x2e, 0x8f, 0x3d, 0xf9, 0x8a, 0xb8, 0xf5, 0x0d, 0x28, 0x05, 0xaf, 0x85, 0xd5, 0x9f,
0x71, 0x2d, 0xba, 0x0d, 0x30, 0xb2, 0x29, 0x7d, 0xd4, 0x35, 0x2d, 0xd3, 0x2d, 0xa4, 0x18, 0xd1,
0x97, 0xa6, 0xfe, 0x4f, 0x6d, 0x0a, 0xce, 0x32, 0x81, 0x95, 0xd2, 0x1d, 0x58, 0xe2, 0x96, 0x3e,
0x31, 0x7b, 0x7d, 0xb7, 0x90, 0x2e, 0x4b, 0x95, 0x64, 0xfd, 0xf2, 0xd8, 0x93, 0xd7, 0xc2, 0xfb,
0xb8, 0x55, 0xc1, 0x8b, 0x4c, 0xbc, 0xc7, 0xa4, 0x50, 0x5a, 0x33, 0x17, 0x4d, 0xeb, 0x37, 0x67,
0xd2, 0x5a, 0xd3, 0x07, 0x73, 0x4c, 0xeb, 0xdf, 0x25, 0x28, 0x71, 0x81, 0x04, 0xdd, 0x00, 0xce,
0x7b, 0xd7, 0xb5, 0x8f, 0xc4, 0x1f, 0xc2, 0xfa, 0xd8, 0x93, 0xf3, 0x61, 0x9e, 0x5d, 0xfb, 0x48,
0xc1, 0x0b, 0x6c, 0xed, 0xd7, 0xf5, 0x6c, 0x76, 0x52, 0xe7, 0xca, 0x4e, 0xfa, 0xa2, 0xd9, 0xf9,
0x29, 0x0e, 0x97, 0xa2, 0xd9, 0x69, 0x50, 0xeb, 0x91, 0x69, 0x0f, 0xe7, 0x98, 0xa1, 0x09, 0x9b,
0x9a, 0x3e, 0x60, 0x69, 0x79, 0x03, 0x9b, 0x9a, 0x3e, 0x08, 0xd8, 0xf4, 0xcb, 0x69, 0x96, 0xcd,
0xe4, 0xb9, 0xd8, 0x4c, 0x5d, 0x94, 0xcd, 0xdf, 0x24, 0x58, 0x9b, 0xb2, 0xd9, 0x38, 0xa0, 0x0e,
0x99, 0x73, 0x57, 0x9f, 0x06, 0x97, 0xb8, 0x68, 0x70, 0x3f, 0xc7, 0x61, 0x63, 0x26, 0xb8, 0xf9,
0xd7, 0x4a, 0xb4, 0x35, 0x26, 0xce, 0xd9, 0x1a, 0xe7, 0x54, 0x2e, 0xaf, 0x24, 0xc8, 0xed, 0x38,
0x3d, 0x4c, 0xf4, 0xc7, 0xbb, 0x9a, 0x3e, 0x20, 0x2e, 0xba, 0x01, 0xe9, 0x11, 0x5b, 0x31, 0x1e,
0x17, 0x6f, 0xae, 0x45, 0x46, 0x0e, 0x07, 0x89, 0x89, 0x23, 0x80, 0x68, 0x1d, 0x52, 0xcc, 0x3d,
0xc6, 0xdf, 0x12, 0xe6, 0xc2, 0x99, 0x08, 0x13, 0xe7, 0x8a, 0xf0, 0xc2, 0x33, 0xfd, 0xfb, 0x38,
0xc0, 0x8e, 0xd3, 0xeb, 0x98, 0x43, 0x42, 0x0f, 0xff, 0x25, 0xe1, 0x7d, 0x0a, 0xc8, 0x22, 0x4f,
0xdd, 0xae, 0x43, 0xbe, 0x38, 0x24, 0x96, 0x4e, 0xba, 0x36, 0xd1, 0x1f, 0x8b, 0x12, 0x78, 0x67,
0xec, 0xc9, 0x9b, 0xfc, 0x84, 0xb3, 0x18, 0x05, 0xe7, 0x7d, 0xe5, 0x9e, 0xd0, 0xf9, 0x69, 0xfb,
0x27, 0xab, 0xe1, 0x39, 0x7f, 0x11, 0xd6, 0xf4, 0x81, 0x45, 0x9f, 0x1c, 0x10, 0xa3, 0x47, 0x86,
0xc4, 0x3a, 0x17, 0x67, 0x15, 0x58, 0xd1, 0xa2, 0xa7, 0x08, 0xf6, 0x66, 0xd5, 0x53, 0x76, 0x13,
0x6f, 0x63, 0x77, 0x4e, 0x7f, 0x1e, 0x5f, 0xc6, 0x21, 0x23, 0x3a, 0x01, 0xaa, 0x40, 0xca, 0x71,
0x35, 0x97, 0x30, 0x12, 0x96, 0x6f, 0xa2, 0x08, 0x09, 0x7b, 0xbe, 0x05, 0x73, 0x00, 0xaa, 0xc2,
0x02, 0xb5, 0x0d, 0x62, 0x9b, 0x56, 0x8f, 0x45, 0x3d, 0x0b, 0x6e, 0xfb, 0x46, 0x3c, 0xc1, 0xa0,
0x06, 0x2c, 0x85, 0x47, 0xba, 0x78, 0xeb, 0x6d, 0x46, 0xdf, 0x7a, 0x21, 0x80, 0xe0, 0x3a, 0xb2,
0x09, 0x35, 0x60, 0x45, 0xa7, 0x96, 0x45, 0x74, 0xd7, 0xa4, 0x56, 0xb7, 0x4f, 0x47, 0x4e, 0x21,
0x59, 0x4e, 0x54, 0xb2, 0xf5, 0xe2, 0xd8, 0x93, 0x37, 0x82, 0xf7, 0x44, 0x04, 0xa0, 0xe0, 0xe5,
0xa9, 0xe6, 0x1e, 0x1d, 0x39, 0xa8, 0x00, 0x99, 0xe0, 0x31, 0xe2, 0x73, 0x97, 0xc5, 0x81, 0x78,
0x27, 0xf9, 0xec, 0x5b, 0x39, 0xa6, 0xfc, 0x11, 0x87, 0x55, 0xd5, 0x20, 0x96, 0x6b, 0x3e, 0x32,
0x89, 0xf1, 0x3f, 0x33, 0xfe, 0xcb, 0xeb, 0xdd, 0xe9, 0xe4, 0x49, 0xb3, 0xf9, 0x01, 0xd3, 0xc9,
0x33, 0x99, 0x33, 0xef, 0x47, 0xe6, 0x4c, 0x86, 0xe1, 0x72, 0x91, 0x39, 0x13, 0x1a, 0x29, 0x82,
0xec, 0xe7, 0x12, 0x2c, 0x85, 0x83, 0x9b, 0xdf, 0x8c, 0x13, 0x0e, 0xbd, 0x4a, 0x40, 0x5a, 0x4c,
0x89, 0x22, 0x2c, 0x04, 0x8d, 0x89, 0xf9, 0x92, 0xc4, 0x13, 0x19, 0x7d, 0x0c, 0x8b, 0x0e, 0x3d,
0xb4, 0x75, 0xd2, 0xf5, 0x1d, 0x10, 0x17, 0x6e, 0x8c, 0x3d, 0x19, 0xf1, 0x3b, 0x42, 0x46, 0x05,
0x03, 0x97, 0xfc, 0x20, 0xd0, 0x27, 0xb0, 0x2c, 0x6c, 0xe1, 0xff, 0x7a, 0xb2, 0xf5, 0xcd, 0xb1,
0x27, 0x5f, 0x8a, 0xec, 0x15, 0x76, 0x05, 0xe7, 0xb8, 0x22, 0xa8, 0xc4, 0xbb, 0x90, 0x37, 0x88,
0xe3, 0x9a, 0x96, 0xc6, 0x52, 0xc9, 0xee, 0xe7, 0xff, 0xf6, 0x5c, 0x19, 0x7b, 0xf2, 0x65, 0x7e,
0xc6, 0x2c, 0x42, 0xc1, 0x2b, 0x21, 0x15, 0xf3, 0xa4, 0x0d, 0x6b, 0x61, 0x54, 0xe0, 0x0e, 0xcb,
0x7c, 0xbd, 0x34, 0xf6, 0xe4, 0xe2, 0xd9, 0xa3, 0x26, 0x3e, 0xa1, 0x90, 0x36, 0x70, 0x0c, 0x41,
0xd2, 0xd0, 0x5c, 0x8d, 0xbf, 0x96, 0x31, 0x5b, 0xfb, 0xe1, 0xba, 0x7c, 0x2a, 0x05, 0x5d, 0x2e,
0xc3, 0xba, 0x5c, 0x28, 0xdc, 0xa8, 0x5d, 0xc1, 0x39, 0xa1, 0x98, 0x74, 0xba, 0xd5, 0x00, 0xe1,
0x7f, 0x1d, 0x57, 0x1b, 0x8e, 0x0a, 0x0b, 0xec, 0x90, 0xab, 0x63, 0x4f, 0x2e, 0x44, 0x0f, 0x99,
0x40, 0x14, 0x9c, 0x17, 0xba, 0x4e, 0xa0, 0x12, 0x19, 0xfe, 0x51, 0x82, 0x35, 0x9e, 0xe1, 0x9a,
0x3e, 0x68, 0xd0, 0xe1, 0xd0, 0x74, 0x59, 0x93, 0x9e, 0xdf, 0xeb, 0x2a, 0x5c, 0x68, 0x89, 0x99,
0x42, 0x43, 0x90, 0xec, 0x6b, 0x4e, 0x9f, 0xbf, 0x11, 0x30, 0x5b, 0xf3, 0x38, 0xae, 0xfd, 0x20,
0x41, 0x8a, 0x35, 0x1e, 0xf4, 0x11, 0xc8, 0x7b, 0x9d, 0x5a, 0xa7, 0xd9, 0x7d, 0xd0, 0x52, 0x5b,
0x6a, 0x47, 0xad, 0xdd, 0x57, 0x1f, 0x36, 0xb7, 0xbb, 0x0f, 0x5a, 0x7b, 0xbb, 0xcd, 0x86, 0x7a,
0x57, 0x6d, 0x6e, 0xe7, 0x63, 0xc5, 0xd5, 0xe3, 0x93, 0x72, 0x2e, 0x02, 0x40, 0x05, 0x00, 0xbe,
0xcf, 0x57, 0xe6, 0xa5, 0xe2, 0xc2, 0xf1, 0x49, 0x39, 0xe9, 0xaf, 0x51, 0x09, 0x72, 0xdc, 0xd2,
0xc1, 0x9f, 0xb7, 0x77, 0x9b, 0xad, 0x7c, 0xbc, 0xb8, 0x78, 0x7c, 0x52, 0xce, 0x08, 0x71, 0xba,
0x93, 0x19, 0x13, 0x7c, 0x27, 0xb3, 0x5c, 0x85, 0x25, 0x6e, 0x69, 0xdc, 0x6f, 0xef, 0x35, 0xb7,
0xf3, 0xc9, 0x22, 0x1c, 0x9f, 0x94, 0xd3, 0x5c, 0x2a, 0x26, 0x9f, 0x7d, 0x57, 0x8a, 0x5d, 0x7b,
0x02, 0x29, 0xd6, 0x04, 0xd1, 0x7b, 0xb0, 0xd1, 0xc6, 0xdb, 0x4d, 0xdc, 0x6d, 0xb5, 0x5b, 0xcd,
0x19, 0x7f, 0xd9, 0x91, 0xbe, 0x1e, 0x29, 0xb0, 0xc2, 0x51, 0x0f, 0x5a, 0xec, 0xdb, 0xdc, 0xce,
0x4b, 0xc5, 0xdc, 0xf1, 0x49, 0x39, 0x3b, 0x51, 0xf8, 0x0e, 0x73, 0x4c, 0x80, 0x10, 0x0e, 0x0b,
0x91, 0x5f, 0x5c, 0xdf, 0x79, 0x71, 0x5a, 0x92, 0x5e, 0x9e, 0x96, 0xa4, 0xdf, 0x4f, 0x4b, 0xd2,
0xd7, 0xaf, 0x4b, 0xb1, 0x97, 0xaf, 0x4b, 0xb1, 0x5f, 0x5f, 0x97, 0x62, 0x0f, 0x6f, 0xbd, 0x75,
0x76, 0x3e, 0xdd, 0x32, 0xf7, 0xf5, 0xad, 0x0f, 0x6e, 0x5f, 0x0f, 0x7e, 0x87, 0x62, 0xc3, 0x74,
0x3f, 0xcd, 0x7e, 0x63, 0xba, 0xf5, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xbb, 0x3c, 0x45,
0xa3, 0x12, 0x00, 0x00,
// 1259 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x3f, 0x6f, 0xdb, 0x46,
0x14, 0x17, 0x25, 0x4a, 0xb2, 0x9e, 0xff, 0xc9, 0x67, 0xc7, 0x91, 0x95, 0x44, 0x14, 0x88, 0x0e,
0x42, 0x8a, 0xc8, 0xcd, 0x1f, 0xb4, 0x40, 0xa6, 0x4a, 0xb2, 0x82, 0x08, 0x8d, 0x25, 0xe3, 0xac,
0x14, 0x68, 0x16, 0x81, 0xa6, 0x2e, 0x12, 0x21, 0x8b, 0xa7, 0x92, 0x74, 0x12, 0xef, 0x1d, 0x02,
0x03, 0x2d, 0xfa, 0x05, 0x0c, 0x14, 0xe8, 0xd4, 0xa5, 0x53, 0x81, 0x76, 0xe9, 0xd4, 0x25, 0x5b,
0x33, 0x76, 0x62, 0x8a, 0xf8, 0x1b, 0x70, 0x2a, 0x3a, 0x15, 0xbc, 0x3b, 0x4a, 0xa4, 0x9c, 0x66,
0xb0, 0x0a, 0x25, 0x43, 0x27, 0xde, 0x7b, 0xef, 0x77, 0x77, 0xef, 0xfd, 0xde, 0xf3, 0x7b, 0x67,
0xc1, 0x96, 0x71, 0xa0, 0x6f, 0xeb, 0x7d, 0xcd, 0x34, 0xc9, 0x61, 0xf0, 0x2d, 0x8f, 0x2c, 0xea,
0x50, 0xb4, 0x68, 0x1c, 0xe8, 0x65, 0xa1, 0xca, 0x6f, 0xf4, 0x68, 0x8f, 0x32, 0xfd, 0xb6, 0xbf,
0xe2, 0x10, 0xf5, 0x2f, 0x09, 0xd0, 0xae, 0xdd, 0xab, 0x71, 0x50, 0x6b, 0x44, 0xcc, 0x86, 0x69,
0x38, 0xe8, 0x43, 0x48, 0x8f, 0xa8, 0xe5, 0x74, 0x8c, 0x6e, 0x4e, 0x2a, 0x4a, 0xa5, 0x4c, 0x15,
0x79, 0xae, 0xb2, 0x72, 0xac, 0x0d, 0x0f, 0xef, 0xaa, 0xc2, 0xa0, 0xe2, 0x94, 0xbf, 0x6a, 0x74,
0xd1, 0x1d, 0x00, 0x71, 0x89, 0x8f, 0x8f, 0x33, 0xfc, 0x25, 0xcf, 0x55, 0xd6, 0x38, 0x7e, 0x62,
0x53, 0x71, 0x46, 0x08, 0x6c, 0x57, 0x5a, 0x08, 0xb9, 0x44, 0x51, 0x2a, 0x2d, 0xde, 0xda, 0x28,
0x87, 0xdc, 0x2d, 0x0b, 0x8f, 0xaa, 0xf2, 0x0b, 0x57, 0x89, 0xe1, 0x00, 0x8a, 0x1a, 0x90, 0xb2,
0x8d, 0x9e, 0x49, 0xac, 0x9c, 0x5c, 0x94, 0x4a, 0x4b, 0xd5, 0x9b, 0x7f, 0xbb, 0xca, 0x8d, 0x9e,
0xe1, 0xf4, 0x8f, 0x0e, 0xca, 0x3a, 0x1d, 0x6e, 0xeb, 0xd4, 0x1e, 0x52, 0x5b, 0x7c, 0x6e, 0xd8,
0xdd, 0xc1, 0xb6, 0x73, 0x3c, 0x22, 0x76, 0xb9, 0xa2, 0xeb, 0x95, 0x6e, 0xd7, 0x22, 0xb6, 0x8d,
0xc5, 0x01, 0xea, 0xaf, 0x09, 0x58, 0x8b, 0x86, 0xde, 0xb6, 0x8e, 0xdf, 0xdf, 0xc8, 0x31, 0x6c,
0xe8, 0xf4, 0xc8, 0x74, 0x88, 0x35, 0xd2, 0x2c, 0xe7, 0xb8, 0xf3, 0x84, 0x58, 0xb6, 0x41, 0x4d,
0xc6, 0x43, 0xa6, 0xaa, 0x78, 0xae, 0x72, 0x45, 0xdc, 0xfa, 0x06, 0x94, 0x8a, 0xd7, 0xc3, 0xea,
0xcf, 0xb9, 0xd6, 0xf7, 0x7f, 0x64, 0x51, 0xfa, 0xb8, 0x63, 0x98, 0x86, 0x93, 0x4b, 0x32, 0x46,
0x43, 0xfe, 0x4f, 0x6c, 0x2a, 0xce, 0x30, 0x81, 0x15, 0xc7, 0x5d, 0x58, 0xe2, 0x96, 0x3e, 0x31,
0x7a, 0x7d, 0x27, 0x97, 0x2a, 0x4a, 0x25, 0xb9, 0x7a, 0xd9, 0x73, 0x95, 0xf5, 0xf0, 0x3e, 0x6e,
0x55, 0xf1, 0x22, 0x13, 0xef, 0x33, 0x29, 0x94, 0xbf, 0xf4, 0xac, 0xf9, 0xfb, 0xea, 0x5c, 0xfe,
0x2a, 0xfa, 0x60, 0x1e, 0xf9, 0xfb, 0xb7, 0x4c, 0x24, 0x66, 0xc8, 0xc4, 0x4d, 0xe0, 0x04, 0x77,
0x1c, 0xeb, 0x58, 0x94, 0xf6, 0x86, 0xe7, 0x2a, 0xd9, 0x30, 0xa1, 0x8e, 0x75, 0xac, 0xe2, 0x05,
0xb6, 0xf6, 0x2b, 0x75, 0x3a, 0x0d, 0xc9, 0x0b, 0xa5, 0x21, 0x35, 0x6b, 0x1a, 0x7e, 0x8a, 0xc3,
0xa5, 0x68, 0x1a, 0x6a, 0xd4, 0x7c, 0x6c, 0x58, 0xc3, 0x79, 0xa4, 0x62, 0x4c, 0x9b, 0xa6, 0x0f,
0x18, 0xff, 0x6f, 0xa0, 0x4d, 0xd3, 0x07, 0x01, 0x6d, 0x7e, 0x81, 0x4c, 0xd3, 0x26, 0x5f, 0x88,
0xb6, 0xe4, 0xac, 0xb4, 0xfd, 0x26, 0xc1, 0xfa, 0x84, 0xb6, 0xda, 0x21, 0xb5, 0xc9, 0xbc, 0x3a,
0xef, 0x24, 0x8a, 0xc4, 0xac, 0x51, 0xfc, 0x12, 0x87, 0xcd, 0xa9, 0x28, 0xe6, 0x98, 0xfd, 0x68,
0xfb, 0x4a, 0x5c, 0xb0, 0x7d, 0xbd, 0xa3, 0x02, 0x78, 0x25, 0xc1, 0xf2, 0xae, 0xdd, 0xc3, 0x44,
0x7f, 0xb2, 0xa7, 0xe9, 0x03, 0xe2, 0xa0, 0x9b, 0x90, 0x1a, 0xb1, 0x15, 0x23, 0x6c, 0xf1, 0xd6,
0x7a, 0x64, 0x2c, 0x70, 0x90, 0x98, 0x0a, 0x02, 0x88, 0x36, 0x20, 0xc9, 0xdc, 0x63, 0x94, 0x2d,
0x61, 0x2e, 0x9c, 0x8b, 0x30, 0x71, 0xa1, 0x08, 0x67, 0x1e, 0xb0, 0x3f, 0xc4, 0x01, 0x76, 0xed,
0x5e, 0xdb, 0x18, 0x12, 0x7a, 0xf4, 0x9e, 0x84, 0xf7, 0x19, 0x20, 0x93, 0x3c, 0x73, 0x3a, 0x36,
0xf9, 0xf2, 0x88, 0x98, 0x3a, 0xe9, 0x58, 0x44, 0x7f, 0x22, 0x4a, 0xe0, 0x9a, 0xe7, 0x2a, 0x5b,
0xfc, 0x84, 0xf3, 0x18, 0x15, 0x67, 0x7d, 0xe5, 0xbe, 0xd0, 0xf9, 0x69, 0xfb, 0x2f, 0xab, 0xe1,
0x9b, 0x38, 0x7b, 0x87, 0x55, 0xf4, 0x81, 0x49, 0x9f, 0x1e, 0x92, 0x6e, 0x8f, 0x0c, 0x89, 0x79,
0x21, 0xce, 0x4a, 0xb0, 0xaa, 0x45, 0x4f, 0x11, 0xec, 0x4d, 0xab, 0x27, 0xec, 0x26, 0xde, 0xc6,
0xee, 0x3b, 0xfa, 0xf3, 0xf8, 0x3a, 0x0e, 0x69, 0xd1, 0x56, 0x50, 0x09, 0x92, 0xb6, 0xa3, 0x39,
0x84, 0x91, 0xb0, 0x72, 0x0b, 0x45, 0x48, 0xd8, 0xf7, 0x2d, 0x98, 0x03, 0x50, 0x19, 0x16, 0xa8,
0xd5, 0x25, 0x96, 0x61, 0xf6, 0x58, 0xd4, 0xd3, 0xe0, 0x96, 0x6f, 0xc4, 0x63, 0x0c, 0xaa, 0xc1,
0x52, 0x78, 0x1a, 0x8b, 0xf7, 0xd8, 0x56, 0xf4, 0x3d, 0x16, 0x02, 0x08, 0xae, 0x23, 0x9b, 0x50,
0x0d, 0x56, 0x75, 0x6a, 0x9a, 0x44, 0x77, 0x0c, 0x6a, 0x76, 0xfa, 0x74, 0x64, 0xe7, 0xe4, 0x62,
0xa2, 0x94, 0xa9, 0xe6, 0x3d, 0x57, 0xd9, 0x0c, 0x9e, 0x02, 0x11, 0x80, 0x8a, 0x57, 0x26, 0x9a,
0xfb, 0x74, 0x64, 0xa3, 0x1c, 0xa4, 0x83, 0x77, 0x84, 0xcf, 0x5d, 0x06, 0x07, 0xe2, 0x5d, 0xf9,
0xf9, 0x77, 0x4a, 0x4c, 0xfd, 0x3d, 0x0e, 0x6b, 0x8d, 0x2e, 0x31, 0x1d, 0xe3, 0xb1, 0x41, 0xba,
0xff, 0x33, 0xe3, 0x3f, 0x9a, 0x2e, 0x4f, 0x46, 0x4c, 0x8a, 0x59, 0x82, 0x71, 0x72, 0x2d, 0x32,
0x4e, 0xd2, 0xcc, 0x36, 0x99, 0x1b, 0x82, 0xd1, 0xa7, 0xb0, 0x14, 0x0e, 0x60, 0x0e, 0x03, 0x4b,
0x5c, 0xfc, 0x2a, 0x01, 0x29, 0xd1, 0xf2, 0xf3, 0xb0, 0x10, 0x74, 0x19, 0x76, 0xa9, 0x8c, 0xc7,
0x32, 0xfa, 0x04, 0x16, 0x6d, 0x7a, 0x64, 0xe9, 0xa4, 0xe3, 0xdf, 0x29, 0xee, 0xd8, 0xf4, 0x5c,
0x05, 0xf1, 0x3b, 0x42, 0x46, 0x15, 0x03, 0x97, 0xf6, 0xa8, 0xe5, 0xa0, 0x4f, 0x61, 0x45, 0xd8,
0xc2, 0xff, 0x66, 0x64, 0xaa, 0x5b, 0x9e, 0xab, 0x5c, 0x8a, 0xec, 0x15, 0x76, 0x15, 0x2f, 0x73,
0x45, 0x50, 0x56, 0xf7, 0x20, 0xdb, 0x25, 0xb6, 0x63, 0x98, 0x1a, 0xcb, 0x0b, 0xbb, 0x9f, 0xff,
0x9f, 0x71, 0xc5, 0x73, 0x95, 0xcb, 0xfc, 0x8c, 0x69, 0x84, 0x8a, 0x57, 0x43, 0x2a, 0xe6, 0x49,
0x0b, 0xd6, 0xc3, 0xa8, 0xc0, 0x1d, 0x96, 0xc6, 0x6a, 0xc1, 0x73, 0x95, 0xfc, 0xf9, 0xa3, 0xc6,
0x3e, 0xa1, 0x90, 0x36, 0x70, 0x0c, 0x81, 0xdc, 0xd5, 0x1c, 0x8d, 0xbf, 0x5a, 0x31, 0x5b, 0xfb,
0xe1, 0x3a, 0x7c, 0xc4, 0x04, 0x2d, 0x2b, 0xcd, 0x5a, 0x56, 0x28, 0xdc, 0xa8, 0x5d, 0xc5, 0xcb,
0x42, 0x31, 0x6e, 0x5b, 0x6b, 0x01, 0xc2, 0xff, 0xda, 0x8e, 0x36, 0x1c, 0xe5, 0x16, 0xd8, 0x21,
0x57, 0x3d, 0x57, 0xc9, 0x45, 0x0f, 0x19, 0x43, 0x54, 0x9c, 0x15, 0xba, 0x76, 0xa0, 0x12, 0x19,
0xfe, 0x51, 0x82, 0x75, 0x9e, 0xe1, 0x8a, 0x3e, 0xa8, 0xd1, 0xe1, 0xd0, 0x70, 0x58, 0xc7, 0x9d,
0xc3, 0x9b, 0x28, 0x5c, 0x51, 0x89, 0xa9, 0x8a, 0x42, 0x20, 0xf7, 0x35, 0xbb, 0xcf, 0x27, 0x3b,
0x66, 0x6b, 0xee, 0xf0, 0xf5, 0x9f, 0x25, 0x48, 0xb2, 0x76, 0x81, 0x3e, 0x06, 0x65, 0xbf, 0x5d,
0x69, 0xd7, 0x3b, 0x0f, 0x9b, 0x8d, 0x66, 0xa3, 0xdd, 0xa8, 0x3c, 0x68, 0x3c, 0xaa, 0xef, 0x74,
0x1e, 0x36, 0xf7, 0xf7, 0xea, 0xb5, 0xc6, 0xbd, 0x46, 0x7d, 0x27, 0x1b, 0xcb, 0xaf, 0x9d, 0x9c,
0x16, 0x97, 0x23, 0x00, 0x94, 0x03, 0xe0, 0xfb, 0x7c, 0x65, 0x56, 0xca, 0x2f, 0x9c, 0x9c, 0x16,
0x65, 0x7f, 0x8d, 0x0a, 0xb0, 0xcc, 0x2d, 0x6d, 0xfc, 0x45, 0x6b, 0xaf, 0xde, 0xcc, 0xc6, 0xf3,
0x8b, 0x27, 0xa7, 0xc5, 0xb4, 0x10, 0x27, 0x3b, 0x99, 0x31, 0xc1, 0x77, 0x32, 0xcb, 0x55, 0x58,
0xe2, 0x96, 0xda, 0x83, 0xd6, 0x7e, 0x7d, 0x27, 0x2b, 0xe7, 0xe1, 0xe4, 0xb4, 0x98, 0xe2, 0x52,
0x5e, 0x7e, 0xfe, 0x7d, 0x21, 0x76, 0xfd, 0x29, 0x24, 0x59, 0xeb, 0x42, 0x1f, 0xc0, 0x66, 0x0b,
0xef, 0xd4, 0x71, 0xa7, 0xd9, 0x6a, 0xd6, 0xa7, 0xfc, 0x65, 0x47, 0xfa, 0x7a, 0xa4, 0xc2, 0x2a,
0x47, 0x3d, 0x6c, 0xb2, 0x6f, 0x7d, 0x27, 0x2b, 0xe5, 0x97, 0x4f, 0x4e, 0x8b, 0x99, 0xb1, 0xc2,
0x77, 0x98, 0x63, 0x02, 0x84, 0x70, 0x58, 0x88, 0xfc, 0xe2, 0xea, 0xee, 0x8b, 0xd7, 0x05, 0xe9,
0xe5, 0xeb, 0x82, 0xf4, 0xe7, 0xeb, 0x82, 0xf4, 0xed, 0x59, 0x21, 0xf6, 0xf2, 0xac, 0x10, 0xfb,
0xe3, 0xac, 0x10, 0x7b, 0x74, 0xfb, 0xad, 0x13, 0xef, 0xd9, 0xb6, 0x71, 0xa0, 0x6f, 0x7f, 0x74,
0xe7, 0x46, 0xf0, 0x9b, 0x0d, 0x1b, 0x81, 0x07, 0x29, 0xf6, 0x7b, 0xcc, 0xed, 0x7f, 0x02, 0x00,
0x00, 0xff, 0xff, 0xa9, 0x83, 0xf0, 0x66, 0xcf, 0x11, 0x00, 0x00,
}
func (m *MsgChannelOpenInit) Marshal() (dAtA []byte, err error) {
@ -1177,17 +1175,17 @@ func (m *MsgChannelOpenInit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
}
i--
dAtA[i] = 0x1a
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1250,17 +1248,17 @@ func (m *MsgChannelOpenTry) MarshalToSizedBuffer(dAtA []byte) (int, error) {
}
i--
dAtA[i] = 0x1a
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1313,17 +1311,17 @@ func (m *MsgChannelOpenAck) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x1a
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1369,17 +1367,17 @@ func (m *MsgChannelOpenConfirm) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x1a
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1413,17 +1411,17 @@ func (m *MsgChannelCloseInit) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x1a
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1469,17 +1467,17 @@ func (m *MsgChannelCloseConfirm) MarshalToSizedBuffer(dAtA []byte) (int, error)
i--
dAtA[i] = 0x1a
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1733,17 +1731,17 @@ func (m *IdentifiedChannel) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x3a
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0x32
}
@ -1806,17 +1804,17 @@ func (m *Counterparty) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1928,17 +1926,17 @@ func (m *PacketAckCommitment) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x18
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintChannel(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -1962,11 +1960,11 @@ func (m *MsgChannelOpenInit) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -1985,11 +1983,11 @@ func (m *MsgChannelOpenTry) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2019,11 +2017,11 @@ func (m *MsgChannelOpenAck) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2051,11 +2049,11 @@ func (m *MsgChannelOpenConfirm) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2079,11 +2077,11 @@ func (m *MsgChannelCloseInit) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2100,11 +2098,11 @@ func (m *MsgChannelCloseConfirm) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2246,11 +2244,11 @@ func (m *IdentifiedChannel) Size() (n int) {
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2263,11 +2261,11 @@ func (m *Counterparty) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2318,11 +2316,11 @@ func (m *PacketAckCommitment) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovChannel(uint64(l))
}
@ -2373,7 +2371,7 @@ func (m *MsgChannelOpenInit) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2401,11 +2399,11 @@ func (m *MsgChannelOpenInit) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2433,7 +2431,7 @@ func (m *MsgChannelOpenInit) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -2557,7 +2555,7 @@ func (m *MsgChannelOpenTry) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2585,11 +2583,11 @@ func (m *MsgChannelOpenTry) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2617,7 +2615,7 @@ func (m *MsgChannelOpenTry) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -2826,7 +2824,7 @@ func (m *MsgChannelOpenAck) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2854,11 +2852,11 @@ func (m *MsgChannelOpenAck) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -2886,7 +2884,7 @@ func (m *MsgChannelOpenAck) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -3062,7 +3060,7 @@ func (m *MsgChannelOpenConfirm) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3090,11 +3088,11 @@ func (m *MsgChannelOpenConfirm) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3122,7 +3120,7 @@ func (m *MsgChannelOpenConfirm) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -3266,7 +3264,7 @@ func (m *MsgChannelCloseInit) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3294,11 +3292,11 @@ func (m *MsgChannelCloseInit) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3326,7 +3324,7 @@ func (m *MsgChannelCloseInit) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -3417,7 +3415,7 @@ func (m *MsgChannelCloseConfirm) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3445,11 +3443,11 @@ func (m *MsgChannelCloseConfirm) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3477,7 +3475,7 @@ func (m *MsgChannelCloseConfirm) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -4516,7 +4514,7 @@ func (m *IdentifiedChannel) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4544,11 +4542,11 @@ func (m *IdentifiedChannel) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 7:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4576,7 +4574,7 @@ func (m *IdentifiedChannel) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@ -4633,7 +4631,7 @@ func (m *Counterparty) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4661,11 +4659,11 @@ func (m *Counterparty) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4693,7 +4691,7 @@ func (m *Counterparty) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@ -5022,7 +5020,7 @@ func (m *PacketAckCommitment) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5050,11 +5048,11 @@ func (m *PacketAckCommitment) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5082,7 +5080,7 @@ func (m *PacketAckCommitment) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {

16
x/ibc/04-channel/types/genesis.go
View File

@ -10,8 +10,8 @@ import (
// NewPacketAckCommitment creates a new PacketAckCommitment instance.
func NewPacketAckCommitment(portID, channelID string, seq uint64, hash []byte) PacketAckCommitment {
return PacketAckCommitment{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
Sequence: seq,
Hash: hash,
}
@ -23,14 +23,14 @@ func (pa PacketAckCommitment) Validate() error {
if len(pa.Hash) == 0 {
return errors.New("hash bytes cannot be empty")
}
return validateGenFields(pa.PortID, pa.ChannelID, pa.Sequence)
return validateGenFields(pa.PortId, pa.ChannelId, pa.Sequence)
}
// NewPacketSequence creates a new PacketSequences instance.
func NewPacketSequence(portID, channelID string, seq uint64) PacketSequence {
return PacketSequence{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
Sequence: seq,
}
}
@ -38,7 +38,7 @@ func NewPacketSequence(portID, channelID string, seq uint64) PacketSequence {
// Validate performs basic validation of fields returning an error upon any
// failure.
func (ps PacketSequence) Validate() error {
return validateGenFields(ps.PortID, ps.ChannelID, ps.Sequence)
return validateGenFields(ps.PortId, ps.ChannelId, ps.Sequence)
}
// NewGenesisState creates a GenesisState instance.
@ -112,10 +112,10 @@ func (gs GenesisState) Validate() error {
func validateGenFields(portID, channelID string, sequence uint64) error {
if err := host.PortIdentifierValidator(portID); err != nil {
return fmt.Errorf("invalid port ID: %w", err)
return fmt.Errorf("invalid port Id: %w", err)
}
if err := host.ChannelIdentifierValidator(channelID); err != nil {
return fmt.Errorf("invalid channel ID: %w", err)
return fmt.Errorf("invalid channel Id: %w", err)
}
if sequence == 0 {
return errors.New("sequence cannot be 0")

101
x/ibc/04-channel/types/genesis.pb.go
View File

@ -111,8 +111,8 @@ func (m *GenesisState) GetAckSequences() []PacketSequence {
// PacketSequence defines the genesis type necessary to retrieve and store
// next send and receive sequences.
type PacketSequence struct {
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
}
@ -149,16 +149,16 @@ func (m *PacketSequence) XXX_DiscardUnknown() {
var xxx_messageInfo_PacketSequence proto.InternalMessageInfo
func (m *PacketSequence) GetPortID() string {
func (m *PacketSequence) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *PacketSequence) GetChannelID() string {
func (m *PacketSequence) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -178,37 +178,36 @@ func init() {
func init() { proto.RegisterFile("ibc/channel/genesis.proto", fileDescriptor_60ebf40b29ae9ba5) }
var fileDescriptor_60ebf40b29ae9ba5 = []byte{
// 472 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xb1, 0x6e, 0xd3, 0x40,
0x18, 0xc7, 0xe3, 0x26, 0x84, 0xe6, 0xd2, 0x44, 0xd4, 0x14, 0xc9, 0x4d, 0x8b, 0x1d, 0xdd, 0x94,
0xa5, 0x36, 0xa2, 0xb0, 0xb0, 0xd5, 0x45, 0x82, 0x0c, 0x48, 0xd5, 0x55, 0x2c, 0x0c, 0x54, 0xce,
0xf9, 0xc3, 0x3d, 0x39, 0xf6, 0x85, 0xdc, 0x15, 0xe8, 0x5b, 0xf0, 0x14, 0x3c, 0x07, 0x63, 0xc7,
0x8e, 0x4c, 0x16, 0x72, 0xde, 0xa0, 0x23, 0x13, 0x3a, 0xfb, 0x92, 0xda, 0x6a, 0x24, 0xe8, 0x64,
0xfb, 0xfb, 0xfe, 0xff, 0xdf, 0xef, 0x06, 0x1f, 0xda, 0x65, 0x13, 0xea, 0xd1, 0xf3, 0x20, 0x4d,
0x61, 0xea, 0x45, 0x90, 0x82, 0x60, 0xc2, 0x9d, 0xcd, 0xb9, 0xe4, 0x66, 0x97, 0x4d, 0xa8, 0xab,
0x57, 0x83, 0x9d, 0x88, 0x47, 0xbc, 0x98, 0x7b, 0xea, 0xad, 0x8c, 0x0c, 0x6a, 0x6d, 0xfd, 0x2c,
0x57, 0xf8, 0x67, 0x0b, 0x6d, 0xbd, 0x29, 0x79, 0xa7, 0x32, 0x90, 0x60, 0xbe, 0x47, 0x9b, 0x3a,
0x21, 0x2c, 0x63, 0xd8, 0x1c, 0x75, 0x9f, 0xdb, 0x6e, 0xc5, 0xe0, 0x8e, 0x43, 0x48, 0x25, 0xfb,
0xc4, 0x20, 0x3c, 0x2e, 0x27, 0xfe, 0xee, 0x55, 0xe6, 0x34, 0xfe, 0x64, 0xce, 0xf6, 0x9d, 0x15,
0x59, 0xa1, 0x4c, 0x86, 0x1e, 0x05, 0x34, 0x4e, 0xf9, 0xd7, 0x29, 0x84, 0x11, 0x24, 0x90, 0x4a,
0x61, 0x6d, 0x14, 0xf8, 0x61, 0x0d, 0x7f, 0x12, 0xd0, 0x18, 0xe4, 0x11, 0x8d, 0x8f, 0x79, 0x92,
0x30, 0xa9, 0x82, 0xfe, 0x9e, 0x16, 0x3c, 0x5e, 0xb3, 0x24, 0x77, 0xb0, 0xe6, 0x5b, 0xd4, 0xa5,
0xab, 0xbd, 0xb0, 0x9a, 0xff, 0x69, 0x69, 0x29, 0x0b, 0xa9, 0x56, 0xcd, 0x00, 0xf5, 0x05, 0xa4,
0xe1, 0x99, 0x80, 0xcf, 0x17, 0x90, 0x52, 0x10, 0x56, 0xab, 0x80, 0xed, 0xad, 0x81, 0x9d, 0xea,
0x8c, 0xff, 0x54, 0x71, 0x6e, 0x32, 0xe7, 0xc9, 0x65, 0x90, 0x4c, 0x5f, 0xe1, 0x3a, 0x00, 0x93,
0x9e, 0x1a, 0x2c, 0xc3, 0x85, 0x62, 0x0e, 0xf4, 0x4b, 0x45, 0xf1, 0xe0, 0xde, 0x8a, 0x3a, 0x00,
0x93, 0x9e, 0x1a, 0xdc, 0x2a, 0x3e, 0xa2, 0x5e, 0x40, 0xe3, 0x8a, 0xa1, 0xfd, 0x6f, 0xc3, 0xbe,
0x36, 0xec, 0x94, 0x86, 0x5a, 0x1f, 0x93, 0xad, 0x80, 0xc6, 0x2b, 0x3e, 0xfe, 0x61, 0xa0, 0x7e,
0xbd, 0x6e, 0xbe, 0x44, 0x0f, 0x67, 0x7c, 0x2e, 0xcf, 0x58, 0x68, 0x19, 0x43, 0x63, 0xd4, 0xf1,
0xf7, 0xf3, 0xcc, 0x69, 0x9f, 0xf0, 0xb9, 0x1c, 0xbf, 0xbe, 0xc9, 0x9c, 0x7e, 0x49, 0xd5, 0x11,
0x4c, 0xda, 0xea, 0x6d, 0x1c, 0x9a, 0x47, 0x08, 0xe9, 0xf3, 0xa8, 0xe6, 0x46, 0xd1, 0xc4, 0x79,
0xe6, 0x74, 0xf4, 0xff, 0x54, 0x94, 0xb7, 0xcb, 0xf2, 0x6d, 0x10, 0x93, 0x8e, 0xfe, 0x18, 0x87,
0xe6, 0x00, 0x6d, 0x2e, 0x0f, 0x6a, 0x35, 0x87, 0xc6, 0xa8, 0x45, 0x56, 0xdf, 0xfe, 0xbb, 0xab,
0xdc, 0x36, 0xae, 0x73, 0xdb, 0xf8, 0x9d, 0xdb, 0xc6, 0xf7, 0x85, 0xdd, 0xb8, 0x5e, 0xd8, 0x8d,
0x5f, 0x0b, 0xbb, 0xf1, 0xe1, 0x30, 0x62, 0xf2, 0xfc, 0x62, 0xe2, 0x52, 0x9e, 0x78, 0x94, 0x8b,
0x84, 0x0b, 0xfd, 0x38, 0x10, 0x61, 0xec, 0x7d, 0xf3, 0xd4, 0xfd, 0x79, 0xf6, 0xe2, 0x60, 0x79,
0x85, 0xe4, 0xe5, 0x0c, 0xc4, 0xa4, 0x5d, 0xdc, 0xa0, 0xc3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff,
0x01, 0x7e, 0xa5, 0xb6, 0x9c, 0x03, 0x00, 0x00,
// 456 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x31, 0x6f, 0xd3, 0x40,
0x18, 0x86, 0xe3, 0x26, 0x84, 0xf6, 0xd2, 0x44, 0xf4, 0x68, 0x25, 0x37, 0x05, 0x3b, 0xf2, 0x14,
0x09, 0xd5, 0x46, 0xb4, 0x13, 0x1b, 0xee, 0x00, 0x19, 0x90, 0xd0, 0x55, 0x2c, 0x0c, 0x54, 0xce,
0xf9, 0xc3, 0x3d, 0x39, 0xbe, 0x0b, 0xb9, 0x2b, 0xd0, 0x5f, 0x01, 0x3f, 0x89, 0xb1, 0x63, 0x47,
0x26, 0x0b, 0x25, 0xff, 0x20, 0x23, 0x13, 0x3a, 0xfb, 0x92, 0xda, 0x6a, 0x25, 0xe8, 0x64, 0xdf,
0xf7, 0xbe, 0xdf, 0xf3, 0xdc, 0x72, 0x68, 0x9f, 0x8d, 0x69, 0x40, 0xcf, 0x23, 0xce, 0x61, 0x12,
0x24, 0xc0, 0x41, 0x32, 0xe9, 0x4f, 0x67, 0x42, 0x09, 0xdc, 0x61, 0x63, 0xea, 0x9b, 0xa8, 0xbf,
0x9b, 0x88, 0x44, 0x14, 0xf3, 0x40, 0xff, 0x95, 0x95, 0x7e, 0x6d, 0xdb, 0x7c, 0xcb, 0xc8, 0xfb,
0xd9, 0x42, 0xdb, 0xaf, 0x4b, 0xde, 0xa9, 0x8a, 0x14, 0xe0, 0xf7, 0x68, 0xd3, 0x34, 0xa4, 0x6d,
0x0d, 0x9a, 0xc3, 0xce, 0x0b, 0xc7, 0xaf, 0x18, 0xfc, 0x51, 0x0c, 0x5c, 0xb1, 0x4f, 0x0c, 0xe2,
0x93, 0x72, 0x12, 0xee, 0x5f, 0xe5, 0x6e, 0xe3, 0x4f, 0xee, 0xee, 0xdc, 0x8a, 0xc8, 0x1a, 0x85,
0x19, 0x7a, 0x14, 0xd1, 0x94, 0x8b, 0xaf, 0x13, 0x88, 0x13, 0xc8, 0x80, 0x2b, 0x69, 0x6f, 0x14,
0xf8, 0x41, 0x0d, 0xff, 0x2e, 0xa2, 0x29, 0xa8, 0x57, 0x34, 0x3d, 0x11, 0x59, 0xc6, 0x94, 0x2e,
0x86, 0x07, 0x46, 0xf0, 0xf8, 0x8e, 0x90, 0xdc, 0xc2, 0xe2, 0x37, 0xa8, 0x43, 0xd7, 0xb9, 0xb4,
0x9b, 0xff, 0x69, 0x69, 0x69, 0x0b, 0xa9, 0xae, 0xe2, 0x08, 0xf5, 0x24, 0xf0, 0xf8, 0x4c, 0xc2,
0xe7, 0x0b, 0xe0, 0x14, 0xa4, 0xdd, 0x2a, 0x60, 0x07, 0x77, 0xc0, 0x4e, 0x4d, 0x27, 0x7c, 0xaa,
0x39, 0xcb, 0xdc, 0xdd, 0xbb, 0x8c, 0xb2, 0xc9, 0x4b, 0xaf, 0x0e, 0xf0, 0x48, 0x57, 0x0f, 0x56,
0xe5, 0x42, 0x31, 0x03, 0xfa, 0xa5, 0xa2, 0x78, 0x70, 0x6f, 0x45, 0x1d, 0xe0, 0x91, 0xae, 0x1e,
0xdc, 0x28, 0x3e, 0xa2, 0x6e, 0x44, 0xd3, 0x8a, 0xa1, 0xfd, 0x6f, 0xc3, 0x13, 0x63, 0xd8, 0x2d,
0x0d, 0xb5, 0x7d, 0x8f, 0x6c, 0x47, 0x34, 0x5d, 0xf3, 0xbd, 0xef, 0x16, 0xea, 0xd5, 0xd7, 0xf1,
0x33, 0xf4, 0x70, 0x2a, 0x66, 0xea, 0x8c, 0xc5, 0xb6, 0x35, 0xb0, 0x86, 0x5b, 0x21, 0x5e, 0xe6,
0x6e, 0xaf, 0x64, 0x99, 0xc0, 0x23, 0x6d, 0xfd, 0x37, 0x8a, 0xf1, 0x31, 0x42, 0xe6, 0x16, 0xba,
0xbf, 0x51, 0xf4, 0xf7, 0x96, 0xb9, 0xbb, 0x53, 0xf6, 0x6f, 0x32, 0x8f, 0x6c, 0x99, 0xc3, 0x28,
0xc6, 0x7d, 0xb4, 0xb9, 0xba, 0x91, 0xdd, 0x1c, 0x58, 0xc3, 0x16, 0x59, 0x9f, 0xc3, 0xb7, 0x57,
0x73, 0xc7, 0xba, 0x9e, 0x3b, 0xd6, 0xef, 0xb9, 0x63, 0xfd, 0x58, 0x38, 0x8d, 0xeb, 0x85, 0xd3,
0xf8, 0xb5, 0x70, 0x1a, 0x1f, 0x8e, 0x12, 0xa6, 0xce, 0x2f, 0xc6, 0x3e, 0x15, 0x59, 0x40, 0x85,
0xcc, 0x84, 0x34, 0x9f, 0x43, 0x19, 0xa7, 0xc1, 0xb7, 0x40, 0x3f, 0x94, 0xe7, 0xc7, 0x87, 0xab,
0xb7, 0xa2, 0x2e, 0xa7, 0x20, 0xc7, 0xed, 0xe2, 0xa9, 0x1c, 0xfd, 0x0d, 0x00, 0x00, 0xff, 0xff,
0x57, 0x51, 0x7c, 0x50, 0x85, 0x03, 0x00, 0x00,
}
func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@ -343,17 +342,17 @@ func (m *PacketSequence) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x18
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintGenesis(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -422,11 +421,11 @@ func (m *PacketSequence) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovGenesis(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovGenesis(uint64(l))
}
@ -730,7 +729,7 @@ func (m *PacketSequence) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -758,11 +757,11 @@ func (m *PacketSequence) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -790,7 +789,7 @@ func (m *PacketSequence) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {

48
x/ibc/04-channel/types/msgs.go
View File

@ -19,8 +19,8 @@ func NewMsgChannelOpenInit(
counterparty := NewCounterparty(counterpartyPortID, counterpartyChannelID)
channel := NewChannel(INIT, channelOrder, counterparty, connectionHops, version)
return &MsgChannelOpenInit{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
Channel: channel,
Signer: signer,
}
@ -38,10 +38,10 @@ func (msg MsgChannelOpenInit) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgChannelOpenInit) ValidateBasic() error {
if err := host.PortIdentifierValidator(msg.PortID); err != nil {
if err := host.PortIdentifierValidator(msg.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid port ID")
}
if err := host.ChannelIdentifierValidator(msg.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(msg.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid channel ID")
}
// Signer can be empty
@ -69,8 +69,8 @@ func NewMsgChannelOpenTry(
counterparty := NewCounterparty(counterpartyPortID, counterpartyChannelID)
channel := NewChannel(INIT, channelOrder, counterparty, connectionHops, version)
return &MsgChannelOpenTry{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
Channel: channel,
CounterpartyVersion: counterpartyVersion,
ProofInit: proofInit,
@ -91,10 +91,10 @@ func (msg MsgChannelOpenTry) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgChannelOpenTry) ValidateBasic() error {
if err := host.PortIdentifierValidator(msg.PortID); err != nil {
if err := host.PortIdentifierValidator(msg.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid port ID")
}
if err := host.ChannelIdentifierValidator(msg.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(msg.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid channel ID")
}
if len(msg.ProofInit) == 0 {
@ -125,8 +125,8 @@ func NewMsgChannelOpenAck(
signer sdk.AccAddress,
) *MsgChannelOpenAck {
return &MsgChannelOpenAck{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
CounterpartyVersion: cpv,
ProofTry: proofTry,
ProofHeight: proofHeight,
@ -146,10 +146,10 @@ func (msg MsgChannelOpenAck) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgChannelOpenAck) ValidateBasic() error {
if err := host.PortIdentifierValidator(msg.PortID); err != nil {
if err := host.PortIdentifierValidator(msg.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid port ID")
}
if err := host.ChannelIdentifierValidator(msg.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(msg.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid channel ID")
}
if len(msg.ProofTry) == 0 {
@ -180,8 +180,8 @@ func NewMsgChannelOpenConfirm(
signer sdk.AccAddress,
) *MsgChannelOpenConfirm {
return &MsgChannelOpenConfirm{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
ProofAck: proofAck,
ProofHeight: proofHeight,
Signer: signer,
@ -200,10 +200,10 @@ func (msg MsgChannelOpenConfirm) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgChannelOpenConfirm) ValidateBasic() error {
if err := host.PortIdentifierValidator(msg.PortID); err != nil {
if err := host.PortIdentifierValidator(msg.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid port ID")
}
if err := host.ChannelIdentifierValidator(msg.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(msg.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid channel ID")
}
if len(msg.ProofAck) == 0 {
@ -233,8 +233,8 @@ func NewMsgChannelCloseInit(
portID string, channelID string, signer sdk.AccAddress,
) *MsgChannelCloseInit {
return &MsgChannelCloseInit{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
Signer: signer,
}
}
@ -251,10 +251,10 @@ func (msg MsgChannelCloseInit) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgChannelCloseInit) ValidateBasic() error {
if err := host.PortIdentifierValidator(msg.PortID); err != nil {
if err := host.PortIdentifierValidator(msg.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid port ID")
}
if err := host.ChannelIdentifierValidator(msg.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(msg.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid channel ID")
}
// Signer can be empty
@ -279,8 +279,8 @@ func NewMsgChannelCloseConfirm(
signer sdk.AccAddress,
) *MsgChannelCloseConfirm {
return &MsgChannelCloseConfirm{
PortID: portID,
ChannelID: channelID,
PortId: portID,
ChannelId: channelID,
ProofInit: proofInit,
ProofHeight: proofHeight,
Signer: signer,
@ -299,10 +299,10 @@ func (msg MsgChannelCloseConfirm) Type() string {
// ValidateBasic implements sdk.Msg
func (msg MsgChannelCloseConfirm) ValidateBasic() error {
if err := host.PortIdentifierValidator(msg.PortID); err != nil {
if err := host.PortIdentifierValidator(msg.PortId); err != nil {
return sdkerrors.Wrap(err, "invalid port ID")
}
if err := host.ChannelIdentifierValidator(msg.ChannelID); err != nil {
if err := host.ChannelIdentifierValidator(msg.ChannelId); err != nil {
return sdkerrors.Wrap(err, "invalid channel ID")
}
if len(msg.ProofInit) == 0 {

4
x/ibc/04-channel/types/query.go
View File

@ -22,7 +22,7 @@ func NewQueryChannelResponse(portID, channelID string, channel Channel, proof []
// NewQueryChannelClientStateResponse creates a newQueryChannelClientStateResponse instance
func NewQueryChannelClientStateResponse(identifiedClientState clienttypes.IdentifiedClientState, proof []byte, height int64) *QueryChannelClientStateResponse {
path := commitmenttypes.NewMerklePath(strings.Split(host.FullClientPath(identifiedClientState.ID, host.ClientStatePath()), "/"))
path := commitmenttypes.NewMerklePath(strings.Split(host.FullClientPath(identifiedClientState.Id, host.ClientStatePath()), "/"))
return &QueryChannelClientStateResponse{
IdentifiedClientState: &identifiedClientState,
Proof: proof,
@ -36,7 +36,7 @@ func NewQueryChannelConsensusStateResponse(clientID string, anyConsensusState *c
path := commitmenttypes.NewMerklePath(strings.Split(host.FullClientPath(clientID, host.ConsensusStatePath(consensusStateHeight)), "/"))
return &QueryChannelConsensusStateResponse{
ConsensusState: anyConsensusState,
ClientID: clientID,
ClientId: clientID,
Proof: proof,
ProofPath: path.Pretty(),
ProofHeight: uint64(height),

479
x/ibc/04-channel/types/query.pb.go
View File

@ -9,7 +9,6 @@ import (
types1 "github.com/cosmos/cosmos-sdk/codec/types"
query "github.com/cosmos/cosmos-sdk/types/query"
types "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types"
_ "github.com/gogo/protobuf/gogoproto"
grpc1 "github.com/gogo/protobuf/grpc"
proto "github.com/gogo/protobuf/proto"
grpc "google.golang.org/grpc"
@ -34,9 +33,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// QueryChannelRequest is the request type for the Query/Channel RPC method
type QueryChannelRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
}
func (m *QueryChannelRequest) Reset() { *m = QueryChannelRequest{} }
@ -72,16 +71,16 @@ func (m *QueryChannelRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryChannelRequest proto.InternalMessageInfo
func (m *QueryChannelRequest) GetPortID() string {
func (m *QueryChannelRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryChannelRequest) GetChannelID() string {
func (m *QueryChannelRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -396,9 +395,9 @@ func (m *QueryConnectionChannelsResponse) GetHeight() int64 {
// RPC method
type QueryChannelClientStateRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
}
func (m *QueryChannelClientStateRequest) Reset() { *m = QueryChannelClientStateRequest{} }
@ -434,16 +433,16 @@ func (m *QueryChannelClientStateRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryChannelClientStateRequest proto.InternalMessageInfo
func (m *QueryChannelClientStateRequest) GetPortID() string {
func (m *QueryChannelClientStateRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryChannelClientStateRequest) GetChannelID() string {
func (m *QueryChannelClientStateRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -526,9 +525,9 @@ func (m *QueryChannelClientStateResponse) GetProofHeight() uint64 {
// Query/ConsensusState RPC method
type QueryChannelConsensusStateRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
// height of the consensus state
Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
}
@ -566,16 +565,16 @@ func (m *QueryChannelConsensusStateRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryChannelConsensusStateRequest proto.InternalMessageInfo
func (m *QueryChannelConsensusStateRequest) GetPortID() string {
func (m *QueryChannelConsensusStateRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryChannelConsensusStateRequest) GetChannelID() string {
func (m *QueryChannelConsensusStateRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -593,7 +592,7 @@ type QueryChannelConsensusStateResponse struct {
// consensus state associated with the channel
ConsensusState *types1.Any `protobuf:"bytes,1,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"`
// client ID associated with the consensus state
ClientID string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"`
// merkle proof of existence
Proof []byte `protobuf:"bytes,3,opt,name=proof,proto3" json:"proof,omitempty"`
// merkle proof path
@ -642,9 +641,9 @@ func (m *QueryChannelConsensusStateResponse) GetConsensusState() *types1.Any {
return nil
}
func (m *QueryChannelConsensusStateResponse) GetClientID() string {
func (m *QueryChannelConsensusStateResponse) GetClientId() string {
if m != nil {
return m.ClientID
return m.ClientId
}
return ""
}
@ -674,9 +673,9 @@ func (m *QueryChannelConsensusStateResponse) GetProofHeight() uint64 {
// Query/PacketCommitment RPC method
type QueryPacketCommitmentRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
// packet sequence
Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
}
@ -714,16 +713,16 @@ func (m *QueryPacketCommitmentRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryPacketCommitmentRequest proto.InternalMessageInfo
func (m *QueryPacketCommitmentRequest) GetPortID() string {
func (m *QueryPacketCommitmentRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryPacketCommitmentRequest) GetChannelID() string {
func (m *QueryPacketCommitmentRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -814,9 +813,9 @@ func (m *QueryPacketCommitmentResponse) GetProofHeight() uint64 {
// Query/QueryPacketCommitments RPC method
type QueryPacketCommitmentsRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
// pagination request
Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"`
}
@ -854,16 +853,16 @@ func (m *QueryPacketCommitmentsRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryPacketCommitmentsRequest proto.InternalMessageInfo
func (m *QueryPacketCommitmentsRequest) GetPortID() string {
func (m *QueryPacketCommitmentsRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryPacketCommitmentsRequest) GetChannelID() string {
func (m *QueryPacketCommitmentsRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -943,9 +942,9 @@ func (m *QueryPacketCommitmentsResponse) GetHeight() int64 {
// Query/PacketAcknowledgement RPC method
type QueryPacketAcknowledgementRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
// packet sequence
Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
}
@ -983,16 +982,16 @@ func (m *QueryPacketAcknowledgementRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryPacketAcknowledgementRequest proto.InternalMessageInfo
func (m *QueryPacketAcknowledgementRequest) GetPortID() string {
func (m *QueryPacketAcknowledgementRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryPacketAcknowledgementRequest) GetChannelID() string {
func (m *QueryPacketAcknowledgementRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -1083,9 +1082,9 @@ func (m *QueryPacketAcknowledgementResponse) GetProofHeight() uint64 {
// Query/UnrelayedPackets RPC method
type QueryUnrelayedPacketsRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
// list of packet sequences
PacketCommitmentSequences []uint64 `protobuf:"varint,3,rep,packed,name=packet_commitment_sequences,json=packetCommitmentSequences,proto3" json:"packet_commitment_sequences,omitempty"`
// flag indicating if the return value is packet commitments or
@ -1126,16 +1125,16 @@ func (m *QueryUnrelayedPacketsRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryUnrelayedPacketsRequest proto.InternalMessageInfo
func (m *QueryUnrelayedPacketsRequest) GetPortID() string {
func (m *QueryUnrelayedPacketsRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryUnrelayedPacketsRequest) GetChannelID() string {
func (m *QueryUnrelayedPacketsRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -1214,9 +1213,9 @@ func (m *QueryUnrelayedPacketsResponse) GetHeight() int64 {
// Query/QueryNextSequenceReceiveRequest RPC method
type QueryNextSequenceReceiveRequest struct {
// port unique identifier
PortID string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"`
// channel unique identifier
ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"`
}
func (m *QueryNextSequenceReceiveRequest) Reset() { *m = QueryNextSequenceReceiveRequest{} }
@ -1252,16 +1251,16 @@ func (m *QueryNextSequenceReceiveRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_QueryNextSequenceReceiveRequest proto.InternalMessageInfo
func (m *QueryNextSequenceReceiveRequest) GetPortID() string {
func (m *QueryNextSequenceReceiveRequest) GetPortId() string {
if m != nil {
return m.PortID
return m.PortId
}
return ""
}
func (m *QueryNextSequenceReceiveRequest) GetChannelID() string {
func (m *QueryNextSequenceReceiveRequest) GetChannelId() string {
if m != nil {
return m.ChannelID
return m.ChannelId
}
return ""
}
@ -1366,77 +1365,73 @@ func init() {
func init() { proto.RegisterFile("ibc/channel/query.proto", fileDescriptor_2150995751d4f15a) }
var fileDescriptor_2150995751d4f15a = []byte{
// 1110 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x98, 0xcf, 0x6f, 0xe3, 0x44,
0x14, 0xc7, 0xe3, 0x26, 0x6d, 0x93, 0x97, 0xc2, 0x2e, 0xd3, 0x94, 0x4d, 0xc3, 0x36, 0x49, 0x8d,
0x04, 0xd9, 0xee, 0xd6, 0x66, 0xbb, 0x9c, 0x90, 0x38, 0x6c, 0x5b, 0x01, 0x39, 0x80, 0x82, 0xab,
0x3d, 0x80, 0x04, 0x91, 0xe3, 0x4c, 0x13, 0xab, 0xc9, 0x38, 0x8d, 0x27, 0x4b, 0xcb, 0x5f, 0xc0,
0x05, 0x84, 0xb8, 0x70, 0xe3, 0xc8, 0x91, 0x13, 0x27, 0x0e, 0xdc, 0x90, 0x38, 0x70, 0xd8, 0x03,
0x07, 0x4e, 0x15, 0x4a, 0x25, 0xfe, 0x0a, 0x0e, 0xc8, 0xf3, 0xc3, 0xb1, 0x1d, 0x3b, 0x1b, 0x55,
0xb2, 0xd0, 0x9e, 0x6c, 0xcf, 0xbc, 0x99, 0xf7, 0x9d, 0xcf, 0xbc, 0x79, 0xf3, 0x12, 0xb8, 0x63,
0x77, 0x2c, 0xdd, 0xea, 0x9b, 0x84, 0xe0, 0x81, 0x7e, 0x3e, 0xc1, 0xe3, 0x4b, 0x6d, 0x34, 0x76,
0xa8, 0x83, 0x8a, 0x76, 0xc7, 0xd2, 0x44, 0x47, 0x85, 0x5b, 0x0d, 0x6c, 0x4c, 0xa8, 0x78, 0x70,
0xab, 0x4a, 0xa9, 0xe7, 0xf4, 0x1c, 0xf6, 0xaa, 0x7b, 0x6f, 0xa2, 0x75, 0xcf, 0x72, 0xdc, 0xa1,
0xe3, 0xea, 0x1d, 0xd3, 0xc5, 0x7c, 0x52, 0xfd, 0xe9, 0xc3, 0x0e, 0xa6, 0xe6, 0x43, 0x7d, 0x64,
0xf6, 0x6c, 0x62, 0x52, 0xdb, 0x21, 0xc2, 0x76, 0x3b, 0x28, 0x40, 0x3c, 0x65, 0x57, 0xcf, 0x71,
0x7a, 0x03, 0xac, 0xb3, 0xaf, 0xce, 0xe4, 0x54, 0x37, 0x89, 0x50, 0xa7, 0xf6, 0x61, 0xf3, 0x63,
0x6f, 0xde, 0x23, 0x3e, 0xc0, 0xc0, 0xe7, 0x13, 0xec, 0x52, 0xf4, 0x3a, 0xac, 0x8f, 0x9c, 0x31,
0x6d, 0xdb, 0xdd, 0xb2, 0x52, 0x57, 0x1a, 0x85, 0x43, 0x98, 0x5e, 0xd5, 0xd6, 0x5a, 0xce, 0x98,
0x36, 0x8f, 0x8d, 0x35, 0xaf, 0xab, 0xd9, 0x45, 0x0f, 0x00, 0x84, 0x1f, 0xcf, 0x6e, 0x85, 0xd9,
0xbd, 0x34, 0xbd, 0xaa, 0x15, 0xc4, 0x64, 0xcd, 0x63, 0xa3, 0x20, 0x0c, 0x9a, 0x5d, 0xf5, 0x07,
0x05, 0x4a, 0x61, 0x57, 0xee, 0xc8, 0x21, 0x2e, 0x46, 0x1a, 0xac, 0x0b, 0x2b, 0xe6, 0xab, 0x78,
0x50, 0xd2, 0x02, 0xc8, 0x34, 0x69, 0x2e, 0x8d, 0x50, 0x09, 0x56, 0x47, 0x63, 0xc7, 0x39, 0x65,
0x1e, 0x37, 0x0c, 0xfe, 0x81, 0x76, 0x00, 0xd8, 0x4b, 0x7b, 0x64, 0xd2, 0x7e, 0x39, 0xeb, 0x89,
0x31, 0x0a, 0xac, 0xa5, 0x65, 0xd2, 0x3e, 0xda, 0x85, 0x0d, 0xde, 0xdd, 0xc7, 0x76, 0xaf, 0x4f,
0xcb, 0xb9, 0xba, 0xd2, 0xc8, 0x19, 0x45, 0xd6, 0xf6, 0x01, 0x6b, 0x52, 0x3f, 0x0f, 0xeb, 0x73,
0x25, 0x8b, 0xf7, 0x00, 0x66, 0xb0, 0x85, 0xc4, 0x37, 0x34, 0xbe, 0x33, 0x9a, 0xb7, 0x33, 0x1a,
0xdf, 0x6e, 0xb1, 0x33, 0x5a, 0xcb, 0xec, 0x61, 0x31, 0xd6, 0x08, 0x8c, 0x54, 0x7f, 0x56, 0x60,
0x2b, 0xe2, 0x40, 0x10, 0x78, 0x07, 0xf2, 0x62, 0x71, 0x6e, 0x59, 0xa9, 0x67, 0x1b, 0xc5, 0x83,
0x6a, 0x08, 0x41, 0xb3, 0x8b, 0x09, 0xb5, 0x4f, 0x6d, 0xdc, 0x95, 0x30, 0x7c, 0x7b, 0xf4, 0x7e,
0x48, 0xdd, 0x0a, 0x53, 0xf7, 0xe6, 0x73, 0xd5, 0x71, 0xc7, 0x41, 0x79, 0xe8, 0x55, 0x58, 0x13,
0x6c, 0x3c, 0x78, 0x59, 0x43, 0x7c, 0xa9, 0x5f, 0x29, 0x50, 0xe5, 0xb2, 0x1d, 0x42, 0xb0, 0xe5,
0xd9, 0x46, 0x09, 0x55, 0x01, 0x2c, 0xbf, 0x93, 0x07, 0x8c, 0x11, 0x68, 0x89, 0x10, 0x5c, 0xb9,
0x31, 0xc1, 0x5f, 0x15, 0xa8, 0x25, 0x4a, 0x79, 0x11, 0x58, 0xba, 0x12, 0x25, 0xf7, 0x78, 0xc4,
0x32, 0xc0, 0x09, 0x35, 0x29, 0x4e, 0xf1, 0xe0, 0xfd, 0xe9, 0x53, 0x8b, 0xf1, 0x2a, 0xa8, 0x7d,
0x02, 0x77, 0x6c, 0x1f, 0x4c, 0x9b, 0x67, 0xa6, 0xb6, 0xeb, 0x99, 0x88, 0x80, 0xdf, 0xe5, 0x10,
0x79, 0xca, 0x0a, 0x30, 0x0c, 0xcc, 0xb5, 0x65, 0xc7, 0x35, 0xa7, 0x76, 0x5c, 0xbf, 0x51, 0x60,
0x37, 0xb4, 0x2c, 0x6f, 0x21, 0xc4, 0x9d, 0xb8, 0x29, 0xf3, 0x8c, 0x6c, 0x6e, 0xce, 0xdf, 0xdc,
0x7f, 0x14, 0x50, 0x17, 0x09, 0x12, 0xa8, 0xdf, 0x85, 0x5b, 0x96, 0xec, 0x09, 0x21, 0x2e, 0x69,
0x3c, 0x4d, 0x6b, 0x32, 0x4d, 0x6b, 0x8f, 0xc9, 0xa5, 0xf1, 0xb2, 0x15, 0x9a, 0x06, 0xdd, 0x83,
0x82, 0xd8, 0x1e, 0x5f, 0xea, 0xc6, 0xf4, 0xaa, 0x96, 0xe7, 0xc8, 0x9b, 0xc7, 0x46, 0x9e, 0x77,
0x37, 0xbb, 0x33, 0xf2, 0xd9, 0x64, 0xf2, 0xb9, 0xe7, 0x91, 0x5f, 0x9d, 0x27, 0xff, 0xb5, 0x02,
0x77, 0xd9, 0x42, 0x5b, 0xa6, 0x75, 0x86, 0xe9, 0x91, 0x33, 0x1c, 0xda, 0x74, 0x88, 0x09, 0x4d,
0x11, 0x7a, 0x05, 0xf2, 0xae, 0x37, 0x3b, 0xb1, 0xb0, 0xc0, 0xee, 0x7f, 0xab, 0xdf, 0x2b, 0xb0,
0x93, 0xa0, 0x47, 0x30, 0x67, 0x09, 0x4a, 0xb6, 0x32, 0x4d, 0x1b, 0x46, 0xa0, 0x25, 0xb5, 0x18,
0xfd, 0x25, 0x49, 0x99, 0x9b, 0x22, 0xaa, 0x70, 0xb6, 0xcd, 0xde, 0x38, 0xdb, 0xfe, 0x26, 0x13,
0x7f, 0x8c, 0x78, 0xc1, 0xf5, 0x10, 0x8a, 0x33, 0x8a, 0x32, 0xdf, 0xd6, 0x43, 0xf9, 0x96, 0x0f,
0x7e, 0x6c, 0x9d, 0x05, 0xb6, 0x25, 0x38, 0x28, 0xfd, 0xa4, 0xfb, 0x9d, 0x4c, 0x14, 0xbe, 0x14,
0xe2, 0x7c, 0x31, 0xc0, 0xdd, 0x1e, 0xfe, 0x1f, 0x63, 0xf6, 0x47, 0x99, 0x2c, 0x12, 0x44, 0x09,
0xc0, 0x0d, 0xb8, 0x65, 0x86, 0xbb, 0x44, 0xf4, 0x46, 0x9b, 0x53, 0x0b, 0xe1, 0x7f, 0xe5, 0x61,
0x7f, 0x42, 0xc6, 0x78, 0x60, 0x5e, 0xe2, 0x2e, 0x57, 0x9c, 0x66, 0x04, 0x7f, 0x06, 0xaf, 0x8d,
0x98, 0x93, 0xf6, 0x2c, 0x50, 0xda, 0x12, 0x9d, 0x5b, 0xce, 0xd6, 0xb3, 0x8d, 0xdc, 0xe1, 0xce,
0xf4, 0xaa, 0xb6, 0x1d, 0x0d, 0xcd, 0x13, 0x69, 0x64, 0x6c, 0x8f, 0x92, 0xba, 0xd0, 0x1e, 0xdc,
0x8e, 0xd0, 0x73, 0xd9, 0xca, 0xf3, 0xc6, 0x5c, 0xbb, 0xfa, 0x44, 0x1c, 0xe0, 0xf9, 0xd5, 0x8b,
0x1d, 0xba, 0x0b, 0x85, 0x99, 0x32, 0xef, 0x00, 0xe4, 0x8c, 0x59, 0x43, 0x20, 0x26, 0x57, 0x42,
0x31, 0x49, 0xc5, 0x95, 0xfc, 0x11, 0xbe, 0xf0, 0x85, 0x19, 0xd8, 0xc2, 0xf6, 0xd3, 0x34, 0x2b,
0x81, 0x9f, 0x14, 0xa8, 0x27, 0xbb, 0x15, 0x0b, 0x3a, 0x80, 0x2d, 0x82, 0x2f, 0x66, 0xbc, 0xdb,
0x63, 0x6e, 0xc0, 0x54, 0xe4, 0x8c, 0x4d, 0x32, 0x3f, 0x36, 0xad, 0xe0, 0x3b, 0xf8, 0x23, 0x0f,
0xab, 0x4c, 0x30, 0x6a, 0xc1, 0xba, 0x58, 0x12, 0x0a, 0xe7, 0x97, 0x98, 0x5f, 0x2f, 0x95, 0xdd,
0x05, 0x16, 0x7c, 0x95, 0x6a, 0x06, 0x9d, 0x40, 0x5e, 0x16, 0x8f, 0x28, 0x79, 0x80, 0x0c, 0xf3,
0x8a, 0xba, 0xc8, 0xc4, 0x9f, 0xf4, 0x1c, 0xd0, 0x7c, 0x6d, 0x8a, 0xee, 0xc7, 0x8c, 0x4d, 0x2a,
0xa6, 0x2b, 0x0f, 0x96, 0x33, 0x0e, 0xb9, 0x9c, 0x2b, 0xec, 0x62, 0x5d, 0x26, 0x15, 0x9d, 0xb1,
0x2e, 0x13, 0x6b, 0x45, 0x35, 0x83, 0xbe, 0x84, 0xad, 0xd8, 0x1a, 0x07, 0x69, 0xc9, 0x13, 0xc5,
0x55, 0x67, 0x15, 0x7d, 0x69, 0x7b, 0xdf, 0xf7, 0x19, 0xdc, 0x8e, 0x1e, 0x7a, 0x74, 0x6f, 0x7e,
0x9a, 0x84, 0xd2, 0xa4, 0xb2, 0xb7, 0x8c, 0xa9, 0xef, 0x8c, 0xc0, 0x2b, 0x73, 0x97, 0x1f, 0x5a,
0x62, 0x0a, 0x7f, 0x33, 0xef, 0x2f, 0x65, 0x1b, 0x04, 0x1b, 0x7b, 0x1f, 0xc4, 0x81, 0x5d, 0x74,
0x9b, 0xc5, 0x81, 0x5d, 0x78, 0xd1, 0x70, 0xb0, 0xd1, 0x24, 0x17, 0x07, 0x36, 0xe1, 0x1a, 0x88,
0x03, 0x9b, 0x94, 0x33, 0xd5, 0x0c, 0xa2, 0xb0, 0x19, 0x93, 0x83, 0x50, 0x4c, 0x20, 0x26, 0x67,
0xc8, 0xca, 0xfe, 0x92, 0xd6, 0xd2, 0xeb, 0xe1, 0x87, 0xbf, 0x4f, 0xab, 0xca, 0xb3, 0x69, 0x55,
0xf9, 0x7b, 0x5a, 0x55, 0xbe, 0xbd, 0xae, 0x66, 0x9e, 0x5d, 0x57, 0x33, 0x7f, 0x5d, 0x57, 0x33,
0x9f, 0x3e, 0xea, 0xd9, 0xb4, 0x3f, 0xe9, 0x68, 0x96, 0x33, 0xd4, 0xc5, 0x7f, 0x2e, 0xfc, 0xb1,
0xef, 0x76, 0xcf, 0xf4, 0x0b, 0xdd, 0xee, 0x58, 0xfa, 0x5b, 0x6f, 0xef, 0xcb, 0xbf, 0x57, 0xe8,
0xe5, 0x08, 0xbb, 0x9d, 0x35, 0x56, 0xa8, 0x3f, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x35,
0xdb, 0x4b, 0xfb, 0x11, 0x00, 0x00,
// 1050 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x98, 0x4f, 0x6f, 0xe3, 0x44,
0x14, 0xc0, 0xe3, 0x26, 0x6d, 0xd3, 0xd7, 0x8a, 0x5d, 0xa6, 0x2d, 0xcd, 0x7a, 0x77, 0x4d, 0xea,
0x03, 0x84, 0x2e, 0xb5, 0xd9, 0x2e, 0x27, 0x24, 0x90, 0x76, 0x2b, 0x01, 0x3d, 0x2c, 0x2a, 0xae,
0x56, 0x62, 0x39, 0x10, 0x39, 0xf6, 0x34, 0xb1, 0x9a, 0x8c, 0xdd, 0xcc, 0x64, 0xb7, 0xe5, 0x13,
0x70, 0xe4, 0xc6, 0x0d, 0x6e, 0x1c, 0x39, 0x71, 0xe6, 0x80, 0x84, 0xc4, 0x81, 0xc3, 0x1e, 0x38,
0xec, 0x11, 0xb5, 0x5f, 0x04, 0x79, 0xfe, 0x38, 0xb6, 0x63, 0x67, 0xa3, 0x0d, 0x39, 0x70, 0x72,
0xe6, 0xcd, 0x9b, 0xf7, 0xde, 0xfc, 0xe6, 0xcd, 0x9b, 0xa7, 0xc0, 0x4e, 0xd0, 0xf1, 0x6c, 0xaf,
0xe7, 0x12, 0x82, 0xfb, 0xf6, 0xf9, 0x08, 0x0f, 0x2f, 0xad, 0x68, 0x18, 0xb2, 0x10, 0xad, 0x07,
0x1d, 0xcf, 0x92, 0x13, 0xba, 0xd0, 0xea, 0x07, 0x98, 0x30, 0xf9, 0x11, 0x5a, 0xfa, 0x9e, 0x17,
0xd2, 0x41, 0x48, 0xed, 0x8e, 0x4b, 0xb1, 0x58, 0x6e, 0x3f, 0xbb, 0xdf, 0xc1, 0xcc, 0xbd, 0x6f,
0x47, 0x6e, 0x37, 0x20, 0x2e, 0x0b, 0x42, 0x22, 0x75, 0x6f, 0xa5, 0x5d, 0xc9, 0xaf, 0x9a, 0xea,
0x86, 0x61, 0xb7, 0x8f, 0x6d, 0x3e, 0xea, 0x8c, 0x4e, 0x6d, 0x97, 0xc8, 0x38, 0xcc, 0xc7, 0xb0,
0xf9, 0x65, 0x6c, 0xf7, 0x50, 0x2c, 0x70, 0xf0, 0xf9, 0x08, 0x53, 0x86, 0x76, 0x60, 0x35, 0x0a,
0x87, 0xac, 0x1d, 0xf8, 0x0d, 0xad, 0xa9, 0xb5, 0xd6, 0x9c, 0x95, 0x78, 0x78, 0xe4, 0xa3, 0xbb,
0x00, 0xd2, 0x76, 0x3c, 0xb7, 0xc4, 0xe7, 0xd6, 0xa4, 0xe4, 0xc8, 0x37, 0x7f, 0xd4, 0x60, 0x2b,
0x6b, 0x8f, 0x46, 0x21, 0xa1, 0x18, 0x59, 0xb0, 0x2a, 0xb5, 0xb8, 0xc1, 0xf5, 0x83, 0x2d, 0x2b,
0x45, 0xc0, 0x52, 0xea, 0x4a, 0x09, 0x6d, 0xc1, 0x72, 0x34, 0x0c, 0xc3, 0x53, 0xee, 0x62, 0xc3,
0x11, 0x83, 0xd8, 0x3b, 0xff, 0xd1, 0x8e, 0x5c, 0xd6, 0x6b, 0x54, 0x85, 0x77, 0x2e, 0x39, 0x76,
0x59, 0x0f, 0xed, 0xc2, 0x86, 0x98, 0xee, 0xe1, 0xa0, 0xdb, 0x63, 0x8d, 0x5a, 0x53, 0x6b, 0xd5,
0x9c, 0x75, 0x2e, 0xfb, 0x9c, 0x8b, 0xcc, 0x6f, 0xb2, 0xf1, 0x51, 0xb5, 0xe1, 0x4f, 0x01, 0xc6,
0x44, 0x65, 0x88, 0xef, 0x58, 0x02, 0xbf, 0x15, 0xe3, 0xb7, 0xc4, 0xe9, 0x49, 0xfc, 0xd6, 0xb1,
0xdb, 0xc5, 0x72, 0xad, 0x93, 0x5a, 0x69, 0xfe, 0xaa, 0xc1, 0x76, 0xce, 0x81, 0x24, 0xf0, 0x11,
0xd4, 0xe5, 0xe6, 0x68, 0x43, 0x6b, 0x56, 0x5b, 0xeb, 0x07, 0x46, 0x06, 0xc1, 0x91, 0x8f, 0x09,
0x0b, 0x4e, 0x03, 0xec, 0x2b, 0x18, 0x89, 0x3e, 0xfa, 0x2c, 0x13, 0xdd, 0x12, 0x8f, 0xee, 0xdd,
0x57, 0x46, 0x27, 0x1c, 0xa7, 0xc3, 0x43, 0x6f, 0xc1, 0x8a, 0x64, 0x13, 0xc3, 0xab, 0x3a, 0x72,
0x64, 0x7e, 0xa7, 0x81, 0x21, 0xc2, 0x0e, 0x09, 0xc1, 0x5e, 0xac, 0x9b, 0x27, 0x64, 0x00, 0x78,
0xc9, 0xa4, 0xcc, 0x8a, 0x94, 0x24, 0x47, 0x70, 0xe9, 0xb5, 0x09, 0xfe, 0xa6, 0xc1, 0xdb, 0xa5,
0xa1, 0xfc, 0x1f, 0x58, 0x7e, 0xa5, 0x50, 0x0a, 0x8f, 0x87, 0xfc, 0x42, 0x9f, 0x30, 0x97, 0xe1,
0x79, 0x6f, 0xd7, 0xdf, 0x09, 0x9a, 0x02, 0xd3, 0x12, 0xcd, 0x53, 0xd8, 0x09, 0x92, 0xdd, 0xb7,
0x45, 0x35, 0x69, 0xd3, 0x58, 0x45, 0x66, 0xf5, 0xae, 0x20, 0x25, 0xca, 0x4c, 0x0a, 0x54, 0xca,
0xd6, 0x76, 0x50, 0x24, 0x5e, 0xd8, 0x9d, 0xa4, 0xb0, 0x9b, 0xd9, 0x55, 0xbc, 0x0f, 0x42, 0x47,
0xf4, 0xbf, 0x60, 0x96, 0x3b, 0xa5, 0x5a, 0x72, 0x4a, 0x2f, 0x35, 0x30, 0xa7, 0x79, 0x95, 0x38,
0x3f, 0x86, 0x1b, 0x9e, 0x9a, 0xc9, 0x60, 0xdc, 0xb2, 0x44, 0x51, 0xb5, 0x54, 0x51, 0xb5, 0x1e,
0x92, 0x4b, 0xe7, 0x0d, 0x2f, 0x63, 0x06, 0xdd, 0x86, 0x35, 0x79, 0x04, 0x49, 0x6c, 0x75, 0x21,
0x38, 0xf2, 0xc7, 0x3c, 0xab, 0xe5, 0x3c, 0x6b, 0xaf, 0xe2, 0xb9, 0x3c, 0xc9, 0x73, 0x08, 0x77,
0xf8, 0xce, 0x8e, 0x5d, 0xef, 0x0c, 0xb3, 0xc3, 0x70, 0x30, 0x08, 0xd8, 0x00, 0x13, 0x36, 0x2f,
0x4a, 0x1d, 0xea, 0x34, 0x36, 0x41, 0x3c, 0x2c, 0x61, 0x26, 0x63, 0xf3, 0x07, 0x0d, 0xee, 0x96,
0x38, 0x95, 0x24, 0x79, 0xfd, 0x50, 0x52, 0xee, 0x78, 0xc3, 0x49, 0x49, 0x16, 0x96, 0x5d, 0x3f,
0x95, 0x45, 0x46, 0xe7, 0xe5, 0x91, 0xad, 0x78, 0xd5, 0xd7, 0xae, 0x78, 0x7f, 0xa8, 0xe2, 0x5b,
0x10, 0xa1, 0x84, 0xf7, 0x08, 0xd6, 0xc7, 0xa8, 0x54, 0xcd, 0x6b, 0x66, 0x6a, 0x9e, 0x58, 0xfc,
0xd0, 0x3b, 0x4b, 0xb1, 0x4f, 0x2f, 0x5a, 0x7c, 0xe1, 0x7b, 0x2e, 0xef, 0x71, 0x12, 0x09, 0x09,
0x9f, 0xf7, 0xb1, 0xdf, 0xc5, 0x8b, 0x4e, 0xbe, 0x9f, 0xd5, 0x5d, 0x2e, 0xf1, 0x2c, 0x21, 0xb6,
0xe0, 0x86, 0x9b, 0x9d, 0x92, 0x69, 0x98, 0x17, 0x2f, 0x2c, 0x17, 0x7f, 0xd7, 0xe4, 0xd5, 0x7c,
0x42, 0x86, 0xb8, 0xef, 0x5e, 0x62, 0x5f, 0x44, 0x3c, 0x77, 0x2a, 0x7e, 0x02, 0xb7, 0x23, 0x6e,
0xa9, 0x3d, 0x3e, 0xf1, 0xb6, 0xe2, 0x43, 0x1b, 0xd5, 0x66, 0xb5, 0x55, 0x73, 0x6e, 0x45, 0xb9,
0xfc, 0x3a, 0x51, 0x0a, 0x68, 0x0f, 0x6e, 0xe6, 0x18, 0x50, 0x1e, 0x7f, 0xdd, 0x99, 0x90, 0x9b,
0x4f, 0xe4, 0x7d, 0x9a, 0xdc, 0x83, 0xe4, 0x7c, 0x07, 0xd6, 0xc6, 0xae, 0x35, 0xee, 0x7a, 0x2c,
0x48, 0x65, 0xcf, 0x52, 0x26, 0x7b, 0x9e, 0xca, 0xb7, 0xed, 0x0b, 0x7c, 0x91, 0x04, 0xe6, 0x60,
0x0f, 0x07, 0xcf, 0xe6, 0x7e, 0x37, 0x7f, 0xd1, 0xa0, 0x59, 0x6e, 0x5b, 0x46, 0x7d, 0x00, 0xdb,
0x04, 0x5f, 0x8c, 0xa9, 0xb5, 0x87, 0x42, 0x81, 0xbb, 0xaa, 0x39, 0x9b, 0x64, 0x72, 0xed, 0xa2,
0xf2, 0xe4, 0xe0, 0xaf, 0x3a, 0x2c, 0xf3, 0x80, 0xd1, 0x31, 0xac, 0xca, 0x07, 0x0a, 0x65, 0xaf,
0x7b, 0x41, 0xd7, 0xae, 0xef, 0x4e, 0xd1, 0x10, 0xbb, 0x34, 0x2b, 0xe8, 0x04, 0xea, 0xaa, 0x9f,
0x42, 0xe5, 0x0b, 0x54, 0x46, 0xea, 0xe6, 0x34, 0x95, 0xc4, 0xe8, 0x39, 0xa0, 0xc9, 0x76, 0x0d,
0xdd, 0x2b, 0x58, 0x5b, 0xd6, 0x5f, 0xea, 0xef, 0xcf, 0xa6, 0x9c, 0x71, 0x39, 0xd1, 0x06, 0x15,
0xba, 0x2c, 0xeb, 0xc3, 0x0a, 0x5d, 0x96, 0x76, 0x56, 0x66, 0x05, 0x7d, 0x0b, 0xdb, 0x85, 0xdd,
0x02, 0xb2, 0xca, 0x0d, 0x15, 0x35, 0x33, 0xba, 0x3d, 0xb3, 0x7e, 0xe2, 0xfb, 0x0c, 0x6e, 0xe6,
0x9f, 0x07, 0xf4, 0xde, 0xa4, 0x99, 0x92, 0x37, 0x5f, 0xdf, 0x9b, 0x45, 0x35, 0x71, 0x46, 0xe0,
0xcd, 0x89, 0xb7, 0x08, 0xcd, 0x60, 0x22, 0x39, 0xcc, 0x7b, 0x33, 0xe9, 0xa6, 0xc1, 0x16, 0x96,
0xee, 0x22, 0xb0, 0xd3, 0x5e, 0x97, 0x22, 0xb0, 0x53, 0xdf, 0x04, 0x01, 0x36, 0x5f, 0xc9, 0x8a,
0xc0, 0x96, 0x54, 0xec, 0x22, 0xb0, 0x65, 0x85, 0xd1, 0xac, 0x20, 0x06, 0x9b, 0x05, 0x35, 0x08,
0x15, 0x24, 0x62, 0x79, 0x19, 0xd4, 0xf7, 0x67, 0xd4, 0x56, 0x5e, 0x1f, 0x3d, 0xfe, 0xf3, 0xca,
0xd0, 0x5e, 0x5c, 0x19, 0xda, 0x3f, 0x57, 0x86, 0xf6, 0xfd, 0xb5, 0x51, 0x79, 0x71, 0x6d, 0x54,
0x5e, 0x5e, 0x1b, 0x95, 0xaf, 0x1f, 0x74, 0x03, 0xd6, 0x1b, 0x75, 0x2c, 0x2f, 0x1c, 0xd8, 0xf2,
0xbf, 0x06, 0xf1, 0xd9, 0xa7, 0xfe, 0x99, 0x7d, 0x61, 0x07, 0x1d, 0xcf, 0xfe, 0xe0, 0xc3, 0x7d,
0xf5, 0xb7, 0x02, 0xbb, 0x8c, 0x30, 0xed, 0xac, 0xf0, 0x96, 0xf7, 0xc1, 0xbf, 0x01, 0x00, 0x00,
0xff, 0xff, 0x42, 0xe1, 0x0d, 0x6d, 0xdd, 0x10, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -1893,17 +1888,17 @@ func (m *QueryChannelRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2169,17 +2164,17 @@ func (m *QueryChannelClientStateRequest) MarshalToSizedBuffer(dAtA []byte) (int,
_ = i
var l int
_ = l
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2265,17 +2260,17 @@ func (m *QueryChannelConsensusStateRequest) MarshalToSizedBuffer(dAtA []byte) (i
i--
dAtA[i] = 0x18
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2321,10 +2316,10 @@ func (m *QueryChannelConsensusStateResponse) MarshalToSizedBuffer(dAtA []byte) (
i--
dAtA[i] = 0x1a
}
if len(m.ClientID) > 0 {
i -= len(m.ClientID)
copy(dAtA[i:], m.ClientID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ClientID)))
if len(m.ClientId) > 0 {
i -= len(m.ClientId)
copy(dAtA[i:], m.ClientId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ClientId)))
i--
dAtA[i] = 0x12
}
@ -2368,17 +2363,17 @@ func (m *QueryPacketCommitmentRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
i--
dAtA[i] = 0x18
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2466,17 +2461,17 @@ func (m *QueryPacketCommitmentsRequest) MarshalToSizedBuffer(dAtA []byte) (int,
i--
dAtA[i] = 0x1a
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2562,17 +2557,17 @@ func (m *QueryPacketAcknowledgementRequest) MarshalToSizedBuffer(dAtA []byte) (i
i--
dAtA[i] = 0x18
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2676,17 +2671,17 @@ func (m *QueryUnrelayedPacketsRequest) MarshalToSizedBuffer(dAtA []byte) (int, e
i--
dAtA[i] = 0x1a
}
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2759,17 +2754,17 @@ func (m *QueryNextSequenceReceiveRequest) MarshalToSizedBuffer(dAtA []byte) (int
_ = i
var l int
_ = l
if len(m.ChannelID) > 0 {
i -= len(m.ChannelID)
copy(dAtA[i:], m.ChannelID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelID)))
if len(m.ChannelId) > 0 {
i -= len(m.ChannelId)
copy(dAtA[i:], m.ChannelId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId)))
i--
dAtA[i] = 0x12
}
if len(m.PortID) > 0 {
i -= len(m.PortID)
copy(dAtA[i:], m.PortID)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortID)))
if len(m.PortId) > 0 {
i -= len(m.PortId)
copy(dAtA[i:], m.PortId)
i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId)))
i--
dAtA[i] = 0xa
}
@ -2840,11 +2835,11 @@ func (m *QueryChannelRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -2955,11 +2950,11 @@ func (m *QueryChannelClientStateRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -2996,11 +2991,11 @@ func (m *QueryChannelConsensusStateRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -3020,7 +3015,7 @@ func (m *QueryChannelConsensusStateResponse) Size() (n int) {
l = m.ConsensusState.Size()
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ClientID)
l = len(m.ClientId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -3044,11 +3039,11 @@ func (m *QueryPacketCommitmentRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -3088,11 +3083,11 @@ func (m *QueryPacketCommitmentsRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -3131,11 +3126,11 @@ func (m *QueryPacketAcknowledgementRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -3175,11 +3170,11 @@ func (m *QueryUnrelayedPacketsRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -3221,11 +3216,11 @@ func (m *QueryNextSequenceReceiveRequest) Size() (n int) {
}
var l int
_ = l
l = len(m.PortID)
l = len(m.PortId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
l = len(m.ChannelID)
l = len(m.ChannelId)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@ -3292,7 +3287,7 @@ func (m *QueryChannelRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3320,11 +3315,11 @@ func (m *QueryChannelRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -3352,7 +3347,7 @@ func (m *QueryChannelRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@ -4077,7 +4072,7 @@ func (m *QueryChannelClientStateRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4105,11 +4100,11 @@ func (m *QueryChannelClientStateRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4137,7 +4132,7 @@ func (m *QueryChannelClientStateRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@ -4368,7 +4363,7 @@ func (m *QueryChannelConsensusStateRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4396,11 +4391,11 @@ func (m *QueryChannelConsensusStateRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4428,7 +4423,7 @@ func (m *QueryChannelConsensusStateRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {
@ -4540,7 +4535,7 @@ func (m *QueryChannelConsensusStateResponse) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ClientID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4568,7 +4563,7 @@ func (m *QueryChannelConsensusStateResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ClientID = string(dAtA[iNdEx:postIndex])
m.ClientId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -4710,7 +4705,7 @@ func (m *QueryPacketCommitmentRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4738,11 +4733,11 @@ func (m *QueryPacketCommitmentRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -4770,7 +4765,7 @@ func (m *QueryPacketCommitmentRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {
@ -5018,7 +5013,7 @@ func (m *QueryPacketCommitmentsRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5046,11 +5041,11 @@ func (m *QueryPacketCommitmentsRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5078,7 +5073,7 @@ func (m *QueryPacketCommitmentsRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 2 {
@ -5313,7 +5308,7 @@ func (m *QueryPacketAcknowledgementRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5341,11 +5336,11 @@ func (m *QueryPacketAcknowledgementRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5373,7 +5368,7 @@ func (m *QueryPacketAcknowledgementRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {
@ -5621,7 +5616,7 @@ func (m *QueryUnrelayedPacketsRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5649,11 +5644,11 @@ func (m *QueryUnrelayedPacketsRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -5681,7 +5676,7 @@ func (m *QueryUnrelayedPacketsRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType == 0 {
@ -5982,7 +5977,7 @@ func (m *QueryNextSequenceReceiveRequest) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PortID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field PortId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -6010,11 +6005,11 @@ func (m *QueryNextSequenceReceiveRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.PortID = string(dAtA[iNdEx:postIndex])
m.PortId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChannelID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -6042,7 +6037,7 @@ func (m *QueryNextSequenceReceiveRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChannelID = string(dAtA[iNdEx:postIndex])
m.ChannelId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex

6
x/ibc/07-tendermint/types/client_state.go
View File

@ -30,7 +30,7 @@ func NewClientState(
latestHeight uint64, specs []*ics23.ProofSpec,
) *ClientState {
return &ClientState{
ChainID: chainID,
ChainId: chainID,
TrustLevel: trustLevel,
TrustingPeriod: trustingPeriod,
UnbondingPeriod: ubdPeriod,
@ -43,7 +43,7 @@ func NewClientState(
// GetChainID returns the chain-id
func (cs ClientState) GetChainID() string {
return cs.ChainID
return cs.ChainId
}
// ClientType is tendermint.
@ -69,7 +69,7 @@ func (cs ClientState) GetFrozenHeight() uint64 {
// Validate performs a basic validation of the client state fields.
func (cs ClientState) Validate() error {
if strings.TrimSpace(cs.ChainID) == "" {
if strings.TrimSpace(cs.ChainId) == "" {
return sdkerrors.Wrap(ErrInvalidChainID, "chain id cannot be empty string")
}
if err := lite.ValidateTrustLevel(cs.TrustLevel.ToTendermint()); err != nil {

107
x/ibc/07-tendermint/types/tendermint.pb.go
View File

@ -34,7 +34,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
// ClientState from Tendermint tracks the current validator set, latest height,
// and a possible frozen height.
type ClientState struct {
ChainID string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
TrustLevel Fraction `protobuf:"bytes,2,opt,name=trust_level,json=trustLevel,proto3" json:"trust_level" yaml:"trust_level"`
// duration of the period since the LastestTimestamp during which the
// submitted headers are valid for upgrade
@ -191,52 +191,51 @@ func init() {
func init() { proto.RegisterFile("ibc/tendermint/tendermint.proto", fileDescriptor_76a953d5a747dd66) }
var fileDescriptor_76a953d5a747dd66 = []byte{
// 710 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6a, 0xdb, 0x4c,
0x14, 0xb5, 0x12, 0x27, 0x71, 0x46, 0xf9, 0x43, 0x5f, 0xc8, 0xa7, 0xba, 0xc5, 0x32, 0x2a, 0x14,
0x6f, 0x22, 0x15, 0x27, 0xb4, 0x10, 0xe8, 0x46, 0x0e, 0x25, 0x29, 0x2d, 0x04, 0xa5, 0x3f, 0xd0,
0x8d, 0xd0, 0xcf, 0x58, 0x1a, 0x22, 0xcd, 0x08, 0xcd, 0x28, 0x38, 0x7d, 0x82, 0x76, 0x97, 0x4d,
0xa1, 0xcb, 0x3e, 0x44, 0x1f, 0x22, 0xcb, 0x2c, 0xbb, 0x72, 0x8b, 0xf3, 0x06, 0x59, 0x76, 0x55,
0x66, 0x24, 0xc5, 0x8a, 0x1b, 0x28, 0x5d, 0xf9, 0xde, 0x73, 0xef, 0xb9, 0x57, 0xf7, 0xf8, 0x48,
0x40, 0x43, 0x9e, 0x6f, 0x32, 0x88, 0x03, 0x98, 0x25, 0x08, 0xb3, 0x5a, 0x68, 0xa4, 0x19, 0x61,
0x44, 0x59, 0x43, 0x9e, 0x6f, 0x4c, 0xd1, 0xf6, 0x7f, 0x3e, 0xc1, 0x43, 0x44, 0xcc, 0x34, 0x23,
0x64, 0x48, 0x8b, 0xa6, 0x76, 0x27, 0x24, 0x24, 0x8c, 0xa1, 0x29, 0x32, 0x2f, 0x1f, 0x9a, 0x41,
0x9e, 0xb9, 0x0c, 0x11, 0x5c, 0xd6, 0xb5, 0xd9, 0x3a, 0x43, 0x09, 0xa4, 0xcc, 0x4d, 0xd2, 0xaa,
0x81, 0x3f, 0x86, 0x4f, 0x92, 0x04, 0xb1, 0x04, 0x62, 0x56, 0x0b, 0xcb, 0x86, 0xcd, 0x90, 0x84,
0x44, 0x84, 0x26, 0x8f, 0x0a, 0x54, 0xff, 0xbc, 0x00, 0xe4, 0x41, 0x8c, 0x20, 0x66, 0xc7, 0xcc,
0x65, 0x50, 0x79, 0x04, 0x5a, 0x7e, 0xe4, 0x22, 0xec, 0xa0, 0x40, 0x95, 0xba, 0x52, 0x6f, 0xd9,
0x92, 0x27, 0x63, 0x6d, 0x69, 0xc0, 0xb1, 0xc3, 0x7d, 0x7b, 0x49, 0x14, 0x0f, 0x03, 0xe5, 0x0d,
0x90, 0x59, 0x96, 0x53, 0xe6, 0xc4, 0xf0, 0x14, 0xc6, 0xea, 0x5c, 0x57, 0xea, 0xc9, 0x7d, 0xd5,
0xb8, 0x7d, 0xaa, 0xf1, 0x3c, 0x73, 0x7d, 0x7e, 0x84, 0xd5, 0xbe, 0x18, 0x6b, 0x8d, 0xeb, 0xb1,
0xa6, 0x9c, 0xb9, 0x49, 0xbc, 0xa7, 0xd7, 0xa8, 0xba, 0x0d, 0x44, 0xf6, 0x92, 0x27, 0xca, 0x10,
0xac, 0x8b, 0x0c, 0xe1, 0xd0, 0x49, 0x61, 0x86, 0x48, 0xa0, 0xce, 0x8b, 0xd1, 0xf7, 0x8c, 0x42,
0x00, 0xa3, 0x12, 0xc0, 0xd8, 0x2f, 0x05, 0xb2, 0xf4, 0x72, 0xf6, 0x56, 0x6d, 0xf6, 0x94, 0xaf,
0x7f, 0xf9, 0xa1, 0x49, 0xf6, 0x5a, 0x85, 0x1e, 0x09, 0x50, 0x41, 0x60, 0x23, 0xc7, 0x1e, 0xc1,
0x41, 0x6d, 0x51, 0xf3, 0x6f, 0x8b, 0x1e, 0x96, 0x8b, 0xfe, 0x2f, 0x16, 0xcd, 0x0e, 0x28, 0x36,
0xad, 0xdf, 0xc0, 0xe5, 0x2a, 0x08, 0xd6, 0x13, 0x77, 0xe4, 0xf8, 0x31, 0xf1, 0x4f, 0x9c, 0x20,
0x43, 0x43, 0xa6, 0x2e, 0xfc, 0xe3, 0x49, 0x33, 0xfc, 0x62, 0xd1, 0x6a, 0xe2, 0x8e, 0x06, 0x1c,
0xdc, 0xe7, 0x98, 0xf2, 0x0c, 0xac, 0x0e, 0x33, 0xf2, 0x01, 0x62, 0x27, 0x82, 0x28, 0x8c, 0x98,
0xba, 0xd8, 0x95, 0x7a, 0x4d, 0x4b, 0xbd, 0x1e, 0x6b, 0x9b, 0xc5, 0x94, 0x5b, 0x65, 0xdd, 0x5e,
0x29, 0xf2, 0x03, 0x91, 0x72, 0x7a, 0xec, 0x32, 0x48, 0x59, 0x45, 0x5f, 0x9a, 0xa5, 0xdf, 0x2a,
0xeb, 0xf6, 0x4a, 0x91, 0x97, 0xf4, 0x43, 0x20, 0x0b, 0x3b, 0x3b, 0x34, 0x85, 0x3e, 0x55, 0x5b,
0xdd, 0xf9, 0x9e, 0xdc, 0xdf, 0x30, 0x90, 0x4f, 0xfb, 0x3b, 0xc6, 0x11, 0xaf, 0x1c, 0xa7, 0xd0,
0xb7, 0xb6, 0xa6, 0x16, 0xa8, 0xb5, 0xeb, 0x36, 0x48, 0xab, 0x16, 0xba, 0xd7, 0xfc, 0xf8, 0x55,
0x6b, 0xe8, 0xdf, 0xe6, 0xc0, 0xda, 0x80, 0x60, 0x0a, 0x31, 0xcd, 0x69, 0x61, 0x4d, 0x0b, 0x2c,
0xdf, 0x98, 0x5e, 0x78, 0x53, 0xee, 0xb7, 0xff, 0x90, 0xf0, 0x75, 0xd5, 0x61, 0xb5, 0xb8, 0x86,
0xe7, 0x5c, 0xa9, 0x29, 0x4d, 0xd9, 0x05, 0xcd, 0x8c, 0x10, 0x56, 0xfa, 0xb5, 0x2d, 0xfc, 0x5a,
0x7b, 0x53, 0x5e, 0xc1, 0xec, 0x24, 0x86, 0x36, 0x21, 0xcc, 0x6a, 0x72, 0xba, 0x2d, 0xba, 0x95,
0x2d, 0xb0, 0x58, 0xaa, 0xc2, 0xcd, 0xd8, 0xb4, 0xcb, 0x4c, 0xf9, 0x24, 0x81, 0x4d, 0x0c, 0x47,
0xcc, 0x39, 0x75, 0x63, 0x14, 0xb8, 0x8c, 0x64, 0xd4, 0x89, 0x5c, 0x1a, 0x09, 0x2b, 0xad, 0x58,
0xef, 0xae, 0xc7, 0xda, 0xfd, 0xe2, 0xda, 0xbb, 0xba, 0xf4, 0x5f, 0x63, 0x6d, 0x37, 0x44, 0x2c,
0xca, 0x3d, 0xfe, 0x0c, 0x77, 0x7f, 0x43, 0xcc, 0x18, 0x79, 0xd4, 0xf4, 0xce, 0x18, 0xa4, 0xc6,
0x01, 0x1c, 0x59, 0x3c, 0xb0, 0x15, 0x3e, 0xee, 0xed, 0xcd, 0xb4, 0x03, 0x97, 0x46, 0xa5, 0x6c,
0x2f, 0x40, 0xab, 0x7a, 0xe7, 0x94, 0x07, 0x60, 0x19, 0xe7, 0x09, 0xcc, 0x78, 0x8f, 0xd0, 0x6b,
0xde, 0x9e, 0x02, 0x4a, 0x17, 0xc8, 0x01, 0xc4, 0x24, 0x41, 0x58, 0xd4, 0xe7, 0x44, 0xbd, 0x0e,
0x59, 0x47, 0x17, 0x93, 0x8e, 0x74, 0x39, 0xe9, 0x48, 0x3f, 0x27, 0x1d, 0xe9, 0xfc, 0xaa, 0xd3,
0xb8, 0xbc, 0xea, 0x34, 0xbe, 0x5f, 0x75, 0x1a, 0xef, 0x9f, 0xd4, 0x9e, 0xda, 0x27, 0x34, 0x21,
0xb4, 0xfc, 0xd9, 0xa6, 0xc1, 0x89, 0x39, 0x32, 0xf9, 0xa7, 0xe8, 0xf1, 0xd3, 0xed, 0xfa, 0x41,
0x67, 0x29, 0xa4, 0xde, 0xa2, 0xf8, 0x9b, 0x76, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x81,
0xb1, 0x35, 0x33, 0x05, 0x00, 0x00,
// 698 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x4e, 0xdb, 0x4c,
0x14, 0x8d, 0x21, 0x40, 0x18, 0xf3, 0x27, 0x7f, 0x88, 0xcf, 0xa4, 0x95, 0x1d, 0xb9, 0x9b, 0x6c,
0xb0, 0xab, 0x80, 0x5a, 0x09, 0xa9, 0x1b, 0x83, 0x2a, 0xa8, 0x5a, 0x09, 0x99, 0xfe, 0x48, 0xdd,
0x58, 0xfe, 0x99, 0xd8, 0x23, 0xec, 0x19, 0xcb, 0x33, 0x46, 0xa1, 0x4f, 0x40, 0x77, 0x2c, 0xbb,
0xec, 0x43, 0xf4, 0x21, 0x58, 0xb2, 0xec, 0x2a, 0xad, 0xe0, 0x0d, 0x58, 0x76, 0x55, 0xcd, 0xd8,
0x26, 0x26, 0x45, 0xaa, 0xba, 0xca, 0xdc, 0x73, 0xcf, 0xb9, 0x77, 0xee, 0xcd, 0xf1, 0x00, 0x1d,
0xf9, 0x81, 0xc5, 0x20, 0x0e, 0x61, 0x9e, 0x22, 0xcc, 0x1a, 0x47, 0x33, 0xcb, 0x09, 0x23, 0xca,
0x0a, 0xf2, 0x03, 0x73, 0x82, 0x76, 0xff, 0x0b, 0x08, 0x1e, 0x22, 0x62, 0x65, 0x39, 0x21, 0x43,
0x5a, 0x92, 0xba, 0x5a, 0x44, 0x48, 0x94, 0x40, 0x4b, 0x44, 0x7e, 0x31, 0xb4, 0xc2, 0x22, 0xf7,
0x18, 0x22, 0xb8, 0xca, 0xeb, 0xd3, 0x79, 0x86, 0x52, 0x48, 0x99, 0x97, 0x66, 0x35, 0x81, 0x5f,
0x23, 0x20, 0x69, 0x8a, 0x58, 0x0a, 0x31, 0x6b, 0x1c, 0x2b, 0xc2, 0x7a, 0x44, 0x22, 0x22, 0x8e,
0x16, 0x3f, 0x95, 0xa8, 0x71, 0x3e, 0x07, 0xe4, 0xbd, 0x04, 0x41, 0xcc, 0x8e, 0x99, 0xc7, 0xa0,
0xb2, 0x09, 0x3a, 0x41, 0xec, 0x21, 0xec, 0xa2, 0x50, 0x95, 0x7a, 0x52, 0x7f, 0xd1, 0x59, 0x10,
0xf1, 0x61, 0xa8, 0xbc, 0x03, 0x32, 0xcb, 0x0b, 0xca, 0xdc, 0x04, 0x9e, 0xc2, 0x44, 0x9d, 0xe9,
0x49, 0x7d, 0x79, 0xa0, 0x9a, 0xf7, 0xa7, 0x33, 0x5f, 0xe6, 0x5e, 0xc0, 0xef, 0x6d, 0x77, 0x2f,
0xc7, 0x7a, 0xeb, 0x76, 0xac, 0x2b, 0x67, 0x5e, 0x9a, 0xec, 0x1a, 0x0d, 0xa9, 0xe1, 0x00, 0x11,
0xbd, 0xe6, 0x81, 0x32, 0x04, 0xab, 0x22, 0x42, 0x38, 0x72, 0x33, 0x98, 0x23, 0x12, 0xaa, 0xb3,
0xa2, 0xf4, 0xa6, 0x59, 0xce, 0x6c, 0xd6, 0x33, 0x9b, 0xfb, 0xd5, 0x4e, 0x6c, 0xa3, 0xaa, 0xbd,
0xd1, 0xa8, 0x3d, 0xd1, 0x1b, 0x5f, 0x7e, 0xe8, 0x92, 0xb3, 0x52, 0xa3, 0x47, 0x02, 0x54, 0x10,
0x58, 0x2b, 0xb0, 0x4f, 0x70, 0xd8, 0x68, 0xd4, 0xfe, 0x5b, 0xa3, 0x27, 0x55, 0xa3, 0xff, 0xcb,
0x46, 0xd3, 0x05, 0xca, 0x4e, 0xab, 0x77, 0x70, 0xd5, 0x0a, 0x82, 0xd5, 0xd4, 0x1b, 0xb9, 0x41,
0x42, 0x82, 0x13, 0x37, 0xcc, 0xd1, 0x90, 0xa9, 0x73, 0xff, 0x38, 0xd2, 0x94, 0xbe, 0x6c, 0xb4,
0x9c, 0x7a, 0xa3, 0x3d, 0x0e, 0xee, 0x73, 0x4c, 0x79, 0x01, 0x96, 0x87, 0x39, 0xf9, 0x04, 0xb1,
0x1b, 0x43, 0x14, 0xc5, 0x4c, 0x9d, 0xef, 0x49, 0xfd, 0xb6, 0xad, 0xde, 0x8e, 0xf5, 0xf5, 0xb2,
0xca, 0xbd, 0xb4, 0xe1, 0x2c, 0x95, 0xf1, 0x81, 0x08, 0xb9, 0x3c, 0xf1, 0x18, 0xa4, 0xac, 0x96,
0x2f, 0x4c, 0xcb, 0xef, 0xa5, 0x0d, 0x67, 0xa9, 0x8c, 0x2b, 0xf9, 0x21, 0x90, 0x85, 0x83, 0x5d,
0x9a, 0xc1, 0x80, 0xaa, 0x9d, 0xde, 0x6c, 0x5f, 0x1e, 0xac, 0x99, 0x28, 0xa0, 0x83, 0x6d, 0xf3,
0x88, 0x67, 0x8e, 0x33, 0x18, 0xd8, 0x1b, 0x13, 0x0b, 0x34, 0xe8, 0x86, 0x03, 0xb2, 0x9a, 0x42,
0x77, 0xdb, 0xe7, 0x5f, 0xf5, 0x96, 0xf1, 0x6d, 0x06, 0xac, 0xec, 0x11, 0x4c, 0x21, 0xa6, 0x05,
0x2d, 0xdd, 0x68, 0x83, 0xc5, 0x3b, 0x9f, 0x0b, 0x3b, 0xca, 0x83, 0xee, 0x1f, 0x2b, 0x7c, 0x5b,
0x33, 0xec, 0x0e, 0xdf, 0xe1, 0x05, 0xdf, 0xd4, 0x44, 0xa6, 0xec, 0x80, 0x76, 0x4e, 0x08, 0xab,
0xfc, 0xda, 0x15, 0x7e, 0x6d, 0x7c, 0x1c, 0x6f, 0x60, 0x7e, 0x92, 0x40, 0x87, 0x10, 0x66, 0xb7,
0xb9, 0xdc, 0x11, 0x6c, 0x65, 0x03, 0xcc, 0x57, 0x5b, 0xe1, 0x66, 0x6c, 0x3b, 0x55, 0xa4, 0x7c,
0x96, 0xc0, 0x3a, 0x86, 0x23, 0xe6, 0x9e, 0x7a, 0x09, 0x0a, 0x3d, 0x46, 0x72, 0xea, 0xc6, 0x1e,
0x8d, 0x85, 0x95, 0x96, 0xec, 0x0f, 0xb7, 0x63, 0xfd, 0x51, 0x39, 0xed, 0x43, 0x2c, 0xe3, 0xd7,
0x58, 0xdf, 0x89, 0x10, 0x8b, 0x0b, 0x9f, 0xdf, 0xe1, 0xe1, 0x67, 0xc3, 0x4a, 0x90, 0x4f, 0x2d,
0xff, 0x8c, 0x41, 0x6a, 0x1e, 0xc0, 0x91, 0xcd, 0x0f, 0x8e, 0xc2, 0xcb, 0xbd, 0xbf, 0xab, 0x76,
0xe0, 0xd1, 0xb8, 0x5a, 0xdb, 0x2b, 0xd0, 0xa9, 0xbf, 0x39, 0xe5, 0x31, 0x58, 0xc4, 0x45, 0x0a,
0x73, 0xce, 0x11, 0xfb, 0x9a, 0x75, 0x26, 0x80, 0xd2, 0x03, 0x72, 0x08, 0x31, 0x49, 0x11, 0x16,
0xf9, 0x19, 0x91, 0x6f, 0x42, 0xf6, 0xd1, 0xe5, 0xb5, 0x26, 0x5d, 0x5d, 0x6b, 0xd2, 0xcf, 0x6b,
0x4d, 0xba, 0xb8, 0xd1, 0x5a, 0x57, 0x37, 0x5a, 0xeb, 0xfb, 0x8d, 0xd6, 0xfa, 0xf8, 0xac, 0x71,
0xeb, 0x80, 0xd0, 0x94, 0xd0, 0xea, 0x67, 0x8b, 0x86, 0x27, 0xd6, 0xc8, 0xe2, 0xaf, 0xcf, 0xd3,
0xe7, 0x5b, 0xcd, 0x81, 0xce, 0x32, 0x48, 0xfd, 0x79, 0xf1, 0x37, 0x6d, 0xff, 0x0e, 0x00, 0x00,
0xff, 0xff, 0x07, 0xd7, 0x7b, 0xa7, 0x26, 0x05, 0x00, 0x00,
}
func (m *ClientState) Marshal() (dAtA []byte, err error) {
@ -317,10 +316,10 @@ func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
}
i--
dAtA[i] = 0x12
if len(m.ChainID) > 0 {
i -= len(m.ChainID)
copy(dAtA[i:], m.ChainID)
i = encodeVarintTendermint(dAtA, i, uint64(len(m.ChainID)))
if len(m.ChainId) > 0 {
i -= len(m.ChainId)
copy(dAtA[i:], m.ChainId)
i = encodeVarintTendermint(dAtA, i, uint64(len(m.ChainId)))
i--
dAtA[i] = 0xa
}
@ -430,7 +429,7 @@ func (m *ClientState) Size() (n int) {
}
var l int
_ = l
l = len(m.ChainID)
l = len(m.ChainId)
if l > 0 {
n += 1 + l + sovTendermint(uint64(l))
}
@ -529,7 +528,7 @@ func (m *ClientState) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChainID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -557,7 +556,7 @@ func (m *ClientState) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChainID = string(dAtA[iNdEx:postIndex])
m.ChainId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {

6
x/ibc/09-localhost/types/client_state.go
View File

@ -26,14 +26,14 @@ var _ clientexported.ClientState = (*ClientState)(nil)
// NewClientState creates a new ClientState instance
func NewClientState(chainID string, height int64) *ClientState {
return &ClientState{
ChainID: chainID,
ChainId: chainID,
Height: uint64(height),
}
}
// GetChainID returns an empty string
func (cs ClientState) GetChainID() string {
return cs.ChainID
return cs.ChainId
}
// ClientType is localhost.
@ -58,7 +58,7 @@ func (cs ClientState) GetFrozenHeight() uint64 {
// Validate performs a basic validation of the client state fields.
func (cs ClientState) Validate() error {
if strings.TrimSpace(cs.ChainID) == "" {
if strings.TrimSpace(cs.ChainId) == "" {
return sdkerrors.Wrap(sdkerrors.ErrInvalidChainID, "chain id cannot be blank")
}
if cs.Height <= 0 {

53
x/ibc/09-localhost/types/localhost.pb.go
View File

@ -66,9 +66,9 @@ var xxx_messageInfo_MsgCreateClient proto.InternalMessageInfo
// access to keys outside the client prefix.
type ClientState struct {
// client id
ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
// self chain ID
ChainID string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty" yaml:"chain_id"`
ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty" yaml:"chain_id"`
// self latest block height
Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
}
@ -114,7 +114,7 @@ func init() {
func init() { proto.RegisterFile("ibc/localhost/localhost.proto", fileDescriptor_6a04d924e6f8a88e) }
var fileDescriptor_6a04d924e6f8a88e = []byte{
// 305 bytes of a gzipped FileDescriptorProto
// 289 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcd, 0x4c, 0x4a, 0xd6,
0xcf, 0xc9, 0x4f, 0x4e, 0xcc, 0xc9, 0xc8, 0x2f, 0x2e, 0x41, 0xb0, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b,
0xf2, 0x85, 0x78, 0x33, 0x93, 0x92, 0xf5, 0xe0, 0x82, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60,
@ -124,16 +124,15 @@ var fileDescriptor_6a04d924e6f8a88e = []byte{
0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe4, 0xfc, 0xe2, 0xdc, 0xfc, 0x62,
0x28, 0xa5, 0x5b, 0x9c, 0x92, 0xad, 0x5f, 0x52, 0x59, 0x90, 0x5a, 0xac, 0xe7, 0x98, 0x9c, 0xec,
0x98, 0x92, 0x52, 0x94, 0x5a, 0x5c, 0x1c, 0x04, 0x35, 0xc0, 0x8a, 0xa5, 0x63, 0x81, 0x3c, 0x83,
0x52, 0x1d, 0x17, 0x37, 0xc4, 0xe8, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x31, 0x2e, 0xa6, 0xcc,
0x14, 0xb0, 0xd9, 0x9c, 0x4e, 0x6c, 0x8f, 0xee, 0xc9, 0x33, 0x79, 0xba, 0x04, 0x31, 0x65, 0xa6,
0x08, 0x59, 0x72, 0x71, 0x24, 0x67, 0x24, 0x66, 0xe6, 0xc5, 0x67, 0xa6, 0x48, 0x30, 0x81, 0x65,
0xe5, 0x1e, 0xdd, 0x93, 0x67, 0x77, 0x06, 0x89, 0x79, 0xba, 0x7c, 0xba, 0x27, 0xcf, 0x5f, 0x99,
0x98, 0x9b, 0x63, 0xa5, 0x04, 0x53, 0xa4, 0x14, 0xc4, 0x0e, 0x66, 0x7a, 0xa6, 0x08, 0x89, 0x71,
0xb1, 0x65, 0xa4, 0x66, 0xa6, 0x67, 0x94, 0x48, 0x30, 0x2b, 0x30, 0x6a, 0xb0, 0x04, 0x41, 0x79,
0x10, 0xfb, 0x9d, 0xfc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39,
0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x14,
0xaf, 0xb7, 0x2a, 0xf4, 0x41, 0x01, 0x6c, 0x60, 0xa9, 0x8b, 0x08, 0x63, 0xb0, 0x4f, 0x93, 0xd8,
0xc0, 0x61, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x15, 0x37, 0xf6, 0x9e, 0x81, 0x01, 0x00,
0x52, 0x36, 0x17, 0x37, 0xc4, 0xe8, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x3e, 0x2e, 0xa6, 0xcc,
0x14, 0xb0, 0xd9, 0x9c, 0x41, 0x4c, 0x99, 0x29, 0x42, 0x7a, 0x5c, 0x1c, 0xc9, 0x19, 0x89, 0x99,
0x79, 0xf1, 0x99, 0x29, 0x12, 0x4c, 0x20, 0x51, 0x27, 0xe1, 0x4f, 0xf7, 0xe4, 0xf9, 0x2b, 0x13,
0x73, 0x73, 0xac, 0x94, 0x60, 0x32, 0x4a, 0x41, 0xec, 0x60, 0xa6, 0x67, 0x8a, 0x90, 0x18, 0x17,
0x5b, 0x46, 0x6a, 0x66, 0x7a, 0x46, 0x89, 0x04, 0xb3, 0x02, 0xa3, 0x06, 0x4b, 0x10, 0x94, 0x07,
0xb1, 0xcc, 0xc9, 0xff, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63,
0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x4c, 0xf1,
0xfa, 0xa1, 0x42, 0x1f, 0x14, 0x9a, 0x06, 0x96, 0xba, 0x88, 0x00, 0x05, 0x7b, 0x2b, 0x89, 0x0d,
0x1c, 0x50, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x40, 0xad, 0xb8, 0x6e, 0x01, 0x00,
0x00,
}
@ -192,17 +191,17 @@ func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x18
}
if len(m.ChainID) > 0 {
i -= len(m.ChainID)
copy(dAtA[i:], m.ChainID)
i = encodeVarintLocalhost(dAtA, i, uint64(len(m.ChainID)))
if len(m.ChainId) > 0 {
i -= len(m.ChainId)
copy(dAtA[i:], m.ChainId)
i = encodeVarintLocalhost(dAtA, i, uint64(len(m.ChainId)))
i--
dAtA[i] = 0x12
}
if len(m.ID) > 0 {
i -= len(m.ID)
copy(dAtA[i:], m.ID)
i = encodeVarintLocalhost(dAtA, i, uint64(len(m.ID)))
if len(m.Id) > 0 {
i -= len(m.Id)
copy(dAtA[i:], m.Id)
i = encodeVarintLocalhost(dAtA, i, uint64(len(m.Id)))
i--
dAtA[i] = 0xa
}
@ -239,11 +238,11 @@ func (m *ClientState) Size() (n int) {
}
var l int
_ = l
l = len(m.ID)
l = len(m.Id)
if l > 0 {
n += 1 + l + sovLocalhost(uint64(l))
}
l = len(m.ChainID)
l = len(m.ChainId)
if l > 0 {
n += 1 + l + sovLocalhost(uint64(l))
}
@ -377,7 +376,7 @@ func (m *ClientState) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -405,11 +404,11 @@ func (m *ClientState) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ID = string(dAtA[iNdEx:postIndex])
m.Id = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ChainID", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@ -437,7 +436,7 @@ func (m *ClientState) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ChainID = string(dAtA[iNdEx:postIndex])
m.ChainId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
if wireType != 0 {

24
x/ibc/handler.go
View File

@ -44,7 +44,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
// IBC channel msgs
case *channeltypes.MsgChannelOpenInit:
// Lookup module by port capability
module, portCap, err := k.PortKeeper.LookupModuleByPort(ctx, msg.PortID)
module, portCap, err := k.PortKeeper.LookupModuleByPort(ctx, msg.PortId)
if err != nil {
return nil, sdkerrors.Wrap(err, "could not retrieve module from port-id")
}
@ -60,7 +60,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
if err = cbs.OnChanOpenInit(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID, cap, msg.Channel.Counterparty, msg.Channel.Version); err != nil {
if err = cbs.OnChanOpenInit(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortId, msg.ChannelId, cap, msg.Channel.Counterparty, msg.Channel.Version); err != nil {
return nil, sdkerrors.Wrap(err, "channel open init callback failed")
}
@ -68,7 +68,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
case *channeltypes.MsgChannelOpenTry:
// Lookup module by port capability
module, portCap, err := k.PortKeeper.LookupModuleByPort(ctx, msg.PortID)
module, portCap, err := k.PortKeeper.LookupModuleByPort(ctx, msg.PortId)
if err != nil {
return nil, sdkerrors.Wrap(err, "could not retrieve module from port-id")
}
@ -84,7 +84,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
if err = cbs.OnChanOpenTry(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortID, msg.ChannelID, cap, msg.Channel.Counterparty, msg.Channel.Version, msg.CounterpartyVersion); err != nil {
if err = cbs.OnChanOpenTry(ctx, msg.Channel.Ordering, msg.Channel.ConnectionHops, msg.PortId, msg.ChannelId, cap, msg.Channel.Counterparty, msg.Channel.Version, msg.CounterpartyVersion); err != nil {
return nil, sdkerrors.Wrap(err, "channel open try callback failed")
}
@ -92,7 +92,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
case *channeltypes.MsgChannelOpenAck:
// Lookup module by channel capability
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortID, msg.ChannelID)
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortId, msg.ChannelId)
if err != nil {
return nil, sdkerrors.Wrap(err, "could not retrieve module from port-id")
}
@ -103,7 +103,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
if err = cbs.OnChanOpenAck(ctx, msg.PortID, msg.ChannelID, msg.CounterpartyVersion); err != nil {
if err = cbs.OnChanOpenAck(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyVersion); err != nil {
return nil, sdkerrors.Wrap(err, "channel open ack callback failed")
}
@ -111,7 +111,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
case *channeltypes.MsgChannelOpenConfirm:
// Lookup module by channel capability
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortID, msg.ChannelID)
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortId, msg.ChannelId)
if err != nil {
return nil, sdkerrors.Wrap(err, "could not retrieve module from port-id")
}
@ -122,7 +122,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
if err = cbs.OnChanOpenConfirm(ctx, msg.PortID, msg.ChannelID); err != nil {
if err = cbs.OnChanOpenConfirm(ctx, msg.PortId, msg.ChannelId); err != nil {
return nil, sdkerrors.Wrap(err, "channel open confirm callback failed")
}
@ -130,7 +130,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
case *channeltypes.MsgChannelCloseInit:
// Lookup module by channel capability
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortID, msg.ChannelID)
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortId, msg.ChannelId)
if err != nil {
return nil, sdkerrors.Wrap(err, "could not retrieve module from port-id")
}
@ -141,7 +141,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
if err = cbs.OnChanCloseInit(ctx, msg.PortID, msg.ChannelID); err != nil {
if err = cbs.OnChanCloseInit(ctx, msg.PortId, msg.ChannelId); err != nil {
return nil, sdkerrors.Wrap(err, "channel close init callback failed")
}
@ -149,7 +149,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
case *channeltypes.MsgChannelCloseConfirm:
// Lookup module by channel capability
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortID, msg.ChannelID)
module, cap, err := k.ChannelKeeper.LookupModuleByChannel(ctx, msg.PortId, msg.ChannelId)
if err != nil {
return nil, sdkerrors.Wrap(err, "could not retrieve module from port-id")
}
@ -160,7 +160,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
return nil, sdkerrors.Wrapf(porttypes.ErrInvalidRoute, "route not found to module: %s", module)
}
if err = cbs.OnChanCloseConfirm(ctx, msg.PortID, msg.ChannelID); err != nil {
if err = cbs.OnChanCloseConfirm(ctx, msg.PortId, msg.ChannelId); err != nil {
return nil, sdkerrors.Wrap(err, "channel close confirm callback failed")
}

2
x/ibc/simulation/decoder_test.go
View File

@ -28,7 +28,7 @@ func TestDecodeStore(t *testing.T) {
FrozenHeight: 10,
}
connection := connectiontypes.ConnectionEnd{
ClientID: "clientidone",
ClientId: "clientidone",
Versions: []string{"1.0"},
}
channel := channeltypes.Channel{

Some files were not shown because too many files have changed in this diff Show More