From 794c350f515c41682fe766268ab700fc7d9f3853 Mon Sep 17 00:00:00 2001 From: Snobbish Bee <125891987+snobbee@users.noreply.github.com> Date: Wed, 8 Nov 2023 11:47:40 +0100 Subject: [PATCH 1/2] fix: use ibc-go v4.5.1-apply-4992 --- go.mod | 1 + go.sum | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f6bdb18bb6..b090cfb7bd 100644 --- a/go.mod +++ b/go.mod @@ -171,6 +171,7 @@ require ( replace ( github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 + github.com/cosmos/ibc-go/v4 => github.com/Sifchain/ibc-go/v4 v4.5.1-apply-4992 github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/libp2p/go-buffer-pool => github.com/libp2p/go-buffer-pool v0.1.0 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/go.sum b/go.sum index 2cde199944..91cc33231e 100644 --- a/go.sum +++ b/go.sum @@ -87,6 +87,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/Sifchain/ibc-go/v4 v4.5.1-apply-4992 h1:r0R8qktKmfy2hzVlBBqLWPoDut+Qy7yKt2Cb2HqkuWQ= +github.com/Sifchain/ibc-go/v4 v4.5.1-apply-4992/go.mod h1:2EOi40Bx/j6rJrtP1ui8k8yUAMpGybmL1EjakYqYv5U= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= @@ -244,8 +246,6 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= github.com/cosmos/iavl v0.19.5/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v4 v4.5.1 h1:+P73X7aIikGAXBUJ9vP9rEbvdSuekt3KGXmAWCSYets= -github.com/cosmos/ibc-go/v4 v4.5.1/go.mod h1:2EOi40Bx/j6rJrtP1ui8k8yUAMpGybmL1EjakYqYv5U= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= From cc1df887560aff8611efdcfd044f319498bac9cf Mon Sep 17 00:00:00 2001 From: Snobbish Bee <125891987+snobbee@users.noreply.github.com> Date: Wed, 8 Nov 2023 11:55:00 +0100 Subject: [PATCH 2/2] test: fix test and linter --- x/ibctransfer/keeper/msg_server_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/x/ibctransfer/keeper/msg_server_test.go b/x/ibctransfer/keeper/msg_server_test.go index aed15734f2..2f65e740b3 100644 --- a/x/ibctransfer/keeper/msg_server_test.go +++ b/x/ibctransfer/keeper/msg_server_test.go @@ -69,6 +69,7 @@ func TestMsgServer_Transfer(t *testing.T) { addrs[1].String(), clienttypes.NewHeight(0, 0), 0, + "", ), setupMsgServerCalls: func() { msgSrv.EXPECT().Transfer(gomock.Any(), &sdktransfertypes.MsgTransfer{ @@ -96,6 +97,7 @@ func TestMsgServer_Transfer(t *testing.T) { addrs[1].String(), clienttypes.NewHeight(0, 0), 0, + "", ), setupBankKeeperCalls: func() {}, setupMsgServerCalls: func() {}, @@ -113,6 +115,7 @@ func TestMsgServer_Transfer(t *testing.T) { addrs[1].String(), clienttypes.NewHeight(0, 0), 0, + "", ), setupBankKeeperCalls: func() {}, setupMsgServerCalls: func() {}, @@ -130,6 +133,7 @@ func TestMsgServer_Transfer(t *testing.T) { addrs[1].String(), clienttypes.NewHeight(0, 0), 0, + "", ), setupBankKeeperCalls: func() {}, setupMsgServerCalls: func() {},