ICS 03 upstream changes

store/state/mapping.go

@@ -101,4 +101,3 @@ func (m Mapping) Prefix(prefix []byte) Mapping {
 		prefix:   join(m.prefix, prefix),
 	}
 }
-

x/ibc/03-connection/cli.go

@@ -7,55 +7,63 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/merkle"
 )
 
-func (man Manager) CLIObject(connid, clientid string) Object {
-	obj := man.Object(connid)
-	obj.Client = man.client.Object(clientid)
+func (man Manager) CLIState(connid, clientid string) State {
+	obj := man.State(connid)
+	obj.Client = man.client.State(clientid)
 	return obj
 }
 
-func (obj Object) prefix() []byte {
+func (man Manager) CLIQuery(q state.ABCIQuerier, connid string) (State, error) {
+	obj := man.State(connid)
+	conn, _, err := obj.ConnectionCLI(q)
+	if err != nil {
+		return State{}, err
+	}
+	obj.Client = man.client.State(conn.Client)
+	return obj, nil
+}
+
+func (obj State) prefix() []byte {
 	return bytes.Split(obj.Connection.KeyBytes(), LocalRoot())[0]
 }
 
-func (obj Object) ConnectionCLI(q state.ABCIQuerier) (res Connection, proof merkle.Proof, err error) {
+func (obj State) ConnectionCLI(q state.ABCIQuerier) (res Connection, proof merkle.Proof, err error) {
 	tmproof, err := obj.Connection.Query(q, &res)
 	proof = merkle.NewProofFromValue(tmproof, obj.prefix(), obj.Connection)
 	return
 }
 
-func (obj Object) AvailableCLI(q state.ABCIQuerier) (res bool, proof merkle.Proof, err error) {
+func (obj State) AvailableCLI(q state.ABCIQuerier) (res bool, proof merkle.Proof, err error) {
 	res, tmproof, err := obj.Available.Query(q)
 	proof = merkle.NewProofFromValue(tmproof, obj.prefix(), obj.Available)
 	return
 }
 
-func (obj Object) KindCLI(q state.ABCIQuerier) (res string, proof merkle.Proof, err error) {
+func (obj State) KindCLI(q state.ABCIQuerier) (res string, proof merkle.Proof, err error) {
 	res, tmproof, err := obj.Kind.Query(q)
 	proof = merkle.NewProofFromValue(tmproof, obj.prefix(), obj.Kind)
 	return
 }
 
-func (man Handshaker) CLIObject(connid, clientid string) HandshakeObject {
-	return man.Object(man.man.CLIObject(connid, clientid))
+func (man Handshaker) CLIState(connid, clientid string) HandshakeState {
+	return man.CreateState(man.man.CLIState(connid, clientid))
 }
 
-func (man Handshaker) CLIQuery(q state.ABCIQuerier, connid string) (HandshakeObject, error) {
-	obj := man.man.Object(connid)
-	conn, _, err := obj.ConnectionCLI(q)
+func (man Handshaker) CLIQuery(q state.ABCIQuerier, connid string) (HandshakeState, error) {
+	state, err := man.man.CLIQuery(q, connid)
 	if err != nil {
-		return HandshakeObject{}, err
+		return HandshakeState{}, err
 	}
-	obj.Client = man.man.client.Object(conn.Client)
-	return man.Object(obj), nil
+	return man.CreateState(state), nil
 }
 
-func (obj HandshakeObject) StateCLI(q state.ABCIQuerier) (res byte, proof merkle.Proof, err error) {
-	res, tmproof, err := obj.State.Query(q)
-	proof = merkle.NewProofFromValue(tmproof, obj.prefix(), obj.State)
+func (obj HandshakeState) StageCLI(q state.ABCIQuerier) (res byte, proof merkle.Proof, err error) {
+	res, tmproof, err := obj.Stage.Query(q)
+	proof = merkle.NewProofFromValue(tmproof, obj.prefix(), obj.Stage)
 	return
 }
 
-func (obj HandshakeObject) CounterpartyClientCLI(q state.ABCIQuerier) (res string, proof merkle.Proof, err error) {
+func (obj HandshakeState) CounterpartyClientCLI(q state.ABCIQuerier) (res string, proof merkle.Proof, err error) {
 	res, tmproof, err := obj.CounterpartyClient.Query(q)
 	proof = merkle.NewProofFromValue(tmproof, obj.prefix(), obj.CounterpartyClient)
 	return

x/ibc/03-connection/client/cli/query.go

@@ -12,21 +12,21 @@ import (
 	"github.com/cosmos/cosmos-sdk/store/state"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cosmos/cosmos-sdk/x/ibc"
 	client "github.com/cosmos/cosmos-sdk/x/ibc/02-client"
 	connection "github.com/cosmos/cosmos-sdk/x/ibc/03-connection"
 	"github.com/cosmos/cosmos-sdk/x/ibc/03-connection/client/utils"
+	"github.com/cosmos/cosmos-sdk/x/ibc/version"
 )
 
 const (
 	FlagProve = "prove"
 )
 
-func object(cdc *codec.Codec, storeKey string, prefix []byte, connid, clientid string) connection.Object {
+func object(cdc *codec.Codec, storeKey string, prefix []byte, connid, clientid string) connection.State {
 	base := state.NewMapping(sdk.NewKVStoreKey(storeKey), cdc, prefix)
 	climan := client.NewManager(base)
 	man := connection.NewManager(base, climan)
-	return man.CLIObject(connid, clientid)
+	return man.CLIState(connid, clientid)
 }
 
 func GetQueryCmd(storeKey string, cdc *codec.Codec) *cobra.Command {
@@ -43,7 +43,7 @@ func GetQueryCmd(storeKey string, cdc *codec.Codec) *cobra.Command {
 	return ibcQueryCmd
 }
 
-func QueryConnection(ctx context.CLIContext, obj connection.Object, prove bool) (res utils.JSONObject, err error) {
+func QueryConnection(ctx context.CLIContext, obj connection.State, prove bool) (res utils.JSONState, err error) {
 	q := state.NewCLIQuerier(ctx)
 
 	conn, connp, err := obj.ConnectionCLI(q)
@@ -60,14 +60,14 @@ func QueryConnection(ctx context.CLIContext, obj connection.Object, prove bool)
 	}
 
 	if prove {
-		return utils.NewJSONObject(
+		return utils.NewJSONState(
 			conn, connp,
 			avail, availp,
 			kind, kindp,
 		), nil
 	}
 
-	return utils.NewJSONObject(
+	return utils.NewJSONState(
 		conn, nil,
 		avail, nil,
 		kind, nil,
@@ -81,7 +81,7 @@ func GetCmdQueryConnection(storeKey string, cdc *codec.Codec) *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.NewCLIContext().WithCodec(cdc)
-			obj := object(cdc, storeKey, ibc.VersionPrefix(ibc.Version), args[0], "")
+			obj := object(cdc, storeKey, version.Prefix(version.Version), args[0], "")
 			jsonobj, err := QueryConnection(ctx, obj, viper.GetBool(FlagProve))
 			if err != nil {
 				return err