refactor(nexus): general message deprecated methods removal

axelarnetwork · Nov 1, 2023 · d79382d · d79382d
1 parent d47ac05
commit d79382d
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 518 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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