From 004dc57e8b77aef1abda51e10c28e5fee101f4b9 Mon Sep 17 00:00:00 2001 From: Vlad Date: Wed, 26 Feb 2025 16:54:58 -0500 Subject: [PATCH] regenerate mocks and fix gomock types --- middleware/packet-forward-middleware/go.mod | 1 - middleware/packet-forward-middleware/go.sum | 2 -- .../migrations/v3/migrate_test.go | 2 +- .../packetforward/module_test.go | 2 +- .../test/mock/ibc_module.go | 22 +++++++++---------- .../test/mock/ics4_wrapper.go | 9 ++++---- .../packet-forward-middleware/test/setup.go | 2 +- 7 files changed, 17 insertions(+), 23 deletions(-) diff --git a/middleware/packet-forward-middleware/go.mod b/middleware/packet-forward-middleware/go.mod index 1ccc6d7b..2efcc78e 100644 --- a/middleware/packet-forward-middleware/go.mod +++ b/middleware/packet-forward-middleware/go.mod @@ -30,7 +30,6 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - go.uber.org/mock v0.4.0 ) require ( diff --git a/middleware/packet-forward-middleware/go.sum b/middleware/packet-forward-middleware/go.sum index 6a3544a3..a4614ff2 100644 --- a/middleware/packet-forward-middleware/go.sum +++ b/middleware/packet-forward-middleware/go.sum @@ -1053,8 +1053,6 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= -go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/middleware/packet-forward-middleware/packetforward/migrations/v3/migrate_test.go b/middleware/packet-forward-middleware/packetforward/migrations/v3/migrate_test.go index 6fcce988..5c168c8a 100644 --- a/middleware/packet-forward-middleware/packetforward/migrations/v3/migrate_test.go +++ b/middleware/packet-forward-middleware/packetforward/migrations/v3/migrate_test.go @@ -1,6 +1,7 @@ package v3_test import ( + "github.com/golang/mock/gomock" "testing" "cosmossdk.io/log" @@ -11,7 +12,6 @@ import ( transfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" "github.com/stretchr/testify/require" - "go.uber.org/mock/gomock" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" diff --git a/middleware/packet-forward-middleware/packetforward/module_test.go b/middleware/packet-forward-middleware/packetforward/module_test.go index 1c5d697e..b75ab40c 100644 --- a/middleware/packet-forward-middleware/packetforward/module_test.go +++ b/middleware/packet-forward-middleware/packetforward/module_test.go @@ -3,6 +3,7 @@ package packetforward_test import ( "encoding/json" "fmt" + "github.com/golang/mock/gomock" "testing" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v9/packetforward/keeper" @@ -10,7 +11,6 @@ import ( "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v9/test" "github.com/iancoleman/orderedmap" "github.com/stretchr/testify/require" - "go.uber.org/mock/gomock" sdkmath "cosmossdk.io/math" diff --git a/middleware/packet-forward-middleware/test/mock/ibc_module.go b/middleware/packet-forward-middleware/test/mock/ibc_module.go index 2c1df048..54aafc1b 100644 --- a/middleware/packet-forward-middleware/test/mock/ibc_module.go +++ b/middleware/packet-forward-middleware/test/mock/ibc_module.go @@ -1,11 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/cosmos/ibc-go/v10/modules/core/05-port/types (interfaces: IBCModule) -// // Generated by this command: // // mockgen -package=mock -destination=./test/mock/ibc_module.go github.com/cosmos/ibc-go/v10/modules/core/05-port/types IBCModule // - // Package mock is a generated GoMock package. package mock @@ -15,7 +13,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/ibc-go/v10/modules/core/04-channel/types" exported "github.com/cosmos/ibc-go/v10/modules/core/exported" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // MockIBCModule is a mock of IBCModule interface. @@ -50,7 +48,7 @@ func (m *MockIBCModule) OnAcknowledgementPacket(arg0 types.Context, arg1 string, } // OnAcknowledgementPacket indicates an expected call of OnAcknowledgementPacket. -func (mr *MockIBCModuleMockRecorder) OnAcknowledgementPacket(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnAcknowledgementPacket(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnAcknowledgementPacket", reflect.TypeOf((*MockIBCModule)(nil).OnAcknowledgementPacket), arg0, arg1, arg2, arg3, arg4) } @@ -64,7 +62,7 @@ func (m *MockIBCModule) OnChanCloseConfirm(arg0 types.Context, arg1, arg2 string } // OnChanCloseConfirm indicates an expected call of OnChanCloseConfirm. -func (mr *MockIBCModuleMockRecorder) OnChanCloseConfirm(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanCloseConfirm(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanCloseConfirm", reflect.TypeOf((*MockIBCModule)(nil).OnChanCloseConfirm), arg0, arg1, arg2) } @@ -78,7 +76,7 @@ func (m *MockIBCModule) OnChanCloseInit(arg0 types.Context, arg1, arg2 string) e } // OnChanCloseInit indicates an expected call of OnChanCloseInit. -func (mr *MockIBCModuleMockRecorder) OnChanCloseInit(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanCloseInit(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanCloseInit", reflect.TypeOf((*MockIBCModule)(nil).OnChanCloseInit), arg0, arg1, arg2) } @@ -92,7 +90,7 @@ func (m *MockIBCModule) OnChanOpenAck(arg0 types.Context, arg1, arg2, arg3, arg4 } // OnChanOpenAck indicates an expected call of OnChanOpenAck. -func (mr *MockIBCModuleMockRecorder) OnChanOpenAck(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenAck(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenAck", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenAck), arg0, arg1, arg2, arg3, arg4) } @@ -106,7 +104,7 @@ func (m *MockIBCModule) OnChanOpenConfirm(arg0 types.Context, arg1, arg2 string) } // OnChanOpenConfirm indicates an expected call of OnChanOpenConfirm. -func (mr *MockIBCModuleMockRecorder) OnChanOpenConfirm(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenConfirm(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenConfirm", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenConfirm), arg0, arg1, arg2) } @@ -121,7 +119,7 @@ func (m *MockIBCModule) OnChanOpenInit(arg0 types.Context, arg1 types0.Order, ar } // OnChanOpenInit indicates an expected call of OnChanOpenInit. -func (mr *MockIBCModuleMockRecorder) OnChanOpenInit(arg0, arg1, arg2, arg3, arg4, arg5, arg6 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenInit(arg0, arg1, arg2, arg3, arg4, arg5, arg6 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenInit", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenInit), arg0, arg1, arg2, arg3, arg4, arg5, arg6) } @@ -136,7 +134,7 @@ func (m *MockIBCModule) OnChanOpenTry(arg0 types.Context, arg1 types0.Order, arg } // OnChanOpenTry indicates an expected call of OnChanOpenTry. -func (mr *MockIBCModuleMockRecorder) OnChanOpenTry(arg0, arg1, arg2, arg3, arg4, arg5, arg6 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnChanOpenTry(arg0, arg1, arg2, arg3, arg4, arg5, arg6 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChanOpenTry", reflect.TypeOf((*MockIBCModule)(nil).OnChanOpenTry), arg0, arg1, arg2, arg3, arg4, arg5, arg6) } @@ -150,7 +148,7 @@ func (m *MockIBCModule) OnRecvPacket(arg0 types.Context, arg1 string, arg2 types } // OnRecvPacket indicates an expected call of OnRecvPacket. -func (mr *MockIBCModuleMockRecorder) OnRecvPacket(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnRecvPacket(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnRecvPacket", reflect.TypeOf((*MockIBCModule)(nil).OnRecvPacket), arg0, arg1, arg2, arg3) } @@ -164,7 +162,7 @@ func (m *MockIBCModule) OnTimeoutPacket(arg0 types.Context, arg1 string, arg2 ty } // OnTimeoutPacket indicates an expected call of OnTimeoutPacket. -func (mr *MockIBCModuleMockRecorder) OnTimeoutPacket(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockIBCModuleMockRecorder) OnTimeoutPacket(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnTimeoutPacket", reflect.TypeOf((*MockIBCModule)(nil).OnTimeoutPacket), arg0, arg1, arg2, arg3) } diff --git a/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go b/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go index 0320dfab..a2f028e4 100644 --- a/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go +++ b/middleware/packet-forward-middleware/test/mock/ics4_wrapper.go @@ -5,7 +5,6 @@ // // mockgen -package=mock -destination=./test/mock/ics4_wrapper.go github.com/cosmos/ibc-go/v10/modules/core/05-port/types ICS4Wrapper // - // Package mock is a generated GoMock package. package mock @@ -15,7 +14,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" types0 "github.com/cosmos/ibc-go/v10/modules/core/02-client/types" exported "github.com/cosmos/ibc-go/v10/modules/core/exported" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // MockICS4Wrapper is a mock of ICS4Wrapper interface. @@ -51,7 +50,7 @@ func (m *MockICS4Wrapper) GetAppVersion(arg0 types.Context, arg1, arg2 string) ( } // GetAppVersion indicates an expected call of GetAppVersion. -func (mr *MockICS4WrapperMockRecorder) GetAppVersion(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockICS4WrapperMockRecorder) GetAppVersion(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAppVersion", reflect.TypeOf((*MockICS4Wrapper)(nil).GetAppVersion), arg0, arg1, arg2) } @@ -66,7 +65,7 @@ func (m *MockICS4Wrapper) SendPacket(arg0 types.Context, arg1, arg2 string, arg3 } // SendPacket indicates an expected call of SendPacket. -func (mr *MockICS4WrapperMockRecorder) SendPacket(arg0, arg1, arg2, arg3, arg4, arg5 any) *gomock.Call { +func (mr *MockICS4WrapperMockRecorder) SendPacket(arg0, arg1, arg2, arg3, arg4, arg5 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SendPacket", reflect.TypeOf((*MockICS4Wrapper)(nil).SendPacket), arg0, arg1, arg2, arg3, arg4, arg5) } @@ -80,7 +79,7 @@ func (m *MockICS4Wrapper) WriteAcknowledgement(arg0 types.Context, arg1 exported } // WriteAcknowledgement indicates an expected call of WriteAcknowledgement. -func (mr *MockICS4WrapperMockRecorder) WriteAcknowledgement(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockICS4WrapperMockRecorder) WriteAcknowledgement(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WriteAcknowledgement", reflect.TypeOf((*MockICS4Wrapper)(nil).WriteAcknowledgement), arg0, arg1, arg2) } diff --git a/middleware/packet-forward-middleware/test/setup.go b/middleware/packet-forward-middleware/test/setup.go index 5221dc9d..fe394dcc 100644 --- a/middleware/packet-forward-middleware/test/setup.go +++ b/middleware/packet-forward-middleware/test/setup.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v9/packetforward/keeper" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v9/packetforward/types" "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v9/test/mock" + "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "go.uber.org/mock/gomock" "cosmossdk.io/log" "cosmossdk.io/store"