Push master @jackzampolin: goz-phase-2 update

go.mod

@@ -7,8 +7,8 @@ require (
 	github.com/avast/retry-go v2.6.0+incompatible
 	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
 	github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
-	github.com/cosmos/cosmos-sdk v0.34.4-0.20200511222341-80be50319ca5
-	github.com/cosmos/gaia v0.0.1-0.20200511233019-cbc33219c3d9
+	github.com/cosmos/cosmos-sdk v0.34.4-0.20200522204605-4a07d536a7cc
+	github.com/cosmos/gaia v0.0.1-0.20200522222820-2d61264338e5
 	github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d
 	github.com/gorilla/mux v1.7.4
 	github.com/ory/dockertest/v3 v3.5.5

go.sum

@@ -113,8 +113,12 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cosmos/cosmos-sdk v0.34.4-0.20200511222341-80be50319ca5 h1:pUNa8VBC8SBptZTiGSFlZx89JynTZ4+yfUCR6VGMMkw=
 github.com/cosmos/cosmos-sdk v0.34.4-0.20200511222341-80be50319ca5/go.mod h1:T3u1b0ahtqJpdI2Fk6JcmntR7/YLjMq+J6hZrHPZTzc=
+github.com/cosmos/cosmos-sdk v0.34.4-0.20200522204605-4a07d536a7cc h1:FokA8APz+KqRsnHoAyjorOSldkM6i1Q3r+eZAxcqd/k=
+github.com/cosmos/cosmos-sdk v0.34.4-0.20200522204605-4a07d536a7cc/go.mod h1:T3u1b0ahtqJpdI2Fk6JcmntR7/YLjMq+J6hZrHPZTzc=
 github.com/cosmos/gaia v0.0.1-0.20200511233019-cbc33219c3d9 h1:/JO2pguVvnhiDzkfAREVOKn2IQHQmzMuNUJoYfp/rds=
 github.com/cosmos/gaia v0.0.1-0.20200511233019-cbc33219c3d9/go.mod h1:GegY2vcug/cfD1e/zokaZQYAXkp6vBRC9BwOM5Je5sA=
+github.com/cosmos/gaia v0.0.1-0.20200522222820-2d61264338e5 h1:lU62dQpOUsUdCDBvyEDbJa6AoTKaBAeQv2rNDEj3X4E=
+github.com/cosmos/gaia v0.0.1-0.20200522222820-2d61264338e5/go.mod h1:t9kAXxZ0N4hj0Pcg6T+Ogw2a6ncz3M+9R+FL24ripSg=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU=
 github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
 github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=

relayer/ics24.go

@@ -9,22 +9,22 @@ import (
 
 // Vclient validates the client identifer in the path
 func (p *PathEnd) Vclient() error {
-	return host.DefaultClientIdentifierValidator(p.ClientID)
+	return host.ClientIdentifierValidator(p.ClientID)
 }
 
 // Vconn validates the connection identifer in the path
 func (p *PathEnd) Vconn() error {
-	return host.DefaultConnectionIdentifierValidator(p.ConnectionID)
+	return host.ConnectionIdentifierValidator(p.ConnectionID)
 }
 
 // Vchan validates the channel identifer in the path
 func (p *PathEnd) Vchan() error {
-	return host.DefaultChannelIdentifierValidator(p.ChannelID)
+	return host.ChannelIdentifierValidator(p.ChannelID)
 }
 
 // Vport validates the port identifer in the path
 func (p *PathEnd) Vport() error {
-	return host.DefaultPortIdentifierValidator(p.PortID)
+	return host.PortIdentifierValidator(p.PortID)
 }
 
 func (p PathEnd) String() string {

scripts/three-chainz

@@ -9,7 +9,7 @@ if [[ ! -d $GOPATH ]] || [[ ! -d $GOBIN ]] || [[ ! -x "$(which go)" ]]; then
 fi
 
 GAIA_REPO="$GOPATH/src/github.com/cosmos/gaia"
-GAIA_BRANCH=master
+GAIA_BRANCH=goz-phase-2
 GAIA_DATA="$(pwd)/data"
 
 # ARGS: 

scripts/two-chainz

@@ -9,7 +9,7 @@ if [[ ! -d $GOPATH ]] || [[ ! -d $GOBIN ]] || [[ ! -x "$(which go)" ]]; then
 fi
 
 GAIA_REPO="$GOPATH/src/github.com/cosmos/gaia"
-GAIA_BRANCH=master
+GAIA_BRANCH=goz-phase-2
 GAIA_DATA="$(pwd)/data"
 
 # ARGS: 

test/test_chains.go

@@ -24,7 +24,7 @@ var (
 		cdc:            cdc,
 		amino:          amino,
 		dockerImage:    "jackzampolin/gaiatest",
-		dockerTag:      "cbc3321",
+		dockerTag:      "2d61264",
 		timeout:        3 * time.Second,
 		rpcPort:        "26657",
 		accountPrefix:  "cosmos",