08-wasm: pin ibc-go v7.3 (#5391)

* pin ibc-go v7.3

* go mod tidy

* add generate string function that is not available in ibc-go v7.3

* another mock key path and height

* mock fixes

Author: crodriguezvega

modules/light-clients/08-wasm/go.mod

@@ -2,8 +2,6 @@ module github.com/cosmos/ibc-go/modules/light-clients/08-wasm
 
 go 1.21
 
-replace github.com/cosmos/ibc-go/v7 => ../../../
-
 replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 
 require (

modules/light-clients/08-wasm/go.sum

@@ -346,6 +346,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK
 github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
 github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg=
 github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
+github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw=
+github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ=
 github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
 github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
 github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw=

modules/light-clients/08-wasm/keeper/msg_server_test.go

@@ -69,7 +69,7 @@ func (suite *KeeperTestSuite) TestMsgStoreCode() {
 		{
 			"fails with wasm code too large",
 			func() {
-				msg = types.NewMsgStoreCode(signer, wasmtesting.CreateMockContract([]byte(ibctesting.GenerateString(uint(types.MaxWasmByteSize())))))
+				msg = types.NewMsgStoreCode(signer, wasmtesting.CreateMockContract([]byte(wasmtesting.GenerateString(uint(types.MaxWasmByteSize())))))
 			},
 			types.ErrWasmCodeTooLarge,
 		},

modules/light-clients/08-wasm/testing/mock/mock.go

@@ -0,0 +1,27 @@
+package mock
+
+import (
+	"github.com/cosmos/ibc-go/v7/modules/core/exported"
+)
+
+var _ exported.Path = KeyPath{}
+
+// KeyPath defines a placeholder struct which implements the exported.Path interface
+type KeyPath struct{}
+
+// String implements the exported.Path interface
+func (KeyPath) String() string {
+	return ""
+}
+
+// Empty implements the exported.Path interface
+func (KeyPath) Empty() bool {
+	return false
+}
+
+var _ exported.Height = Height{}
+
+// Height defines a placeholder struct which implements the exported.Height interface
+type Height struct {
+	exported.Height
+}

modules/light-clients/08-wasm/testing/utils.go

@@ -0,0 +1,14 @@
+package testing
+
+import (
+	"math/rand"
+)
+
+// GenerateString generates a random string of the given length in bytes
+func GenerateString(length uint) string {
+	bytes := make([]byte, length)
+	for i := range bytes {
+		bytes[i] = charset[rand.Intn(len(charset))]
+	}
+	return string(bytes)
+}

modules/light-clients/08-wasm/testing/values.go

@@ -30,6 +30,9 @@ var (
 
 	ErrMockContract = errors.New("mock contract error")
 	ErrMockVM       = errors.New("mock vm error")
+
+	// character set used for generating a random string in GenerateString
+	charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 )
 
 // CreateMockTendermintClientState returns a valid Tendermint client state for use in tests.

modules/light-clients/08-wasm/types/client_state_test.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm"
 	wasmtesting "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/testing"
+	mock "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/testing/mock"
 	"github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"
 	clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
 	commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types"
@@ -19,7 +20,6 @@ import (
 	"github.com/cosmos/ibc-go/v7/modules/core/exported"
 	solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
 	ibctesting "github.com/cosmos/ibc-go/v7/testing"
-	ibcmock "github.com/cosmos/ibc-go/v7/testing/mock"
 )
 
 func (suite *TypesTestSuite) TestStatus() {
@@ -137,7 +137,7 @@ func (suite *TypesTestSuite) TestGetTimestampAtHeight() {
 		{
 			"error: invalid height",
 			func() {
-				height = ibcmock.Height{}
+				height = mock.Height{}
 			},
 			ibcerrors.ErrInvalidType,
 		},
@@ -438,14 +438,14 @@ func (suite *TypesTestSuite) TestVerifyMembership() {
 		{
 			"invalid path argument",
 			func() {
-				path = ibcmock.KeyPath{}
+				path = mock.KeyPath{}
 			},
 			ibcerrors.ErrInvalidType,
 		},
 		{
 			"proof height is invalid type",
 			func() {
-				proofHeight = ibcmock.Height{}
+				proofHeight = mock.Height{}
 			},
 			ibcerrors.ErrInvalidType,
 		},
@@ -579,14 +579,14 @@ func (suite *TypesTestSuite) TestVerifyNonMembership() {
 		{
 			"invalid path argument",
 			func() {
-				path = ibcmock.KeyPath{}
+				path = mock.KeyPath{}
 			},
 			ibcerrors.ErrInvalidType,
 		},
 		{
 			"proof height is invalid type",
 			func() {
-				proofHeight = ibcmock.Height{}
+				proofHeight = mock.Height{}
 			},
 			ibcerrors.ErrInvalidType,
 		},