From d79382db93c22d6ca300a08f7705ed5eb891b7af Mon Sep 17 00:00:00 2001 From: Sammy Liu Date: Wed, 1 Nov 2023 13:20:40 -0400 Subject: [PATCH 1/6] refactor(nexus): general message deprecated methods removal --- x/axelarnet/types/expected_keepers.go | 2 - x/axelarnet/types/mock/expected_keepers.go | 100 ------- x/evm/abci.go | 8 +- 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 | 131 --------- x/nexus/keeper/general_message_test.go | 304 ++++----------------- x/nexus/keeper/genesis.go | 2 +- x/nexus/keeper/genesis_test.go | 2 +- x/nexus/keeper/grpc_query_test.go | 2 +- 11 files changed, 81 insertions(+), 518 deletions(-) diff --git a/x/axelarnet/types/expected_keepers.go b/x/axelarnet/types/expected_keepers.go index 3c4e6730f..3d256d93e 100644 --- a/x/axelarnet/types/expected_keepers.go +++ b/x/axelarnet/types/expected_keepers.go @@ -56,9 +56,7 @@ 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 SetNewMessage_(ctx sdk.Context, m nexus.GeneralMessage) error - SetMessageProcessing(ctx sdk.Context, id string) error SetMessageProcessing_(ctx sdk.Context, id string) error SetMessageExecuted(ctx sdk.Context, id string) error SetMessageFailed(ctx sdk.Context, id string) error diff --git a/x/axelarnet/types/mock/expected_keepers.go b/x/axelarnet/types/mock/expected_keepers.go index 3b1fb1999..344078edd 100644 --- a/x/axelarnet/types/mock/expected_keepers.go +++ b/x/axelarnet/types/mock/expected_keepers.go @@ -620,15 +620,9 @@ var _ axelarnettypes.Nexus = &NexusMock{} // SetMessageFailedFunc: func(ctx cosmossdktypes.Context, id string) error { // panic("mock out the SetMessageFailed method") // }, -// SetMessageProcessingFunc: func(ctx cosmossdktypes.Context, id string) error { -// panic("mock out the SetMessageProcessing method") -// }, // SetMessageProcessing_Func: func(ctx cosmossdktypes.Context, id string) error { // panic("mock out the SetMessageProcessing_ method") // }, -// SetNewMessageFunc: func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { -// panic("mock out the SetNewMessage method") -// }, // SetNewMessage_Func: func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { // panic("mock out the SetNewMessage_ method") // }, @@ -702,15 +696,9 @@ type NexusMock struct { // SetMessageFailedFunc mocks the SetMessageFailed method. SetMessageFailedFunc func(ctx cosmossdktypes.Context, id string) error - // SetMessageProcessingFunc mocks the SetMessageProcessing method. - SetMessageProcessingFunc func(ctx cosmossdktypes.Context, id string) error - // SetMessageProcessing_Func mocks the SetMessageProcessing_ method. SetMessageProcessing_Func func(ctx cosmossdktypes.Context, id string) error - // SetNewMessageFunc mocks the SetNewMessage method. - SetNewMessageFunc func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error - // SetNewMessage_Func mocks the SetNewMessage_ method. SetNewMessage_Func func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error @@ -875,13 +863,6 @@ type NexusMock struct { // ID is the id argument value. ID string } - // 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 - } // SetMessageProcessing_ holds details about calls to the SetMessageProcessing_ method. SetMessageProcessing_ []struct { // Ctx is the ctx argument value. @@ -889,13 +870,6 @@ type NexusMock struct { // ID is the id argument value. ID string } - // 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. - M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage - } // SetNewMessage_ holds details about calls to the SetNewMessage_ method. SetNewMessage_ []struct { // Ctx is the ctx argument value. @@ -937,9 +911,7 @@ type NexusMock struct { lockSetChain sync.RWMutex lockSetMessageExecuted sync.RWMutex lockSetMessageFailed sync.RWMutex - lockSetMessageProcessing sync.RWMutex lockSetMessageProcessing_ sync.RWMutex - lockSetNewMessage sync.RWMutex lockSetNewMessage_ sync.RWMutex lockSubTransferFee sync.RWMutex lockValidateAddress sync.RWMutex @@ -1669,42 +1641,6 @@ func (mock *NexusMock) SetMessageFailedCalls() []struct { return calls } -// 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 - ID string - }{ - Ctx: ctx, - ID: id, - } - mock.lockSetMessageProcessing.Lock() - mock.calls.SetMessageProcessing = append(mock.calls.SetMessageProcessing, callInfo) - mock.lockSetMessageProcessing.Unlock() - return mock.SetMessageProcessingFunc(ctx, id) -} - -// SetMessageProcessingCalls gets all the calls that were made to SetMessageProcessing. -// Check the length with: -// -// len(mockedNexus.SetMessageProcessingCalls()) -func (mock *NexusMock) SetMessageProcessingCalls() []struct { - Ctx cosmossdktypes.Context - ID string -} { - var calls []struct { - Ctx cosmossdktypes.Context - ID string - } - mock.lockSetMessageProcessing.RLock() - calls = mock.calls.SetMessageProcessing - mock.lockSetMessageProcessing.RUnlock() - return calls -} - // SetMessageProcessing_ calls SetMessageProcessing_Func. func (mock *NexusMock) SetMessageProcessing_(ctx cosmossdktypes.Context, id string) error { if mock.SetMessageProcessing_Func == nil { @@ -1741,42 +1677,6 @@ func (mock *NexusMock) SetMessageProcessing_Calls() []struct { return calls } -// 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 - M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage - }{ - Ctx: ctx, - M: m, - } - mock.lockSetNewMessage.Lock() - mock.calls.SetNewMessage = append(mock.calls.SetNewMessage, callInfo) - mock.lockSetNewMessage.Unlock() - return mock.SetNewMessageFunc(ctx, m) -} - -// SetNewMessageCalls gets all the calls that were made to SetNewMessage. -// Check the length with: -// -// len(mockedNexus.SetNewMessageCalls()) -func (mock *NexusMock) SetNewMessageCalls() []struct { - Ctx cosmossdktypes.Context - M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage -} { - var 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() - 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 { diff --git a/x/evm/abci.go b/x/evm/abci.go index 6552333d4..c0bab258d 100644 --- a/x/evm/abci.go +++ b/x/evm/abci.go @@ -214,12 +214,11 @@ func setMessageToNexus(ctx sdk.Context, n types.Nexus, event types.Event, asset Address: e.ContractCall.ContractAddress, } - message = nexus.NewGeneralMessage( + message = nexus.NewGeneralMessage_( string(event.GetID()), sender, recipient, e.ContractCall.PayloadHash.Bytes(), - nexus.Approved, event.TxID.Bytes(), event.Index, nil, @@ -240,12 +239,11 @@ func setMessageToNexus(ctx sdk.Context, n types.Nexus, event types.Event, asset Address: e.ContractCallWithToken.ContractAddress, } - message = nexus.NewGeneralMessage( + message = nexus.NewGeneralMessage_( string(event.GetID()), sender, recipient, e.ContractCallWithToken.PayloadHash.Bytes(), - nexus.Approved, event.TxID.Bytes(), event.Index, asset, @@ -258,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 7891318a9..8f4b8a31e 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.SetNewMessageFunc = func(sdk.Context, nexus.GeneralMessage) error { + n.SetNewMessage_Func = 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.SetNewMessageCalls(), 1) + assert.Len(t, n.SetNewMessage_Calls(), 1) }). Run(t) } diff --git a/x/evm/types/expected_keepers.go b/x/evm/types/expected_keepers.go index c089fdd14..d5b42caab 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 03c7ace4f..68b5c94ce 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") // }, -// 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") +// 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") // }, // } // @@ -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 - // 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 + // 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 // 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 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") +// 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") } 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.Cont Ctx: ctx, M: m, } - mock.lockSetNewMessage.Lock() - mock.calls.SetNewMessage = append(mock.calls.SetNewMessage, callInfo) - mock.lockSetNewMessage.Unlock() - return mock.SetNewMessageFunc(ctx, m) + mock.lockSetNewMessage_.Lock() + mock.calls.SetNewMessage_ = append(mock.calls.SetNewMessage_, callInfo) + mock.lockSetNewMessage_.Unlock() + return mock.SetNewMessage_Func(ctx, m) } -// SetNewMessageCalls gets all the calls that were made to SetNewMessage. +// SetNewMessage_Calls gets all the calls that were made to SetNewMessage_. // Check the length with: // -// len(mockedNexus.SetNewMessageCalls()) -func (mock *NexusMock) SetNewMessageCalls() []struct { +// len(mockedNexus.SetNewMessage_Calls()) +func (mock *NexusMock) SetNewMessage_Calls() []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) SetNewMessageCalls() []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 3a7c58e6d..ee3854dd5 100644 --- a/x/nexus/keeper/general_message.go +++ b/x/nexus/keeper/general_message.go @@ -8,7 +8,6 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" "github.com/axelarnetwork/axelar-core/utils" @@ -37,136 +36,6 @@ func (k Keeper) GenerateMessageID(ctx sdk.Context) (string, []byte, uint64) { return fmt.Sprintf("0x%s-%d", hex.EncodeToString(hash[:]), nonce), hash[:], nonce } -// SetNewWasmMessage sets the given general message from a wasm contract. -// Deprecated: use SetNewMessage_ instead -func (k Keeper) SetNewWasmMessage(ctx sdk.Context, msg exported.GeneralMessage) error { - if msg.Asset != nil { - return fmt.Errorf("asset transfer is not supported") - } - - if _, ok := k.GetChain(ctx, msg.GetDestinationChain()); !ok { - return fmt.Errorf("destination chain %s is not a registered chain", msg.GetDestinationChain()) - } - - if !k.IsChainActivated(ctx, msg.Recipient.Chain) { - return fmt.Errorf("destination chain %s is not activated", msg.GetDestinationChain()) - } - - if err := k.ValidateAddress(ctx, msg.Recipient); err != nil { - return sdkerrors.Wrap(err, "invalid recipient address") - } - - if _, ok := k.GetMessage(ctx, msg.ID); ok { - return fmt.Errorf("general message %s already exists", msg.ID) - } - - if err := k.setMessage(ctx, msg); err != nil { - return err - } - - switch msg.Status { - case exported.Approved: - funcs.MustNoErr(ctx.EventManager().EmitTypedEvent(&types.MessageReceived{ - ID: msg.ID, - PayloadHash: msg.PayloadHash, - Sender: msg.Sender, - Recipient: msg.Recipient, - })) - case exported.Processing: - if err := k.setProcessingMessageID(ctx, msg); err != nil { - return err - } - - funcs.MustNoErr(ctx.EventManager().EmitTypedEvent(&types.MessageProcessing{ID: msg.ID})) - default: - return fmt.Errorf("invalid message status %s", msg.Status) - } - - return nil -} - -// SetNewMessage sets the given general message. If the messages is approved, adds the message ID to approved messages store -// Deprecated: use SetNewMessage_ instead -func (k Keeper) SetNewMessage(ctx sdk.Context, m exported.GeneralMessage) error { - sourceChain, ok := k.GetChain(ctx, m.GetSourceChain()) - if !ok { - return fmt.Errorf("source chain %s is not a registered chain", m.GetSourceChain()) - } - - if err := k.ValidateAddress(ctx, m.Sender); err != nil { - return err - } - - destChain, ok := k.GetChain(ctx, m.GetDestinationChain()) - if !ok { - return fmt.Errorf("destination chain %s is not a registered chain", m.GetDestinationChain()) - } - - if err := k.ValidateAddress(ctx, m.Recipient); err != nil { - return err - } - - if m.Asset != nil { - if err := k.validateAsset(ctx, sourceChain, m.Asset.Denom); err != nil { - return err - } - - if err := k.validateAsset(ctx, destChain, m.Asset.Denom); err != nil { - return err - } - } - - if _, found := k.GetMessage(ctx, m.ID); found { - return fmt.Errorf("general message %s already exists", m.ID) - } - - if m.Is(exported.Processing) { - if err := k.setProcessingMessageID(ctx, m); err != nil { - return err - } - } - - funcs.MustNoErr(ctx.EventManager().EmitTypedEvent(&types.MessageReceived{ - ID: m.ID, - PayloadHash: m.PayloadHash, - Sender: m.Sender, - Recipient: m.Recipient, - })) - - return k.setMessage(ctx, m) -} - -/* - * Below are the valid message status transitions: - * Approved -> Processing - * Processing -> Executed - * Processing -> Failed - * Failed -> Processing - */ - -// SetMessageProcessing sets the general message as processing -// Deprecated: use SetMessageProcessing_ instead -func (k Keeper) SetMessageProcessing(ctx sdk.Context, id string) error { - m, found := k.GetMessage(ctx, id) - if !found { - return fmt.Errorf("general message %s not found", id) - } - - if !(m.Is(exported.Approved) || m.Is(exported.Failed)) { - return fmt.Errorf("general message is not approved or failed") - } - - m.Status = exported.Processing - - if err := k.setMessage(ctx, m); err != nil { - return err - } - - funcs.MustNoErr(ctx.EventManager().EmitTypedEvent(&types.MessageProcessing{ID: m.ID})) - - return k.setProcessingMessageID(ctx, m) -} - // SetMessageExecuted sets the general message as executed func (k Keeper) SetMessageExecuted(ctx sdk.Context, id string) error { m, found := k.GetMessage(ctx, id) diff --git a/x/nexus/keeper/general_message_test.go b/x/nexus/keeper/general_message_test.go index ec7ceab79..3df283f29 100644 --- a/x/nexus/keeper/general_message_test.go +++ b/x/nexus/keeper/general_message_test.go @@ -5,7 +5,6 @@ import ( "encoding/hex" "fmt" "testing" - "time" "github.com/CosmWasm/wasmd/x/wasm" sdk "github.com/cosmos/cosmos-sdk/types" @@ -14,7 +13,6 @@ import ( "github.com/axelarnetwork/axelar-core/app" "github.com/axelarnetwork/axelar-core/testutils/rand" - "github.com/axelarnetwork/axelar-core/utils" axelarnet "github.com/axelarnetwork/axelar-core/x/axelarnet/exported" evm "github.com/axelarnetwork/axelar-core/x/evm/exported" evmtypes "github.com/axelarnetwork/axelar-core/x/evm/types" @@ -22,7 +20,6 @@ import ( "github.com/axelarnetwork/axelar-core/x/nexus/exported" nexustestutils "github.com/axelarnetwork/axelar-core/x/nexus/exported/testutils" nexus "github.com/axelarnetwork/axelar-core/x/nexus/keeper" - "github.com/axelarnetwork/utils/funcs" . "github.com/axelarnetwork/utils/test" ) @@ -302,223 +299,6 @@ func TestSetMessageProcessing_(t *testing.T) { Run(t) } -func randWasmMsg(status exported.GeneralMessage_Status) exported.GeneralMessage { - return exported.GeneralMessage{ - ID: rand.NormalizedStr(10), - Sender: exported.CrossChainAddress{ - Chain: nexustestutils.RandomChain(), - Address: rand.NormalizedStr(42), - }, - Recipient: exported.CrossChainAddress{ - Chain: evm.Ethereum, - Address: evmtestutils.RandomAddress().Hex(), - }, - PayloadHash: evmtestutils.RandomHash().Bytes(), - Status: status, - Asset: nil, - SourceTxID: evmtestutils.RandomHash().Bytes(), - SourceTxIndex: uint64(rand.I64Between(0, 100)), - } -} - -func TestSetNewWasmMessage(t *testing.T) { - var ( - msg exported.GeneralMessage - ctx sdk.Context - keeper nexus.Keeper - ) - - cfg := app.MakeEncodingConfig() - givenKeeper := Given("the keeper", func() { - keeper, ctx = setup(cfg) - }) - - givenKeeper. - When("the message is valid", func() { - msg = randWasmMsg(exported.Approved) - }). - Branch( - When("the message contains token transfer", func() { - coin := rand.Coin() - msg.Asset = &coin - }). - Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewWasmMessage(ctx, msg), "asset transfer is not supported") - }), - - When("the destination chain is not registered", func() { - msg.Recipient.Chain = nexustestutils.RandomChain() - }). - Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewWasmMessage(ctx, msg), "is not a registered chain") - }), - - When("the destination chain is not activated", func() { - keeper.DeactivateChain(ctx, msg.Recipient.Chain) - }). - Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewWasmMessage(ctx, msg), "is not activated") - }), - - When("the recipient address is invalid", func() { - msg.Recipient.Address = rand.Str(20) - }). - Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewWasmMessage(ctx, msg), "invalid recipient address") - }), - - When("the message already exists", func() { - keeper.SetNewWasmMessage(ctx, msg) - }). - Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewWasmMessage(ctx, msg), "already exists") - }), - - When("the message is invalid", func() { - msg.Sender.Address = "" - }). - Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewWasmMessage(ctx, msg), "invalid source chain: invalid address: string is empty") - }), - - When("the message status is invalid", func() { - msg.Status = exported.Failed - }). - Then("should return error", func(t *testing.T) { - assert.ErrorContains(t, keeper.SetNewWasmMessage(ctx, msg), "invalid message status") - }), - ). - Run(t) - - givenKeeper. - Branch( - When("the message status is approved", func() { - msg = randWasmMsg(exported.Approved) - }). - Then("should be stored as approved and emit MessageReceived event", func(t *testing.T) { - assert.NoError(t, keeper.SetNewWasmMessage(ctx, msg)) - - actual, ok := keeper.GetMessage(ctx, msg.ID) - assert.True(t, ok) - assert.Equal(t, msg, actual) - assert.Equal(t, "axelar.nexus.v1beta1.MessageReceived", ctx.EventManager().Events()[len(ctx.EventManager().Events())-1].Type) - }), - - When("the message status is processing", func() { - msg = randWasmMsg(exported.Processing) - }). - Then("should be stored as processing and emit MessageProcessing event", func(t *testing.T) { - assert.NoError(t, keeper.SetNewWasmMessage(ctx, msg)) - - actual, ok := keeper.GetMessage(ctx, msg.ID) - assert.True(t, ok) - assert.Equal(t, msg, actual) - assert.Equal(t, "axelar.nexus.v1beta1.MessageProcessing", ctx.EventManager().Events()[len(ctx.EventManager().Events())-1].Type) - assert.Equal(t, msg, keeper.GetProcessingMessages(ctx, msg.GetDestinationChain(), 1)[0]) - }), - ). - Run(t) -} - -func TestSetNewGeneralMessage(t *testing.T) { - var ( - generalMessage exported.GeneralMessage - ctx sdk.Context - k nexus.Keeper - ) - cfg := app.MakeEncodingConfig() - sourceChain := nexustestutils.RandomChain() - sourceChain.Module = evmtypes.ModuleName - destinationChain := nexustestutils.RandomChain() - asset := rand.Coin() - - givenContractCallEvent := Given("a general message with token", func() { - k, ctx = setup(cfg) - generalMessage = exported.GeneralMessage{ - ID: fmt.Sprintf("%s-%d", evmtestutils.RandomHash().Hex(), rand.PosI64()), - - Sender: exported.CrossChainAddress{ - Chain: sourceChain, - Address: evmtestutils.RandomAddress().Hex(), - }, - Recipient: exported.CrossChainAddress{ - Chain: destinationChain, - Address: genCosmosAddr(destinationChain.Name.String()), - }, - Status: exported.Approved, - PayloadHash: crypto.Keccak256Hash(rand.Bytes(int(rand.I64Between(1, 100)))).Bytes(), - Asset: &asset, - } - }) - - whenChainsAreRegistered := givenContractCallEvent. - When("the source and destination chains are registered", func() { - k.SetChain(ctx, sourceChain) - k.SetChain(ctx, destinationChain) - }) - - errorWith := func(msg string) func(t *testing.T) { - return func(t *testing.T) { - assert.ErrorContains(t, k.SetNewMessage(ctx, generalMessage), msg) - } - } - - isCosmosChain := func(isCosmosChain bool) func() { - return func() { - if isCosmosChain { - destChain := funcs.MustOk(k.GetChain(ctx, destinationChain.Name)) - destChain.Module = axelarnet.ModuleName - k.SetChain(ctx, destChain) - - generalMessage.Recipient.Chain.Module = axelarnet.ModuleName - } - } - } - - isAssetRegistered := func(isRegistered bool) func() { - return func() { - if isRegistered { - funcs.MustNoErr(k.RegisterAsset(ctx, sourceChain, exported.Asset{Denom: asset.Denom, IsNativeAsset: false}, utils.MaxUint, time.Hour)) - funcs.MustNoErr(k.RegisterAsset(ctx, destinationChain, exported.Asset{Denom: asset.Denom, IsNativeAsset: false}, utils.MaxUint, time.Hour)) - } - } - } - - givenContractCallEvent. - When("the source chain is not registered", func() {}). - Then("should return error", errorWith(fmt.Sprintf("source chain %s is not a registered chain", sourceChain.Name))). - Run(t) - - givenContractCallEvent. - When("the destination chain is not registered", func() { - k.SetChain(ctx, sourceChain) - }). - Then("should return error", errorWith(fmt.Sprintf("destination chain %s is not a registered chain", destinationChain.Name))). - Run(t) - - whenChainsAreRegistered. - When("address validator for destination chain is set", isCosmosChain(true)). - When("destination address is invalid", func() { - generalMessage.Recipient.Address = rand.Str(20) - }). - Then("should return error", errorWith("decoding bech32 failed")). - Run(t) - - whenChainsAreRegistered. - When("address validator for destination chain is set", isCosmosChain(true)). - When("asset is not registered", isAssetRegistered(false)). - Then("should return error", errorWith("does not support foreign asset")). - Run(t) - - whenChainsAreRegistered. - When("address validator for destination chain is set", isCosmosChain(true)). - When("asset is registered", isAssetRegistered(true)). - Then("should succeed", func(t *testing.T) { - assert.NoError(t, k.SetNewMessage(ctx, generalMessage)) - }). - Run(t) -} - func TestGenerateMessageID(t *testing.T) { var ( ctx sdk.Context @@ -547,7 +327,6 @@ func TestGenerateMessageID(t *testing.T) { } func TestStatusTransitions(t *testing.T) { - cfg := app.MakeEncodingConfig() k, ctx := setup(cfg) sourceChain := nexustestutils.RandomChain() @@ -567,19 +346,21 @@ func TestStatusTransitions(t *testing.T) { } k.SetChain(ctx, sourceChain) k.SetChain(ctx, destinationChain) + k.ActivateChain(ctx, sourceChain) + k.ActivateChain(ctx, destinationChain) // Message doesn't exist, can't set any status 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) @@ -588,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) @@ -600,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) @@ -609,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") } @@ -632,10 +413,8 @@ func TestGetMessage(t *testing.T) { SourceTxID: txID, SourceTxIndex: nonce, } - k.SetChain(ctx, sourceChain) - k.SetChain(ctx, destinationChain) - err := k.SetNewMessage(ctx, msg) + err := k.SetNewMessage_(ctx, msg) assert.NoError(t, err) exp, found := k.GetMessage(ctx, msg.ID) @@ -644,7 +423,6 @@ func TestGetMessage(t *testing.T) { } func TestGetSentMessages(t *testing.T) { - cfg := app.MakeEncodingConfig() k, ctx := setup(cfg) sourceChain := nexustestutils.RandomChain() @@ -653,9 +431,10 @@ func TestGetSentMessages(t *testing.T) { destinationChain.Module = evmtypes.ModuleName k.SetChain(ctx, sourceChain) k.SetChain(ctx, destinationChain) + k.ActivateChain(ctx, sourceChain) + k.ActivateChain(ctx, destinationChain) makeSentMessages := func(numMsgs int, destChainName exported.ChainName) map[string]exported.GeneralMessage { - msgs := make(map[string]exported.GeneralMessage) for i := 0; i < numMsgs; i++ { @@ -679,8 +458,22 @@ func TestGetSentMessages(t *testing.T) { } enqueueMsgs := func(msgs map[string]exported.GeneralMessage) { for _, msg := range msgs { - err := k.SetNewMessage(ctx, msg) - assert.NoError(t, err) + status := msg.Status + + msg.Status = exported.Approved + assert.NoError(t, k.SetNewMessage_(ctx, msg)) + + switch status { + case exported.Processing: + assert.NoError(t, k.SetMessageProcessing_(ctx, msg.ID)) + case exported.Executed: + 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.SetMessageFailed(ctx, msg.ID)) + default: + } } } @@ -753,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) @@ -763,31 +556,36 @@ func TestGetSentMessages(t *testing.T) { assert.Equal(t, msg, ret) // add multiple destinations, make sure routing works - dest2 := exported.ChainName(rand.Str(5)) - k.SetChain(ctx, exported.Chain{ - Name: dest2, + chain2 := exported.Chain{ + Name: exported.ChainName(rand.Str(5)), SupportsForeignAssets: true, KeyType: 0, Module: "evm", - }) - dest3 := exported.ChainName(rand.Str(5)) - k.SetChain(ctx, exported.Chain{ - Name: dest3, + } + k.SetChain(ctx, chain2) + k.ActivateChain(ctx, chain2) + + chain3 := exported.Chain{ + Name: exported.ChainName(rand.Str(5)), SupportsForeignAssets: true, KeyType: 0, Module: "evm", - }) - dest4 := exported.ChainName(rand.Str(5)) - k.SetChain(ctx, exported.Chain{ - Name: dest4, + } + k.SetChain(ctx, chain3) + k.ActivateChain(ctx, chain3) + + chain4 := exported.Chain{ + Name: exported.ChainName(rand.Str(5)), SupportsForeignAssets: true, KeyType: 0, Module: "evm", - }) + } + k.SetChain(ctx, chain4) + k.ActivateChain(ctx, chain4) - dest2Msgs := makeSentMessages(10, dest2) - dest3Msgs := makeSentMessages(10, dest3) - dest4Msgs := makeSentMessages(10, dest4) + dest2Msgs := makeSentMessages(10, chain2.Name) + dest3Msgs := makeSentMessages(10, chain3.Name) + dest4Msgs := makeSentMessages(10, chain4.Name) enqueueMsgs(dest2Msgs) enqueueMsgs(dest3Msgs) @@ -795,7 +593,7 @@ func TestGetSentMessages(t *testing.T) { checkForExistence(dest2Msgs) checkForExistence(dest3Msgs) checkForExistence(dest4Msgs) - assert.Equal(t, dest2Msgs, toMap(consumeSent(dest2, 100))) - assert.Equal(t, dest3Msgs, toMap(consumeSent(dest3, 100))) - assert.Equal(t, dest4Msgs, toMap(consumeSent(dest4, 100))) + assert.Equal(t, dest2Msgs, toMap(consumeSent(chain2.Name, 100))) + assert.Equal(t, dest3Msgs, toMap(consumeSent(chain3.Name, 100))) + assert.Equal(t, dest4Msgs, toMap(consumeSent(chain4.Name, 100))) } diff --git a/x/nexus/keeper/genesis.go b/x/nexus/keeper/genesis.go index b2e1215d4..2465539c0 100644 --- a/x/nexus/keeper/genesis.go +++ b/x/nexus/keeper/genesis.go @@ -93,7 +93,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { } for _, msg := range genState.Messages { - funcs.MustNoErr(k.SetNewMessage(ctx, msg)) + funcs.MustNoErr(k.setMessage(ctx, msg)) } utils.NewCounter[uint64](messageNonceKey, k.getStore(ctx)).Set(ctx, genState.MessageNonce) diff --git a/x/nexus/keeper/genesis_test.go b/x/nexus/keeper/genesis_test.go index d53da62d1..37d986ef0 100644 --- a/x/nexus/keeper/genesis_test.go +++ b/x/nexus/keeper/genesis_test.go @@ -205,7 +205,7 @@ func TestExportGenesisInitGenesis(t *testing.T) { id, _, _ := keeper.GenerateMessageID(ctx) msg := getRandomMessage(id) expected.Messages = append(expected.Messages, msg) - funcs.MustNoErr(keeper.SetNewMessage(ctx, msg)) + funcs.MustNoErr(keeper.setMessage(ctx, msg)) } expected.MessageNonce = uint64(messageCount) diff --git a/x/nexus/keeper/grpc_query_test.go b/x/nexus/keeper/grpc_query_test.go index 01dd80bfb..16a1bf275 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}) From 73bda70983ff60f5203fc92ddc3352c5befc94ce Mon Sep 17 00:00:00 2001 From: Sammy Liu Date: Wed, 1 Nov 2023 13:25:19 -0400 Subject: [PATCH 2/6] rename the new methods --- 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 } From 4e257dd35871e8a387c2b678320f9a9d8d2163fe Mon Sep 17 00:00:00 2001 From: Sammy Liu Date: Wed, 1 Nov 2023 13:28:03 -0400 Subject: [PATCH 3/6] Revert "rename the new methods" This reverts commit 73bda70983ff60f5203fc92ddc3352c5befc94ce. --- 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 73a585c91..d055f18fa 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 a9a1f3ba2..8cb0fce79 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 edf2e57c8..0120bfd11 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 }, - SetMessageProcessingFunc: func(sdk.Context, string) error { + SetMessageProcessing_Func: func(sdk.Context, string) error { return nil }, } @@ -1267,7 +1267,7 @@ func TestHandleCallContract(t *testing.T) { }) whenSetNewMessageSucceeds := When("set new message succeeds", func() { - nexusK.SetNewMessageFunc = func(_ sdk.Context, m nexus.GeneralMessage) error { + nexusK.SetNewMessage_Func = 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.SetNewMessageFunc = func(_ sdk.Context, m nexus.GeneralMessage) error { + nexusK.SetNewMessage_Func = 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 fb4853b90..f917baf4b 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 1232fef7a..ab4dfc52c 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{ - SetNewMessageFunc: func(ctx sdk.Context, msg nexus.GeneralMessage) error { + SetNewMessage_Func: 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{ - SetNewMessageFunc: func(ctx sdk.Context, msg nexus.GeneralMessage) error { + SetNewMessage_Func: 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{ - SetNewMessageFunc: func(sdk.Context, nexus.GeneralMessage) error { return nil }, + SetNewMessage_Func: 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 b09d0e771..3d256d93e 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 6fd24e790..344078edd 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") // }, -// SetMessageProcessingFunc: func(ctx cosmossdktypes.Context, id string) error { -// panic("mock out the SetMessageProcessing method") +// SetMessageProcessing_Func: func(ctx cosmossdktypes.Context, id string) error { +// panic("mock out the SetMessageProcessing_ method") // }, -// SetNewMessageFunc: func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { -// panic("mock out the SetNewMessage method") +// SetNewMessage_Func: 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 - // SetMessageProcessingFunc mocks the SetMessageProcessing method. - SetMessageProcessingFunc func(ctx cosmossdktypes.Context, id string) error + // SetMessageProcessing_Func mocks the SetMessageProcessing_ method. + SetMessageProcessing_Func func(ctx cosmossdktypes.Context, id string) error - // SetNewMessageFunc mocks the SetNewMessage method. - SetNewMessageFunc func(ctx cosmossdktypes.Context, m github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error + // SetNewMessage_Func mocks the SetNewMessage_ method. + SetNewMessage_Func 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 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") +// 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") } callInfo := struct { Ctx cosmossdktypes.Context @@ -1653,17 +1653,17 @@ func (mock *NexusMock) SetMessageProcessing(ctx cosmossdktypes.Context, id strin Ctx: ctx, ID: id, } - mock.lockSetMessageProcessing.Lock() - mock.calls.SetMessageProcessing = append(mock.calls.SetMessageProcessing, callInfo) - mock.lockSetMessageProcessing.Unlock() - return mock.SetMessageProcessingFunc(ctx, id) + mock.lockSetMessageProcessing_.Lock() + mock.calls.SetMessageProcessing_ = append(mock.calls.SetMessageProcessing_, callInfo) + mock.lockSetMessageProcessing_.Unlock() + return mock.SetMessageProcessing_Func(ctx, id) } -// SetMessageProcessingCalls gets all the calls that were made to SetMessageProcessing. +// SetMessageProcessing_Calls gets all the calls that were made to SetMessageProcessing_. // Check the length with: // -// len(mockedNexus.SetMessageProcessingCalls()) -func (mock *NexusMock) SetMessageProcessingCalls() []struct { +// len(mockedNexus.SetMessageProcessing_Calls()) +func (mock *NexusMock) SetMessageProcessing_Calls() []struct { Ctx cosmossdktypes.Context ID string } { @@ -1671,16 +1671,16 @@ func (mock *NexusMock) SetMessageProcessingCalls() []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 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") +// 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") } callInfo := struct { Ctx cosmossdktypes.Context @@ -1689,17 +1689,17 @@ func (mock *NexusMock) SetNewMessage(ctx cosmossdktypes.Context, m github_com_ax Ctx: ctx, M: m, } - mock.lockSetNewMessage.Lock() - mock.calls.SetNewMessage = append(mock.calls.SetNewMessage, callInfo) - mock.lockSetNewMessage.Unlock() - return mock.SetNewMessageFunc(ctx, m) + mock.lockSetNewMessage_.Lock() + mock.calls.SetNewMessage_ = append(mock.calls.SetNewMessage_, callInfo) + mock.lockSetNewMessage_.Unlock() + return mock.SetNewMessage_Func(ctx, m) } -// SetNewMessageCalls gets all the calls that were made to SetNewMessage. +// SetNewMessage_Calls gets all the calls that were made to SetNewMessage_. // Check the length with: // -// len(mockedNexus.SetNewMessageCalls()) -func (mock *NexusMock) SetNewMessageCalls() []struct { +// len(mockedNexus.SetNewMessage_Calls()) +func (mock *NexusMock) SetNewMessage_Calls() []struct { Ctx cosmossdktypes.Context M github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } { @@ -1707,9 +1707,9 @@ func (mock *NexusMock) SetNewMessageCalls() []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 a48a25f6e..c0bab258d 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 7891318a9..8f4b8a31e 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.SetNewMessageFunc = func(sdk.Context, nexus.GeneralMessage) error { + n.SetNewMessage_Func = 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.SetNewMessageCalls(), 1) + assert.Len(t, n.SetNewMessage_Calls(), 1) }). Run(t) } diff --git a/x/evm/types/expected_keepers.go b/x/evm/types/expected_keepers.go index c089fdd14..d5b42caab 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 41c4563b6..68b5c94ce 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") // }, -// 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") +// 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") // }, // } // @@ -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 - // 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 + // 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 // 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 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") +// 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") } 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.Cont Ctx: ctx, M: m, } - mock.lockSetNewMessage.Lock() - mock.calls.SetNewMessage = append(mock.calls.SetNewMessage, callInfo) - mock.lockSetNewMessage.Unlock() - return mock.SetNewMessageFunc(ctx, m) + mock.lockSetNewMessage_.Lock() + mock.calls.SetNewMessage_ = append(mock.calls.SetNewMessage_, callInfo) + mock.lockSetNewMessage_.Unlock() + return mock.SetNewMessage_Func(ctx, m) } -// SetNewMessageCalls gets all the calls that were made to SetNewMessage. +// SetNewMessage_Calls gets all the calls that were made to SetNewMessage_. // Check the length with: // -// len(mockedNexus.SetNewMessageCalls()) -func (mock *NexusMock) SetNewMessageCalls() []struct { +// len(mockedNexus.SetNewMessage_Calls()) +func (mock *NexusMock) SetNewMessage_Calls() []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) SetNewMessageCalls() []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 1132cf654..ee3854dd5 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) erro 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 d1fc8409c..3df283f29 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 01dd80bfb..16a1bf275 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 0dc117a40..e64995211 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 406deda4e..83c9401a6 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.SetNewMessageFunc = func(_ sdk.Context, _ exported.GeneralMessage) error { + nexus.SetNewMessage_Func = 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.SetNewMessageFunc = func(_ sdk.Context, msg exported.GeneralMessage) error { + nexus.SetNewMessage_Func = func(_ sdk.Context, msg exported.GeneralMessage) error { return nil } - nexus.SetMessageProcessingFunc = func(ctx sdk.Context, id string) error { return nil } + nexus.SetMessageProcessing_Func = 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.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.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.Empty(t, nexus.SetMessageProcessingCalls()) + assert.Empty(t, nexus.SetMessageProcessing_Calls()) }), 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.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.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.SetMessageProcessingCalls(), 1) - assert.Equal(t, nexus.SetNewMessageCalls()[0].Msg.ID, nexus.SetMessageProcessingCalls()[0].ID) + assert.Len(t, nexus.SetMessageProcessing_Calls(), 1) + assert.Equal(t, nexus.SetNewMessage_Calls()[0].Msg.ID, nexus.SetMessageProcessing_Calls()[0].ID) }), ). Run(t) diff --git a/x/nexus/types/expected_keepers.go b/x/nexus/types/expected_keepers.go index 8efd61991..f2f403bd4 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 66c130a91..4694e35f7 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") // }, -// SetMessageProcessingFunc: func(ctx cosmossdktypes.Context, id string) error { -// panic("mock out the SetMessageProcessing method") +// SetMessageProcessing_Func: func(ctx cosmossdktypes.Context, id string) error { +// panic("mock out the SetMessageProcessing_ method") // }, -// SetNewMessageFunc: func(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error { -// panic("mock out the SetNewMessage method") +// SetNewMessage_Func: 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 - // SetMessageProcessingFunc mocks the SetMessageProcessing method. - SetMessageProcessingFunc func(ctx cosmossdktypes.Context, id string) error + // SetMessageProcessing_Func mocks the SetMessageProcessing_ method. + SetMessageProcessing_Func func(ctx cosmossdktypes.Context, id string) error - // SetNewMessageFunc mocks the SetNewMessage method. - SetNewMessageFunc func(ctx cosmossdktypes.Context, msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage) error + // SetNewMessage_Func mocks the SetNewMessage_ method. + SetNewMessage_Func 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 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") +// 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") } callInfo := struct { Ctx cosmossdktypes.Context @@ -1077,17 +1077,17 @@ func (mock *NexusMock) SetMessageProcessing(ctx cosmossdktypes.Context, id strin Ctx: ctx, ID: id, } - mock.lockSetMessageProcessing.Lock() - mock.calls.SetMessageProcessing = append(mock.calls.SetMessageProcessing, callInfo) - mock.lockSetMessageProcessing.Unlock() - return mock.SetMessageProcessingFunc(ctx, id) + mock.lockSetMessageProcessing_.Lock() + mock.calls.SetMessageProcessing_ = append(mock.calls.SetMessageProcessing_, callInfo) + mock.lockSetMessageProcessing_.Unlock() + return mock.SetMessageProcessing_Func(ctx, id) } -// SetMessageProcessingCalls gets all the calls that were made to SetMessageProcessing. +// SetMessageProcessing_Calls gets all the calls that were made to SetMessageProcessing_. // Check the length with: // -// len(mockedNexus.SetMessageProcessingCalls()) -func (mock *NexusMock) SetMessageProcessingCalls() []struct { +// len(mockedNexus.SetMessageProcessing_Calls()) +func (mock *NexusMock) SetMessageProcessing_Calls() []struct { Ctx cosmossdktypes.Context ID string } { @@ -1095,16 +1095,16 @@ func (mock *NexusMock) SetMessageProcessingCalls() []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 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") +// 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") } 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.SetNewMessageFunc(ctx, msg) + mock.lockSetNewMessage_.Lock() + mock.calls.SetNewMessage_ = append(mock.calls.SetNewMessage_, callInfo) + mock.lockSetNewMessage_.Unlock() + return mock.SetNewMessage_Func(ctx, msg) } -// SetNewMessageCalls gets all the calls that were made to SetNewMessage. +// SetNewMessage_Calls gets all the calls that were made to SetNewMessage_. // Check the length with: // -// len(mockedNexus.SetNewMessageCalls()) -func (mock *NexusMock) SetNewMessageCalls() []struct { +// len(mockedNexus.SetNewMessage_Calls()) +func (mock *NexusMock) SetNewMessage_Calls() []struct { Ctx cosmossdktypes.Context Msg github_com_axelarnetwork_axelar_core_x_nexus_exported.GeneralMessage } { @@ -1131,9 +1131,9 @@ func (mock *NexusMock) SetNewMessageCalls() []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 } From 3a409f99fc44ead03d4b7dc5bd8c209a5e72feb5 Mon Sep 17 00:00:00 2001 From: Sammy Liu Date: Wed, 1 Nov 2023 13:29:15 -0400 Subject: [PATCH 4/6] 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 } From 72c282c5655f88c4a7f5745f574eb1ea8ab5674c Mon Sep 17 00:00:00 2001 From: Sammy Liu Date: Wed, 1 Nov 2023 13:34:04 -0400 Subject: [PATCH 5/6] replace NewGeneralMessage --- x/axelarnet/handler.go | 2 +- x/axelarnet/keeper/msg_server.go | 2 +- x/axelarnet/message_handler.go | 4 ++-- x/evm/abci.go | 4 ++-- x/evm/abci_test.go | 7 +++++-- x/evm/types/command_test.go | 2 +- x/nexus/exported/testutils/rand.go | 7 +++++-- x/nexus/exported/types.go | 19 ++----------------- x/nexus/keeper/msg_dispatcher.go | 2 +- 9 files changed, 20 insertions(+), 29 deletions(-) diff --git a/x/axelarnet/handler.go b/x/axelarnet/handler.go index 73a585c91..a467f9002 100644 --- a/x/axelarnet/handler.go +++ b/x/axelarnet/handler.go @@ -111,7 +111,7 @@ func NewProposalHandler(k keeper.Keeper, nexusK types.Nexus, accountK types.Acco payloadHash := crypto.Keccak256(contractCall.Payload) msgID, txID, nonce := nexusK.GenerateMessageID(ctx) - msg := nexus.NewGeneralMessage_(msgID, sender, recipient, payloadHash, txID, nonce, nil) + msg := nexus.NewGeneralMessage(msgID, sender, recipient, payloadHash, txID, nonce, nil) events.Emit(ctx, &types.ContractCallSubmitted{ MessageID: msg.ID, diff --git a/x/axelarnet/keeper/msg_server.go b/x/axelarnet/keeper/msg_server.go index a9a1f3ba2..651584261 100644 --- a/x/axelarnet/keeper/msg_server.go +++ b/x/axelarnet/keeper/msg_server.go @@ -76,7 +76,7 @@ func (s msgServer) CallContract(c context.Context, req *types.CallContractReques payloadHash := crypto.Keccak256(req.Payload) msgID, txID, nonce := s.nexus.GenerateMessageID(ctx) - msg := nexus.NewGeneralMessage_(msgID, sender, recipient, payloadHash, txID, nonce, nil) + msg := nexus.NewGeneralMessage(msgID, sender, recipient, payloadHash, txID, nonce, nil) events.Emit(ctx, &types.ContractCallSubmitted{ MessageID: msg.ID, diff --git a/x/axelarnet/message_handler.go b/x/axelarnet/message_handler.go index fb4853b90..8bc9322c8 100644 --- a/x/axelarnet/message_handler.go +++ b/x/axelarnet/message_handler.go @@ -246,7 +246,7 @@ func handleMessage(ctx sdk.Context, n types.Nexus, b types.BankKeeper, sourceAdd destChain := funcs.MustOk(n.GetChain(ctx, nexus.ChainName(msg.DestinationChain))) recipient := nexus.CrossChainAddress{Chain: destChain, Address: msg.DestinationAddress} - m := nexus.NewGeneralMessage_( + m := nexus.NewGeneralMessage( id, sourceAddress, recipient, @@ -283,7 +283,7 @@ func handleMessageWithToken(ctx sdk.Context, n types.Nexus, b types.BankKeeper, destChain := funcs.MustOk(n.GetChain(ctx, nexus.ChainName(msg.DestinationChain))) recipient := nexus.CrossChainAddress{Chain: destChain, Address: msg.DestinationAddress} - m := nexus.NewGeneralMessage_( + m := nexus.NewGeneralMessage( id, sourceAddress, recipient, diff --git a/x/evm/abci.go b/x/evm/abci.go index a48a25f6e..c2c593381 100644 --- a/x/evm/abci.go +++ b/x/evm/abci.go @@ -214,7 +214,7 @@ func setMessageToNexus(ctx sdk.Context, n types.Nexus, event types.Event, asset Address: e.ContractCall.ContractAddress, } - message = nexus.NewGeneralMessage_( + message = nexus.NewGeneralMessage( string(event.GetID()), sender, recipient, @@ -239,7 +239,7 @@ func setMessageToNexus(ctx sdk.Context, n types.Nexus, event types.Event, asset Address: e.ContractCallWithToken.ContractAddress, } - message = nexus.NewGeneralMessage_( + message = nexus.NewGeneralMessage( string(event.GetID()), sender, recipient, diff --git a/x/evm/abci_test.go b/x/evm/abci_test.go index 7891318a9..01f2a1c59 100644 --- a/x/evm/abci_test.go +++ b/x/evm/abci_test.go @@ -66,7 +66,7 @@ func TestHandleGeneralMessage(t *testing.T) { asset := rand.Coin() givenMessage := Given("a message", func() { - msg = nexus.NewGeneralMessage(evmTestUtils.RandomHash().Hex(), sender, receiver, evmCrypto.Keccak256(payload), nexus.Approved, evmTestUtils.RandomHash().Bytes()[:], uint64(rand.I64Between(0, 10000)), nil) + msg = nexus.NewGeneralMessage(evmTestUtils.RandomHash().Hex(), sender, receiver, evmCrypto.Keccak256(payload), evmTestUtils.RandomHash().Bytes()[:], uint64(rand.I64Between(0, 10000)), nil) ctx, _, n, multisigKeeper, _, destinationCk = setup() n.SetMessageFailedFunc = func(ctx sdk.Context, id string) error { @@ -280,7 +280,10 @@ func TestHandleGeneralMessages(t *testing.T) { destChain.Module = types.ModuleName sender := nexus.CrossChainAddress{Chain: srcChain, Address: evmTestUtils.RandomAddress().Hex()} receiver := nexus.CrossChainAddress{Chain: destChain, Address: evmTestUtils.RandomAddress().Hex()} - msg := nexus.NewGeneralMessage(evmTestUtils.RandomHash().Hex(), sender, receiver, evmTestUtils.RandomHash().Bytes(), nexus.Processing, evmTestUtils.RandomHash().Bytes()[:], uint64(rand.I64Between(0, 10000)), nil) + + msg := nexus.NewGeneralMessage(evmTestUtils.RandomHash().Hex(), sender, receiver, evmTestUtils.RandomHash().Bytes(), evmTestUtils.RandomHash().Bytes()[:], uint64(rand.I64Between(0, 10000)), nil) + msg.Status = nexus.Processing + msgs = append(msgs, msg) } return msgs diff --git a/x/evm/types/command_test.go b/x/evm/types/command_test.go index a9ba25cad..607703ccb 100644 --- a/x/evm/types/command_test.go +++ b/x/evm/types/command_test.go @@ -37,7 +37,7 @@ func TestNewApproveContractCallCommandFromGeneralMessage(t *testing.T) { destChain := nexus.Chain{Name: nexus.ChainName(rand.StrBetween(8, 64)), Module: types.ModuleName} sender := nexus.CrossChainAddress{Chain: srcChain, Address: rand.AccAddr().String()} receiver := nexus.CrossChainAddress{Chain: destChain, Address: testutils.RandomAddress().Hex()} - msg := nexus.NewGeneralMessage(txID.Hex(), sender, receiver, payloadHash, nexus.Approved, txID[:], eventIndex, nil) + msg := nexus.NewGeneralMessage(txID.Hex(), sender, receiver, payloadHash, txID[:], eventIndex, nil) actual := types.NewApproveContractCallCommandGeneric(chainID, keyID, common.HexToAddress(msg.GetDestinationAddress()), common.BytesToHash(msg.PayloadHash), common.BytesToHash(msg.SourceTxID), msg.GetSourceChain(), msg.GetSourceAddress(), msg.SourceTxIndex, msg.ID) diff --git a/x/nexus/exported/testutils/rand.go b/x/nexus/exported/testutils/rand.go index 7e9085d9b..0879fcbd9 100644 --- a/x/nexus/exported/testutils/rand.go +++ b/x/nexus/exported/testutils/rand.go @@ -45,14 +45,17 @@ func RandomMessage(statuses ...exported.GeneralMessage_Status) exported.GeneralM statuses = []exported.GeneralMessage_Status{exported.Approved, exported.Processing, exported.Executed, exported.Failed} } coin := rand.Coin() - return exported.NewGeneralMessage( + + msg := exported.NewGeneralMessage( rand.StrBetween(10, 20), RandomCrossChainAddress(), RandomCrossChainAddress(), rand.Bytes(32), - rand.Of(statuses...), rand.Bytes(32), uint64(rand.I64Between(0, 10000)), &coin, ) + msg.Status = rand.Of(statuses...) + + return msg } diff --git a/x/nexus/exported/types.go b/x/nexus/exported/types.go index 5431f3b08..cb5a89015 100644 --- a/x/nexus/exported/types.go +++ b/x/nexus/exported/types.go @@ -240,23 +240,8 @@ func (m TransferDirection) ValidateBasic() error { } } -// NewGeneralMessage returns a GeneralMessage struct -// Deprecated: use NewGeneralMessage_ instead -func NewGeneralMessage(id string, sender CrossChainAddress, recipient CrossChainAddress, payloadHash []byte, status GeneralMessage_Status, sourceTxID []byte, sourceTxIndex uint64, asset *sdk.Coin) GeneralMessage { - return GeneralMessage{ - ID: id, - Sender: sender, - Recipient: recipient, - PayloadHash: payloadHash, - Status: status, - Asset: asset, - SourceTxID: sourceTxID, - SourceTxIndex: sourceTxIndex, - } -} - -// NewGeneralMessage_ returns a GeneralMessage struct with status set to approved -func NewGeneralMessage_(id string, sender CrossChainAddress, recipient CrossChainAddress, payloadHash []byte, sourceTxID []byte, sourceTxIndex uint64, asset *sdk.Coin) GeneralMessage { +// NewGeneralMessage returns a GeneralMessage struct with status set to approved +func NewGeneralMessage(id string, sender CrossChainAddress, recipient CrossChainAddress, payloadHash []byte, sourceTxID []byte, sourceTxIndex uint64, asset *sdk.Coin) GeneralMessage { return GeneralMessage{ ID: id, Sender: sender, diff --git a/x/nexus/keeper/msg_dispatcher.go b/x/nexus/keeper/msg_dispatcher.go index 0dc117a40..5758fb2cf 100644 --- a/x/nexus/keeper/msg_dispatcher.go +++ b/x/nexus/keeper/msg_dispatcher.go @@ -67,7 +67,7 @@ func (m Messenger) routeMsg(ctx sdk.Context, msg exported.WasmMessage) error { sender := exported.CrossChainAddress{Chain: sourceChain, Address: msg.SourceAddress} recipient := exported.CrossChainAddress{Chain: destinationChain, Address: msg.DestinationAddress} - nexusMsg := exported.NewGeneralMessage_(id, sender, recipient, msg.PayloadHash, msg.SourceTxID, msg.SourceTxIndex, nil) + nexusMsg := exported.NewGeneralMessage(id, sender, recipient, msg.PayloadHash, msg.SourceTxID, msg.SourceTxIndex, nil) if err := m.Nexus.SetNewMessage(ctx, nexusMsg); err != nil { return err } From cff94c6c00251ef94543bf636d546ea859979e13 Mon Sep 17 00:00:00 2001 From: Sammy Liu Date: Wed, 1 Nov 2023 13:42:02 -0400 Subject: [PATCH 6/6] make generate --- x/axelarnet/types/mock/expected_keepers.go | 4 ++-- x/evm/types/mock/expected_keepers.go | 2 +- x/nexus/types/mock/expected_keepers.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x/axelarnet/types/mock/expected_keepers.go b/x/axelarnet/types/mock/expected_keepers.go index 6fd24e790..8c8bcac98 100644 --- a/x/axelarnet/types/mock/expected_keepers.go +++ b/x/axelarnet/types/mock/expected_keepers.go @@ -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 } diff --git a/x/evm/types/mock/expected_keepers.go b/x/evm/types/mock/expected_keepers.go index 41c4563b6..03c7ace4f 100644 --- a/x/evm/types/mock/expected_keepers.go +++ b/x/evm/types/mock/expected_keepers.go @@ -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. diff --git a/x/nexus/types/mock/expected_keepers.go b/x/nexus/types/mock/expected_keepers.go index 66c130a91..d4a309a16 100644 --- a/x/nexus/types/mock/expected_keepers.go +++ b/x/nexus/types/mock/expected_keepers.go @@ -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 }