Skip to content

Commit

Permalink
Revert "Revert "rename the new methods""
Browse files Browse the repository at this point in the history 
This reverts commit 4e257dd.
  • Loading branch information
@fish-sammy
fish-sammy committed Nov 1, 2023
1 parent 4e257dd commit 3a409f9
Show file tree
Hide file tree
Showing 18 changed files with 189 additions and 189 deletions.
2 changes: 1 addition & 1 deletion x/axelarnet/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
4 changes: 2 additions & 2 deletions x/axelarnet/keeper/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions x/axelarnet/keeper/msg_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
}
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -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")
}
}).
Expand Down
4 changes: 2 additions & 2 deletions x/axelarnet/message_handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions x/axelarnet/message_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions x/axelarnet/types/expected_keepers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
84 changes: 42 additions & 42 deletions x/axelarnet/types/mock/expected_keepers.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion x/evm/abci.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions x/evm/abci_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down Expand Up @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion x/evm/types/expected_keepers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 3a409f9

Please sign in to comment.