From 3a409f99fc44ead03d4b7dc5bd8c209a5e72feb5 Mon Sep 17 00:00:00 2001 From: Sammy Liu Date: Wed, 1 Nov 2023 13:29:15 -0400 Subject: [PATCH] Revert "Revert "rename the new methods"" This reverts commit 4e257dd35871e8a387c2b678320f9a9d8d2163fe. --- x/axelarnet/handler.go | 2 +- x/axelarnet/keeper/msg_server.go | 4 +- x/axelarnet/keeper/msg_server_test.go | 6 +- x/axelarnet/message_handler.go | 4 +- x/axelarnet/message_handler_test.go | 6 +- x/axelarnet/types/expected_keepers.go | 4 +- x/axelarnet/types/mock/expected_keepers.go | 84 ++++++++++----------- x/evm/abci.go | 2 +- x/evm/abci_test.go | 4 +- x/evm/types/expected_keepers.go | 2 +- x/evm/types/mock/expected_keepers.go | 42 +++++------ x/nexus/keeper/general_message.go | 8 +- x/nexus/keeper/general_message_test.go | 88 +++++++++++----------- x/nexus/keeper/grpc_query_test.go | 2 +- x/nexus/keeper/msg_dispatcher.go | 4 +- x/nexus/keeper/msg_dispatcher_test.go | 28 +++---- x/nexus/types/expected_keepers.go | 4 +- x/nexus/types/mock/expected_keepers.go | 84 ++++++++++----------- 18 files changed, 189 insertions(+), 189 deletions(-) diff --git a/x/axelarnet/handler.go b/x/axelarnet/handler.go index d055f18fa..73a585c91 100644 --- a/x/axelarnet/handler.go +++ b/x/axelarnet/handler.go @@ -123,7 +123,7 @@ func NewProposalHandler(k keeper.Keeper, nexusK types.Nexus, accountK types.Acco Payload: contractCall.Payload, }) - if err := nexusK.SetNewMessage_(ctx, msg); err != nil { + if err := nexusK.SetNewMessage(ctx, msg); err != nil { return sdkerrors.Wrap(err, "failed to add general message") } diff --git a/x/axelarnet/keeper/msg_server.go b/x/axelarnet/keeper/msg_server.go index 8cb0fce79..a9a1f3ba2 100644 --- a/x/axelarnet/keeper/msg_server.go +++ b/x/axelarnet/keeper/msg_server.go @@ -111,7 +111,7 @@ func (s msgServer) CallContract(c context.Context, req *types.CallContractReques events.Emit(ctx, &feePaidEvent) } - if err := s.nexus.SetNewMessage_(ctx, msg); err != nil { + if err := s.nexus.SetNewMessage(ctx, msg); err != nil { return nil, sdkerrors.Wrap(err, "failed to add general message") } @@ -518,7 +518,7 @@ func (s msgServer) RouteMessage(c context.Context, req *types.RouteMessageReques } } - err := s.nexus.SetMessageProcessing_(ctx, msg.ID) + err := s.nexus.SetMessageProcessing(ctx, msg.ID) if err != nil { return nil, err } diff --git a/x/axelarnet/keeper/msg_server_test.go b/x/axelarnet/keeper/msg_server_test.go index 0120bfd11..edf2e57c8 100644 --- a/x/axelarnet/keeper/msg_server_test.go +++ b/x/axelarnet/keeper/msg_server_test.go @@ -1010,7 +1010,7 @@ func TestRouteMessage(t *testing.T) { GetChainByNativeAssetFunc: func(sdk.Context, string) (nexus.Chain, bool) { return chain, true }, - SetMessageProcessing_Func: func(sdk.Context, string) error { + SetMessageProcessingFunc: func(sdk.Context, string) error { return nil }, } @@ -1267,7 +1267,7 @@ func TestHandleCallContract(t *testing.T) { }) whenSetNewMessageSucceeds := When("set new message succeeds", func() { - nexusK.SetNewMessage_Func = func(_ sdk.Context, m nexus.GeneralMessage) error { + nexusK.SetNewMessageFunc = func(_ sdk.Context, m nexus.GeneralMessage) error { msg = m return m.ValidateBasic() } @@ -1378,7 +1378,7 @@ func TestHandleCallContract(t *testing.T) { When2(whenChainIsActivated). When2(whenAddressIsValid). When("set new message fails", func() { - nexusK.SetNewMessage_Func = func(_ sdk.Context, m nexus.GeneralMessage) error { + nexusK.SetNewMessageFunc = func(_ sdk.Context, m nexus.GeneralMessage) error { return fmt.Errorf("failed to set message") } }). diff --git a/x/axelarnet/message_handler.go b/x/axelarnet/message_handler.go index f917baf4b..fb4853b90 100644 --- a/x/axelarnet/message_handler.go +++ b/x/axelarnet/message_handler.go @@ -266,7 +266,7 @@ func handleMessage(ctx sdk.Context, n types.Nexus, b types.BankKeeper, sourceAdd Payload: msg.Payload, }) - return n.SetNewMessage_(ctx, m) + return n.SetNewMessage(ctx, m) } func handleMessageWithToken(ctx sdk.Context, n types.Nexus, b types.BankKeeper, sourceAddress nexus.CrossChainAddress, msg Message, token keeper.Coin) error { @@ -304,7 +304,7 @@ func handleMessageWithToken(ctx sdk.Context, n types.Nexus, b types.BankKeeper, Asset: token.Coin, }) - return n.SetNewMessage_(ctx, m) + return n.SetNewMessage(ctx, m) } func handleTokenSent(ctx sdk.Context, n types.Nexus, b types.BankKeeper, sourceAddress nexus.CrossChainAddress, msg Message, token keeper.Coin) error { diff --git a/x/axelarnet/message_handler_test.go b/x/axelarnet/message_handler_test.go index ab4dfc52c..1232fef7a 100644 --- a/x/axelarnet/message_handler_test.go +++ b/x/axelarnet/message_handler_test.go @@ -74,7 +74,7 @@ func TestHandleMessage(t *testing.T) { })) channelK.SendPacketFunc = func(sdk.Context, *captypes.Capability, ibcexported.PacketI) error { return nil } n = &mock.NexusMock{ - SetNewMessage_Func: func(ctx sdk.Context, msg nexus.GeneralMessage) error { + SetNewMessageFunc: func(ctx sdk.Context, msg nexus.GeneralMessage) error { genMsg = msg return nil }, @@ -473,7 +473,7 @@ func TestHandleMessageWithToken(t *testing.T) { channelK.SendPacketFunc = func(sdk.Context, *captypes.Capability, ibcexported.PacketI) error { return nil } n = &mock.NexusMock{ - SetNewMessage_Func: func(ctx sdk.Context, msg nexus.GeneralMessage) error { + SetNewMessageFunc: func(ctx sdk.Context, msg nexus.GeneralMessage) error { genMsg = msg return nil }, @@ -689,7 +689,7 @@ func TestHandleSendToken(t *testing.T) { channelK.SendPacketFunc = func(sdk.Context, *captypes.Capability, ibcexported.PacketI) error { return nil } n = &mock.NexusMock{ - SetNewMessage_Func: func(sdk.Context, nexus.GeneralMessage) error { return nil }, + SetNewMessageFunc: func(sdk.Context, nexus.GeneralMessage) error { return nil }, GetChainFunc: func(ctx sdk.Context, chain nexus.ChainName) (nexus.Chain, bool) { switch chain { case srcChain.Name: diff --git a/x/axelarnet/types/expected_keepers.go b/x/axelarnet/types/expected_keepers.go index 3d256d93e..b09d0e771 100644 --- a/x/axelarnet/types/expected_keepers.go +++ b/x/axelarnet/types/expected_keepers.go @@ -56,8 +56,8 @@ type Nexus interface { IsChainActivated(ctx sdk.Context, chain nexus.Chain) bool RateLimitTransfer(ctx sdk.Context, chain nexus.ChainName, asset sdk.Coin, direction nexus.TransferDirection) error GetMessage(ctx sdk.Context, id string) (m nexus.GeneralMessage, found bool) - SetNewMessage_(ctx sdk.Context, m nexus.GeneralMessage) error - SetMessageProcessing_(ctx sdk.Context, id string) error + SetNewMessage(ctx sdk.Context, m nexus.GeneralMessage) error + SetMessageProcessing(ctx sdk.Context, id string) error SetMessageExecuted(ctx sdk.Context, id string) error SetMessageFailed(ctx sdk.Context, id string) error GenerateMessageID(ctx sdk.Context) (string, []byte, uint64) diff --git a/x/axelarnet/types/mock/expected_keepers.go b/x/axelarnet/types/mock/expected_keepers.go index 344078edd..6fd24e790 100644 --- a/x/axelarnet/types/mock/expected_keepers.go +++ b/x/axelarnet/types/mock/expected_keepers.go @@ -620,11 +620,11 @@ var _ axelarnettypes.Nexus = &NexusMock{} // SetMessageFailedFunc: func(ctx cosmossdktypes.Context, id string) error { // panic("mock out the SetMessageFailed method") // }, -// SetMessageProcessing_Func: func(ctx cosmossdktypes.Context, id string) error { -// panic("mock out the SetMessageProcessing_ method") +// SetMessageProcessingFunc: func(ctx cosmossdktypes.Context, id string) error { +// panic("mock out the SetMessageProcessing method") // }, -// SetNewMessage_Func: func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { -// panic("mock out the SetNewMessage_ method") +// SetNewMessageFunc: func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { +// panic("mock out the SetNewMessage method") // }, // SubTransferFeeFunc: func(ctx cosmossdktypes.Context, coin cosmossdktypes.Coin) { // panic("mock out the SubTransferFee method") @@ -696,11 +696,11 @@ type NexusMock struct { // SetMessageFailedFunc mocks the SetMessageFailed method. SetMessageFailedFunc func(ctx cosmossdktypes.Context, id string) error - // SetMessageProcessing_Func mocks the SetMessageProcessing_ method. - SetMessageProcessing_Func func(ctx cosmossdktypes.Context, id string) error + // SetMessageProcessingFunc mocks the SetMessageProcessing method. + SetMessageProcessingFunc func(ctx cosmossdktypes.Context, id string) error - // SetNewMessage_Func mocks the SetNewMessage_ method. - SetNewMessage_Func func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error + // SetNewMessageFunc mocks the SetNewMessage method. + SetNewMessageFunc func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error // SubTransferFeeFunc mocks the SubTransferFee method. SubTransferFeeFunc func(ctx cosmossdktypes.Context, coin cosmossdktypes.Coin) @@ -863,15 +863,15 @@ type NexusMock struct { // ID is the id argument value. ID string } - // SetMessageProcessing_ holds details about calls to the SetMessageProcessing_ method. - SetMessageProcessing_ []struct { + // SetMessageProcessing holds details about calls to the SetMessageProcessing method. + SetMessageProcessing []struct { // Ctx is the ctx argument value. Ctx cosmossdktypes.Context // ID is the id argument value. ID string } - // SetNewMessage_ holds details about calls to the SetNewMessage_ method. - SetNewMessage_ []struct { + // SetNewMessage holds details about calls to the SetNewMessage method. + SetNewMessage []struct { // Ctx is the ctx argument value. Ctx cosmossdktypes.Context // M is the m argument value. @@ -911,8 +911,8 @@ type NexusMock struct { lockSetChain sync.RWMutex lockSetMessageExecuted sync.RWMutex lockSetMessageFailed sync.RWMutex - lockSetMessageProcessing_ sync.RWMutex - lockSetNewMessage_ sync.RWMutex + lockSetMessageProcessing sync.RWMutex + lockSetNewMessage sync.RWMutex lockSubTransferFee sync.RWMutex lockValidateAddress sync.RWMutex } @@ -1641,10 +1641,10 @@ func (mock *NexusMock) SetMessageFailedCalls() []struct { return calls } -// SetMessageProcessing_ calls SetMessageProcessing_Func. -func (mock *NexusMock) SetMessageProcessing_(ctx cosmossdktypes.Context, id string) error { - if mock.SetMessageProcessing_Func == nil { - panic("NexusMock.SetMessageProcessing_Func: method is nil but Nexus.SetMessageProcessing_ was just called") +// SetMessageProcessing calls SetMessageProcessingFunc. +func (mock *NexusMock) SetMessageProcessing(ctx cosmossdktypes.Context, id string) error { + if mock.SetMessageProcessingFunc == nil { + panic("NexusMock.SetMessageProcessingFunc: method is nil but Nexus.SetMessageProcessing was just called") } callInfo := struct { Ctx cosmossdktypes.Context @@ -1653,17 +1653,17 @@ func (mock *NexusMock) SetMessageProcessing_(ctx cosmossdktypes.Context, id stri Ctx: ctx, ID: id, } - mock.lockSetMessageProcessing_.Lock() - mock.calls.SetMessageProcessing_ = append(mock.calls.SetMessageProcessing_, callInfo) - mock.lockSetMessageProcessing_.Unlock() - return mock.SetMessageProcessing_Func(ctx, id) + mock.lockSetMessageProcessing.Lock() + mock.calls.SetMessageProcessing = append(mock.calls.SetMessageProcessing, callInfo) + mock.lockSetMessageProcessing.Unlock() + return mock.SetMessageProcessingFunc(ctx, id) } -// SetMessageProcessing_Calls gets all the calls that were made to SetMessageProcessing_. +// SetMessageProcessingCalls gets all the calls that were made to SetMessageProcessing. // Check the length with: // -// len(mockedNexus.SetMessageProcessing_Calls()) -func (mock *NexusMock) SetMessageProcessing_Calls() []struct { +// len(mockedNexus.SetMessageProcessingCalls()) +func (mock *NexusMock) SetMessageProcessingCalls() []struct { Ctx cosmossdktypes.Context ID string } { @@ -1671,16 +1671,16 @@ func (mock *NexusMock) SetMessageProcessing_Calls() []struct { Ctx cosmossdktypes.Context ID string } - mock.lockSetMessageProcessing_.RLock() - calls = mock.calls.SetMessageProcessing_ - mock.lockSetMessageProcessing_.RUnlock() + mock.lockSetMessageProcessing.RLock() + calls = mock.calls.SetMessageProcessing + mock.lockSetMessageProcessing.RUnlock() return calls } -// SetNewMessage_ calls SetNewMessage_Func. -func (mock *NexusMock) SetNewMessage_(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { - if mock.SetNewMessage_Func == nil { - panic("NexusMock.SetNewMessage_Func: method is nil but Nexus.SetNewMessage_ was just called") +// SetNewMessage calls SetNewMessageFunc. +func (mock *NexusMock) SetNewMessage(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { + if mock.SetNewMessageFunc == nil { + panic("NexusMock.SetNewMessageFunc: method is nil but Nexus.SetNewMessage was just called") } callInfo := struct { Ctx cosmossdktypes.Context @@ -1689,17 +1689,17 @@ func (mock *NexusMock) SetNewMessage_(ctx cosmossdktypes.Context, m github_com_a Ctx: ctx, M: m, } - mock.lockSetNewMessage_.Lock() - mock.calls.SetNewMessage_ = append(mock.calls.SetNewMessage_, callInfo) - mock.lockSetNewMessage_.Unlock() - return mock.SetNewMessage_Func(ctx, m) + mock.lockSetNewMessage.Lock() + mock.calls.SetNewMessage = append(mock.calls.SetNewMessage, callInfo) + mock.lockSetNewMessage.Unlock() + return mock.SetNewMessageFunc(ctx, m) } -// SetNewMessage_Calls gets all the calls that were made to SetNewMessage_. +// SetNewMessageCalls gets all the calls that were made to SetNewMessage. // Check the length with: // -// len(mockedNexus.SetNewMessage_Calls()) -func (mock *NexusMock) SetNewMessage_Calls() []struct { +// len(mockedNexus.SetNewMessageCalls()) +func (mock *NexusMock) SetNewMessageCalls() []struct { Ctx cosmossdktypes.Context M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } { @@ -1707,9 +1707,9 @@ func (mock *NexusMock) SetNewMessage_Calls() []struct { Ctx cosmossdktypes.Context M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } - mock.lockSetNewMessage_.RLock() - calls = mock.calls.SetNewMessage_ - mock.lockSetNewMessage_.RUnlock() + mock.lockSetNewMessage.RLock() + calls = mock.calls.SetNewMessage + mock.lockSetNewMessage.RUnlock() return calls } diff --git a/x/evm/abci.go b/x/evm/abci.go index c0bab258d..a48a25f6e 100644 --- a/x/evm/abci.go +++ b/x/evm/abci.go @@ -256,7 +256,7 @@ func setMessageToNexus(ctx sdk.Context, n types.Nexus, event types.Event, asset return fmt.Errorf("%s is not a supported recipient", axelarnet.Axelarnet.Name) } - return n.SetNewMessage_(ctx, message) + return n.SetNewMessage(ctx, message) } func handleConfirmDeposit(ctx sdk.Context, event types.Event, bk types.BaseKeeper, n types.Nexus) error { diff --git a/x/evm/abci_test.go b/x/evm/abci_test.go index 8f4b8a31e..7891318a9 100644 --- a/x/evm/abci_test.go +++ b/x/evm/abci_test.go @@ -484,7 +484,7 @@ func TestHandleContractCall(t *testing.T) { setGeneralMessageSucceed := func(isSuccessful bool) func() { return func() { - n.SetNewMessage_Func = func(sdk.Context, nexus.GeneralMessage) error { + n.SetNewMessageFunc = func(sdk.Context, nexus.GeneralMessage) error { if !isSuccessful { return fmt.Errorf("set general message error") } @@ -553,7 +553,7 @@ func TestHandleContractCall(t *testing.T) { Then("should succeed", func(t *testing.T) { err := handleContractCall(ctx, event, bk, n, multisigKeeper) assert.NoError(t, err) - assert.Len(t, n.SetNewMessage_Calls(), 1) + assert.Len(t, n.SetNewMessageCalls(), 1) }). Run(t) } diff --git a/x/evm/types/expected_keepers.go b/x/evm/types/expected_keepers.go index d5b42caab..c089fdd14 100644 --- a/x/evm/types/expected_keepers.go +++ b/x/evm/types/expected_keepers.go @@ -114,7 +114,7 @@ type Nexus interface { GetChainMaintainerState(ctx sdk.Context, chain nexus.Chain, address sdk.ValAddress) (nexus.MaintainerState, bool) SetChainMaintainerState(ctx sdk.Context, maintainerState nexus.MaintainerState) error RateLimitTransfer(ctx sdk.Context, chain nexus.ChainName, asset sdk.Coin, direction nexus.TransferDirection) error - SetNewMessage_(ctx sdk.Context, m nexus.GeneralMessage) error + SetNewMessage(ctx sdk.Context, m nexus.GeneralMessage) error GetProcessingMessages(ctx sdk.Context, chain nexus.ChainName, limit int64) []nexus.GeneralMessage SetMessageFailed(ctx sdk.Context, id string) error SetMessageExecuted(ctx sdk.Context, id string) error diff --git a/x/evm/types/mock/expected_keepers.go b/x/evm/types/mock/expected_keepers.go index 68b5c94ce..41c4563b6 100644 --- a/x/evm/types/mock/expected_keepers.go +++ b/x/evm/types/mock/expected_keepers.go @@ -167,8 +167,8 @@ var _ types.Nexus = &NexusMock{} // SetMessageFailedFunc: func(ctx github_com_cosmos_cosmos_sdk_types.Context, id string) error { // panic("mock out the SetMessageFailed method") // }, -// SetNewMessage_Func: func(ctx github_com_cosmos_cosmos_sdk_types.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { -// panic("mock out the SetNewMessage_ method") +// SetNewMessageFunc: func(ctx github_com_cosmos_cosmos_sdk_types.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { +// panic("mock out the SetNewMessage method") // }, // } // @@ -243,8 +243,8 @@ type NexusMock struct { // SetMessageFailedFunc mocks the SetMessageFailed method. SetMessageFailedFunc func(ctx github_com_cosmos_cosmos_sdk_types.Context, id string) error - // SetNewMessage_Func mocks the SetNewMessage_ method. - SetNewMessage_Func func(ctx github_com_cosmos_cosmos_sdk_types.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error + // SetNewMessageFunc mocks the SetNewMessage method. + SetNewMessageFunc func(ctx github_com_cosmos_cosmos_sdk_types.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error // calls tracks calls to the methods. calls struct { @@ -432,8 +432,8 @@ type NexusMock struct { // ID is the id argument value. ID string } - // SetNewMessage_ holds details about calls to the SetNewMessage_ method. - SetNewMessage_ []struct { + // SetNewMessage holds details about calls to the SetNewMessage method. + SetNewMessage []struct { // Ctx is the ctx argument value. Ctx github_com_cosmos_cosmos_sdk_types.Context // M is the m argument value. @@ -462,7 +462,7 @@ type NexusMock struct { lockSetChainMaintainerState sync.RWMutex lockSetMessageExecuted sync.RWMutex lockSetMessageFailed sync.RWMutex - lockSetNewMessage_ sync.RWMutex + lockSetNewMessage sync.RWMutex } // AddTransferFee calls AddTransferFeeFunc. @@ -1317,10 +1317,10 @@ func (mock *NexusMock) SetMessageFailedCalls() []struct { return calls } -// SetNewMessage_ calls SetNewMessage_Func. -func (mock *NexusMock) SetNewMessage_(ctx github_com_cosmos_cosmos_sdk_types.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { - if mock.SetNewMessage_Func == nil { - panic("NexusMock.SetNewMessage_Func: method is nil but Nexus.SetNewMessage_ was just called") +// SetNewMessage calls SetNewMessageFunc. +func (mock *NexusMock) SetNewMessage(ctx github_com_cosmos_cosmos_sdk_types.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { + if mock.SetNewMessageFunc == nil { + panic("NexusMock.SetNewMessageFunc: method is nil but Nexus.SetNewMessage was just called") } callInfo := struct { Ctx github_com_cosmos_cosmos_sdk_types.Context @@ -1329,17 +1329,17 @@ func (mock *NexusMock) SetNewMessage_(ctx github_com_cosmos_cosmos_sdk_types.Con Ctx: ctx, M: m, } - mock.lockSetNewMessage_.Lock() - mock.calls.SetNewMessage_ = append(mock.calls.SetNewMessage_, callInfo) - mock.lockSetNewMessage_.Unlock() - return mock.SetNewMessage_Func(ctx, m) + mock.lockSetNewMessage.Lock() + mock.calls.SetNewMessage = append(mock.calls.SetNewMessage, callInfo) + mock.lockSetNewMessage.Unlock() + return mock.SetNewMessageFunc(ctx, m) } -// SetNewMessage_Calls gets all the calls that were made to SetNewMessage_. +// SetNewMessageCalls gets all the calls that were made to SetNewMessage. // Check the length with: // -// len(mockedNexus.SetNewMessage_Calls()) -func (mock *NexusMock) SetNewMessage_Calls() []struct { +// len(mockedNexus.SetNewMessageCalls()) +func (mock *NexusMock) SetNewMessageCalls() []struct { Ctx github_com_cosmos_cosmos_sdk_types.Context M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } { @@ -1347,9 +1347,9 @@ func (mock *NexusMock) SetNewMessage_Calls() []struct { Ctx github_com_cosmos_cosmos_sdk_types.Context M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } - mock.lockSetNewMessage_.RLock() - calls = mock.calls.SetNewMessage_ - mock.lockSetNewMessage_.RUnlock() + mock.lockSetNewMessage.RLock() + calls = mock.calls.SetNewMessage + mock.lockSetNewMessage.RUnlock() return calls } diff --git a/x/nexus/keeper/general_message.go b/x/nexus/keeper/general_message.go index ee3854dd5..1132cf654 100644 --- a/x/nexus/keeper/general_message.go +++ b/x/nexus/keeper/general_message.go @@ -138,8 +138,8 @@ func (k Keeper) GetProcessingMessages(ctx sdk.Context, chain exported.ChainName, }) } -// SetNewMessage_ sets the given general messsage as approved -func (k Keeper) SetNewMessage_(ctx sdk.Context, msg exported.GeneralMessage) error { +// SetNewMessage sets the given general messsage as approved +func (k Keeper) SetNewMessage(ctx sdk.Context, msg exported.GeneralMessage) error { if _, ok := k.GetMessage(ctx, msg.ID); ok { return fmt.Errorf("general message %s already exists", msg.ID) } @@ -158,9 +158,9 @@ func (k Keeper) SetNewMessage_(ctx sdk.Context, msg exported.GeneralMessage) err return k.setMessage(ctx, msg) } -// SetMessageProcessing_ sets the given general message as processing and perform +// SetMessageProcessing sets the given general message as processing and perform // validations on the message -func (k Keeper) SetMessageProcessing_(ctx sdk.Context, id string) error { +func (k Keeper) SetMessageProcessing(ctx sdk.Context, id string) error { msg, ok := k.GetMessage(ctx, id) if !ok { return fmt.Errorf("general message %s not found", id) diff --git a/x/nexus/keeper/general_message_test.go b/x/nexus/keeper/general_message_test.go index 3df283f29..d1fc8409c 100644 --- a/x/nexus/keeper/general_message_test.go +++ b/x/nexus/keeper/general_message_test.go @@ -48,7 +48,7 @@ func randMsg(status exported.GeneralMessage_Status, withAsset ...bool) exported. } } -func TestSetNewMessage_(t *testing.T) { +func TestSetNewMessage(t *testing.T) { var ( msg exported.GeneralMessage ctx sdk.Context @@ -63,10 +63,10 @@ func TestSetNewMessage_(t *testing.T) { givenKeeper. When("the message already exists", func() { msg = randMsg(exported.Approved, true) - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewMessage_(ctx, msg), "already exists") + assert.ErrorContains(t, keeper.SetNewMessage(ctx, msg), "already exists") }). Run(t) @@ -75,7 +75,7 @@ func TestSetNewMessage_(t *testing.T) { msg = randMsg(exported.Processing) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewMessage_(ctx, msg), "new general message has to be approved") + assert.ErrorContains(t, keeper.SetNewMessage(ctx, msg), "new general message has to be approved") }). Run(t) @@ -84,7 +84,7 @@ func TestSetNewMessage_(t *testing.T) { msg = randMsg(exported.Approved) }). Then("should store the message", func(t *testing.T) { - assert.NoError(t, keeper.SetNewMessage_(ctx, msg)) + assert.NoError(t, keeper.SetNewMessage(ctx, msg)) actual, ok := keeper.GetMessage(ctx, msg.ID) assert.True(t, ok) @@ -93,7 +93,7 @@ func TestSetNewMessage_(t *testing.T) { Run(t) } -func TestSetMessageProcessing_(t *testing.T) { +func TestSetMessageProcessing(t *testing.T) { var ( msg exported.GeneralMessage ctx sdk.Context @@ -108,7 +108,7 @@ func TestSetMessageProcessing_(t *testing.T) { givenKeeper. When("the message doesn't exist", func() {}). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, rand.NormalizedStr(10)), "not found") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, rand.NormalizedStr(10)), "not found") }). Run(t) @@ -124,11 +124,11 @@ func TestSetMessageProcessing_(t *testing.T) { Address: evmtestutils.RandomAddress().Hex(), } - keeper.SetNewMessage_(ctx, msg) - keeper.SetMessageProcessing_(ctx, msg.ID) + keeper.SetNewMessage(ctx, msg) + keeper.SetMessageProcessing(ctx, msg.ID) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "general message has to be approved or failed") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "general message has to be approved or failed") }). Run(t) @@ -145,10 +145,10 @@ func TestSetMessageProcessing_(t *testing.T) { When("the destination chain is not registered", func() { msg.Recipient.Chain = nexustestutils.RandomChain() - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "is not registered") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "is not registered") }), When("the destination chain is not activated", func() { @@ -158,10 +158,10 @@ func TestSetMessageProcessing_(t *testing.T) { } keeper.DeactivateChain(ctx, msg.Recipient.Chain) - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "is not activated") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "is not activated") }), When("the destination address is invalid", func() { @@ -170,10 +170,10 @@ func TestSetMessageProcessing_(t *testing.T) { Address: rand.NormalizedStr(42), } - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "not an hex address") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "not an hex address") }), When("the destination chain does't support the asset", func() { @@ -184,10 +184,10 @@ func TestSetMessageProcessing_(t *testing.T) { asset := rand.Coin() msg.Asset = &asset - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "does not support foreign asset") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "does not support foreign asset") }), When("asset is set", func() { @@ -197,10 +197,10 @@ func TestSetMessageProcessing_(t *testing.T) { } msg.Asset = &sdk.Coin{Denom: "external-erc-20", Amount: sdk.NewInt(100)} - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "asset transfer is not supported for wasm messages") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "asset transfer is not supported for wasm messages") }), ). Run(t) @@ -218,10 +218,10 @@ func TestSetMessageProcessing_(t *testing.T) { When("the sender chain is not registered", func() { msg.Sender.Chain = nexustestutils.RandomChain() - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "is not registered") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "is not registered") }), When("the sender chain is not activated", func() { @@ -231,10 +231,10 @@ func TestSetMessageProcessing_(t *testing.T) { } keeper.DeactivateChain(ctx, msg.Sender.Chain) - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "is not activated") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "is not activated") }), When("the sender address is invalid", func() { @@ -243,10 +243,10 @@ func TestSetMessageProcessing_(t *testing.T) { Address: rand.NormalizedStr(42), } - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "not an hex address") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "not an hex address") }), When("the sender chain does't support the asset", func() { @@ -257,10 +257,10 @@ func TestSetMessageProcessing_(t *testing.T) { asset := rand.Coin() msg.Asset = &asset - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "does not support foreign asset") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "does not support foreign asset") }), When("asset is set", func() { @@ -270,10 +270,10 @@ func TestSetMessageProcessing_(t *testing.T) { } msg.Asset = &sdk.Coin{Denom: "external-erc-20", Amount: sdk.NewInt(100)} - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetMessageProcessing_(ctx, msg.ID), "asset transfer is not supported for wasm messages") + assert.ErrorContains(t, keeper.SetMessageProcessing(ctx, msg.ID), "asset transfer is not supported for wasm messages") }), ). Run(t) @@ -287,10 +287,10 @@ func TestSetMessageProcessing_(t *testing.T) { Address: evmtestutils.RandomAddress().Hex(), } - keeper.SetNewMessage_(ctx, msg) + keeper.SetNewMessage(ctx, msg) }). Then("should set the message status to processing", func(t *testing.T) { - assert.NoError(t, keeper.SetMessageProcessing_(ctx, msg.ID)) + assert.NoError(t, keeper.SetMessageProcessing(ctx, msg.ID)) actual, ok := keeper.GetMessage(ctx, msg.ID) assert.True(t, ok) @@ -353,14 +353,14 @@ func TestStatusTransitions(t *testing.T) { err := k.SetMessageFailed(ctx, msg.ID) assert.Error(t, err, fmt.Sprintf("general message %s not found", msg.ID)) - err = k.SetMessageProcessing_(ctx, msg.ID) + err = k.SetMessageProcessing(ctx, msg.ID) assert.Error(t, err, fmt.Sprintf("general message %s not found", msg.ID)) err = k.SetMessageExecuted(ctx, msg.ID) assert.Error(t, err, fmt.Sprintf("general message %s not found", msg.ID)) // Now store the message with approved status - err = k.SetNewMessage_(ctx, msg) + err = k.SetNewMessage(ctx, msg) assert.NoError(t, err) err = k.SetMessageFailed(ctx, msg.ID) @@ -369,10 +369,10 @@ func TestStatusTransitions(t *testing.T) { err = k.SetMessageExecuted(ctx, msg.ID) assert.Error(t, err, "general message is not processed") - err = k.SetMessageProcessing_(ctx, msg.ID) + err = k.SetMessageProcessing(ctx, msg.ID) assert.NoError(t, err) - err = k.SetMessageProcessing_(ctx, msg.ID) + err = k.SetMessageProcessing(ctx, msg.ID) assert.Error(t, err, "general message is not approved or failed") err = k.SetMessageFailed(ctx, msg.ID) @@ -381,7 +381,7 @@ func TestStatusTransitions(t *testing.T) { err = k.SetMessageExecuted(ctx, msg.ID) assert.Error(t, err, "general message is not processed") - err = k.SetMessageProcessing_(ctx, msg.ID) + err = k.SetMessageProcessing(ctx, msg.ID) assert.NoError(t, err) err = k.SetMessageExecuted(ctx, msg.ID) @@ -390,7 +390,7 @@ func TestStatusTransitions(t *testing.T) { err = k.SetMessageFailed(ctx, msg.ID) assert.Error(t, err, "general message is not processed") - err = k.SetMessageProcessing_(ctx, msg.ID) + err = k.SetMessageProcessing(ctx, msg.ID) assert.Error(t, err, "general message is not approved or failed") } @@ -414,7 +414,7 @@ func TestGetMessage(t *testing.T) { SourceTxIndex: nonce, } - err := k.SetNewMessage_(ctx, msg) + err := k.SetNewMessage(ctx, msg) assert.NoError(t, err) exp, found := k.GetMessage(ctx, msg.ID) @@ -461,16 +461,16 @@ func TestGetSentMessages(t *testing.T) { status := msg.Status msg.Status = exported.Approved - assert.NoError(t, k.SetNewMessage_(ctx, msg)) + assert.NoError(t, k.SetNewMessage(ctx, msg)) switch status { case exported.Processing: - assert.NoError(t, k.SetMessageProcessing_(ctx, msg.ID)) + assert.NoError(t, k.SetMessageProcessing(ctx, msg.ID)) case exported.Executed: - assert.NoError(t, k.SetMessageProcessing_(ctx, msg.ID)) + assert.NoError(t, k.SetMessageProcessing(ctx, msg.ID)) assert.NoError(t, k.SetMessageExecuted(ctx, msg.ID)) case exported.Failed: - assert.NoError(t, k.SetMessageProcessing_(ctx, msg.ID)) + assert.NoError(t, k.SetMessageProcessing(ctx, msg.ID)) assert.NoError(t, k.SetMessageFailed(ctx, msg.ID)) default: } @@ -546,7 +546,7 @@ func TestGetSentMessages(t *testing.T) { checkForExistence(msgs) //resend the failed message - err = k.SetMessageProcessing_(ctx, msg.ID) + err = k.SetMessageProcessing(ctx, msg.ID) assert.NoError(t, err) sent = consumeSent(destinationChainName, 1) assert.Equal(t, len(sent), 1) diff --git a/x/nexus/keeper/grpc_query_test.go b/x/nexus/keeper/grpc_query_test.go index 16a1bf275..01dd80bfb 100644 --- a/x/nexus/keeper/grpc_query_test.go +++ b/x/nexus/keeper/grpc_query_test.go @@ -211,7 +211,7 @@ func TestKeeper_Message(t *testing.T) { SourceTxID: txID, SourceTxIndex: nonce, } - err := k.SetNewMessage_(ctx, msg) + err := k.SetNewMessage(ctx, msg) assert.NoError(t, err) }).Then("should succeed", func(t *testing.T) { response, err := q.Message(sdk.WrapSDKContext(ctx), &types.MessageRequest{ID: id}) diff --git a/x/nexus/keeper/msg_dispatcher.go b/x/nexus/keeper/msg_dispatcher.go index e64995211..0dc117a40 100644 --- a/x/nexus/keeper/msg_dispatcher.go +++ b/x/nexus/keeper/msg_dispatcher.go @@ -68,7 +68,7 @@ func (m Messenger) routeMsg(ctx sdk.Context, msg exported.WasmMessage) error { recipient := exported.CrossChainAddress{Chain: destinationChain, Address: msg.DestinationAddress} nexusMsg := exported.NewGeneralMessage_(id, sender, recipient, msg.PayloadHash, msg.SourceTxID, msg.SourceTxIndex, nil) - if err := m.Nexus.SetNewMessage_(ctx, nexusMsg); err != nil { + if err := m.Nexus.SetNewMessage(ctx, nexusMsg); err != nil { return err } @@ -79,5 +79,5 @@ func (m Messenger) routeMsg(ctx sdk.Context, msg exported.WasmMessage) error { // set message to be processing if the destination chain is not a cosmos chain. // messages sent to cosmos chains require translation with the original payload. // https://github.com/axelarnetwork/axelar-core/blob/ea48d5b974dfd94ea235311eddabe23bfa430cd9/x/axelarnet/keeper/msg_server.go#L520 - return m.Nexus.SetMessageProcessing_(ctx, nexusMsg.ID) + return m.Nexus.SetMessageProcessing(ctx, nexusMsg.ID) } diff --git a/x/nexus/keeper/msg_dispatcher_test.go b/x/nexus/keeper/msg_dispatcher_test.go index 83c9401a6..406deda4e 100644 --- a/x/nexus/keeper/msg_dispatcher_test.go +++ b/x/nexus/keeper/msg_dispatcher_test.go @@ -123,7 +123,7 @@ func TestMessenger_DispatchMsg(t *testing.T) { nexus.GenerateMessageIDFunc = func(_ sdk.Context) (string, []byte, uint64) { return "1", []byte("1"), 1 } - nexus.SetNewMessage_Func = func(_ sdk.Context, _ exported.GeneralMessage) error { + nexus.SetNewMessageFunc = func(_ sdk.Context, _ exported.GeneralMessage) error { return fmt.Errorf("set msg error") } }). @@ -161,10 +161,10 @@ func TestMessenger_DispatchMsg(t *testing.T) { nexus.GenerateMessageIDFunc = func(_ sdk.Context) (string, []byte, uint64) { return "1", []byte("1"), 1 } - nexus.SetNewMessage_Func = func(_ sdk.Context, msg exported.GeneralMessage) error { + nexus.SetNewMessageFunc = func(_ sdk.Context, msg exported.GeneralMessage) error { return nil } - nexus.SetMessageProcessing_Func = func(ctx sdk.Context, id string) error { return nil } + nexus.SetMessageProcessingFunc = func(ctx sdk.Context, id string) error { return nil } }). Branch( When("the destination chain is a cosmos chain", func() { @@ -176,12 +176,12 @@ func TestMessenger_DispatchMsg(t *testing.T) { _, _, err := messenger.DispatchMsg(ctx, contractAddr, "", msg) assert.NoError(t, err) - assert.Len(t, nexus.SetNewMessage_Calls(), 1) - assert.Equal(t, nexus.SetNewMessage_Calls()[0].Msg.Recipient.Chain, axelarnet.Axelarnet) - assert.Equal(t, nexus.SetNewMessage_Calls()[0].Msg.Status, exported.Approved) - assert.Nil(t, nexus.SetNewMessage_Calls()[0].Msg.Asset) + assert.Len(t, nexus.SetNewMessageCalls(), 1) + assert.Equal(t, nexus.SetNewMessageCalls()[0].Msg.Recipient.Chain, axelarnet.Axelarnet) + assert.Equal(t, nexus.SetNewMessageCalls()[0].Msg.Status, exported.Approved) + assert.Nil(t, nexus.SetNewMessageCalls()[0].Msg.Asset) - assert.Empty(t, nexus.SetMessageProcessing_Calls()) + assert.Empty(t, nexus.SetMessageProcessingCalls()) }), When("the destination chain is a non-cosmos chain", func() { @@ -193,13 +193,13 @@ func TestMessenger_DispatchMsg(t *testing.T) { _, _, err := messenger.DispatchMsg(ctx, contractAddr, "", msg) assert.NoError(t, err) - assert.Len(t, nexus.SetNewMessage_Calls(), 1) - assert.Equal(t, nexus.SetNewMessage_Calls()[0].Msg.Recipient.Chain, evm.Ethereum) - assert.Equal(t, nexus.SetNewMessage_Calls()[0].Msg.Status, exported.Approved) - assert.Nil(t, nexus.SetNewMessage_Calls()[0].Msg.Asset) + assert.Len(t, nexus.SetNewMessageCalls(), 1) + assert.Equal(t, nexus.SetNewMessageCalls()[0].Msg.Recipient.Chain, evm.Ethereum) + assert.Equal(t, nexus.SetNewMessageCalls()[0].Msg.Status, exported.Approved) + assert.Nil(t, nexus.SetNewMessageCalls()[0].Msg.Asset) - assert.Len(t, nexus.SetMessageProcessing_Calls(), 1) - assert.Equal(t, nexus.SetNewMessage_Calls()[0].Msg.ID, nexus.SetMessageProcessing_Calls()[0].ID) + assert.Len(t, nexus.SetMessageProcessingCalls(), 1) + assert.Equal(t, nexus.SetNewMessageCalls()[0].Msg.ID, nexus.SetMessageProcessingCalls()[0].ID) }), ). Run(t) diff --git a/x/nexus/types/expected_keepers.go b/x/nexus/types/expected_keepers.go index f2f403bd4..8efd61991 100644 --- a/x/nexus/types/expected_keepers.go +++ b/x/nexus/types/expected_keepers.go @@ -41,8 +41,8 @@ type Nexus interface { SetRateLimit(ctx sdk.Context, chainName exported.ChainName, limit sdk.Coin, window time.Duration) error RateLimitTransfer(ctx sdk.Context, chain exported.ChainName, asset sdk.Coin, direction exported.TransferDirection) error GenerateMessageID(ctx sdk.Context) (string, []byte, uint64) - SetNewMessage_(ctx sdk.Context, msg exported.GeneralMessage) error - SetMessageProcessing_(ctx sdk.Context, id string) error + SetNewMessage(ctx sdk.Context, msg exported.GeneralMessage) error + SetMessageProcessing(ctx sdk.Context, id string) error } // Snapshotter provides functionality to the snapshot module diff --git a/x/nexus/types/mock/expected_keepers.go b/x/nexus/types/mock/expected_keepers.go index 4694e35f7..66c130a91 100644 --- a/x/nexus/types/mock/expected_keepers.go +++ b/x/nexus/types/mock/expected_keepers.go @@ -82,11 +82,11 @@ var _ nexustypes.Nexus = &NexusMock{} // RemoveChainMaintainerFunc: func(ctx cosmossdktypes.Context, chain github_com_axelarnetwork_axelar_core_x_nexus_exported.Chain, validator cosmossdktypes.ValAddress) error { // panic("mock out the RemoveChainMaintainer method") // }, -// SetMessageProcessing_Func: func(ctx cosmossdktypes.Context, id string) error { -// panic("mock out the SetMessageProcessing_ method") +// SetMessageProcessingFunc: func(ctx cosmossdktypes.Context, id string) error { +// panic("mock out the SetMessageProcessing method") // }, -// SetNewMessage_Func: func(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { -// panic("mock out the SetNewMessage_ method") +// SetNewMessageFunc: func(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { +// panic("mock out the SetNewMessage method") // }, // SetParamsFunc: func(ctx cosmossdktypes.Context, p nexustypes.Params) { // panic("mock out the SetParams method") @@ -158,11 +158,11 @@ type NexusMock struct { // RemoveChainMaintainerFunc mocks the RemoveChainMaintainer method. RemoveChainMaintainerFunc func(ctx cosmossdktypes.Context, chain github_com_axelarnetwork_axelar_core_x_nexus_exported.Chain, validator cosmossdktypes.ValAddress) error - // SetMessageProcessing_Func mocks the SetMessageProcessing_ method. - SetMessageProcessing_Func func(ctx cosmossdktypes.Context, id string) error + // SetMessageProcessingFunc mocks the SetMessageProcessing method. + SetMessageProcessingFunc func(ctx cosmossdktypes.Context, id string) error - // SetNewMessage_Func mocks the SetNewMessage_ method. - SetNewMessage_Func func(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error + // SetNewMessageFunc mocks the SetNewMessage method. + SetNewMessageFunc func(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error // SetParamsFunc mocks the SetParams method. SetParamsFunc func(ctx cosmossdktypes.Context, p nexustypes.Params) @@ -311,15 +311,15 @@ type NexusMock struct { // Validator is the validator argument value. Validator cosmossdktypes.ValAddress } - // SetMessageProcessing_ holds details about calls to the SetMessageProcessing_ method. - SetMessageProcessing_ []struct { + // SetMessageProcessing holds details about calls to the SetMessageProcessing method. + SetMessageProcessing []struct { // Ctx is the ctx argument value. Ctx cosmossdktypes.Context // ID is the id argument value. ID string } - // SetNewMessage_ holds details about calls to the SetNewMessage_ method. - SetNewMessage_ []struct { + // SetNewMessage holds details about calls to the SetNewMessage method. + SetNewMessage []struct { // Ctx is the ctx argument value. Ctx cosmossdktypes.Context // Msg is the msg argument value. @@ -363,8 +363,8 @@ type NexusMock struct { lockRateLimitTransfer sync.RWMutex lockRegisterFee sync.RWMutex lockRemoveChainMaintainer sync.RWMutex - lockSetMessageProcessing_ sync.RWMutex - lockSetNewMessage_ sync.RWMutex + lockSetMessageProcessing sync.RWMutex + lockSetNewMessage sync.RWMutex lockSetParams sync.RWMutex lockSetRateLimit sync.RWMutex } @@ -1065,10 +1065,10 @@ func (mock *NexusMock) RemoveChainMaintainerCalls() []struct { return calls } -// SetMessageProcessing_ calls SetMessageProcessing_Func. -func (mock *NexusMock) SetMessageProcessing_(ctx cosmossdktypes.Context, id string) error { - if mock.SetMessageProcessing_Func == nil { - panic("NexusMock.SetMessageProcessing_Func: method is nil but Nexus.SetMessageProcessing_ was just called") +// SetMessageProcessing calls SetMessageProcessingFunc. +func (mock *NexusMock) SetMessageProcessing(ctx cosmossdktypes.Context, id string) error { + if mock.SetMessageProcessingFunc == nil { + panic("NexusMock.SetMessageProcessingFunc: method is nil but Nexus.SetMessageProcessing was just called") } callInfo := struct { Ctx cosmossdktypes.Context @@ -1077,17 +1077,17 @@ func (mock *NexusMock) SetMessageProcessing_(ctx cosmossdktypes.Context, id stri Ctx: ctx, ID: id, } - mock.lockSetMessageProcessing_.Lock() - mock.calls.SetMessageProcessing_ = append(mock.calls.SetMessageProcessing_, callInfo) - mock.lockSetMessageProcessing_.Unlock() - return mock.SetMessageProcessing_Func(ctx, id) + mock.lockSetMessageProcessing.Lock() + mock.calls.SetMessageProcessing = append(mock.calls.SetMessageProcessing, callInfo) + mock.lockSetMessageProcessing.Unlock() + return mock.SetMessageProcessingFunc(ctx, id) } -// SetMessageProcessing_Calls gets all the calls that were made to SetMessageProcessing_. +// SetMessageProcessingCalls gets all the calls that were made to SetMessageProcessing. // Check the length with: // -// len(mockedNexus.SetMessageProcessing_Calls()) -func (mock *NexusMock) SetMessageProcessing_Calls() []struct { +// len(mockedNexus.SetMessageProcessingCalls()) +func (mock *NexusMock) SetMessageProcessingCalls() []struct { Ctx cosmossdktypes.Context ID string } { @@ -1095,16 +1095,16 @@ func (mock *NexusMock) SetMessageProcessing_Calls() []struct { Ctx cosmossdktypes.Context ID string } - mock.lockSetMessageProcessing_.RLock() - calls = mock.calls.SetMessageProcessing_ - mock.lockSetMessageProcessing_.RUnlock() + mock.lockSetMessageProcessing.RLock() + calls = mock.calls.SetMessageProcessing + mock.lockSetMessageProcessing.RUnlock() return calls } -// SetNewMessage_ calls SetNewMessage_Func. -func (mock *NexusMock) SetNewMessage_(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { - if mock.SetNewMessage_Func == nil { - panic("NexusMock.SetNewMessage_Func: method is nil but Nexus.SetNewMessage_ was just called") +// SetNewMessage calls SetNewMessageFunc. +func (mock *NexusMock) SetNewMessage(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { + if mock.SetNewMessageFunc == nil { + panic("NexusMock.SetNewMessageFunc: method is nil but Nexus.SetNewMessage was just called") } callInfo := struct { Ctx cosmossdktypes.Context @@ -1113,17 +1113,17 @@ func (mock *NexusMock) SetNewMessage_(ctx cosmossdktypes.Context, msg github_com Ctx: ctx, Msg: msg, } - mock.lockSetNewMessage_.Lock() - mock.calls.SetNewMessage_ = append(mock.calls.SetNewMessage_, callInfo) - mock.lockSetNewMessage_.Unlock() - return mock.SetNewMessage_Func(ctx, msg) + mock.lockSetNewMessage.Lock() + mock.calls.SetNewMessage = append(mock.calls.SetNewMessage, callInfo) + mock.lockSetNewMessage.Unlock() + return mock.SetNewMessageFunc(ctx, msg) } -// SetNewMessage_Calls gets all the calls that were made to SetNewMessage_. +// SetNewMessageCalls gets all the calls that were made to SetNewMessage. // Check the length with: // -// len(mockedNexus.SetNewMessage_Calls()) -func (mock *NexusMock) SetNewMessage_Calls() []struct { +// len(mockedNexus.SetNewMessageCalls()) +func (mock *NexusMock) SetNewMessageCalls() []struct { Ctx cosmossdktypes.Context Msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } { @@ -1131,9 +1131,9 @@ func (mock *NexusMock) SetNewMessage_Calls() []struct { Ctx cosmossdktypes.Context Msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } - mock.lockSetNewMessage_.RLock() - calls = mock.calls.SetNewMessage_ - mock.lockSetNewMessage_.RUnlock() + mock.lockSetNewMessage.RLock() + calls = mock.calls.SetNewMessage + mock.lockSetNewMessage.RUnlock() return calls }