test fixes 2

testutil/keeper/authority.go

@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/zeta-chain/zetacore/pkg/chains"
 	"github.com/zeta-chain/zetacore/testutil/sample"
 	"github.com/zeta-chain/zetacore/x/authority/keeper"
 	"github.com/zeta-chain/zetacore/x/authority/types"
@@ -79,6 +80,16 @@ func MockCheckAuthorization(m *mock.Mock, msg sdk.Msg, authorizationResult error
 	m.On("CheckAuthorization", mock.Anything, msg).Return(authorizationResult).Once()
 }
 
+// MockGetChainList mocks the GetChainList method of the authority keeper.
+func MockGetChainList(m *mock.Mock, chainList []chains.Chain) {
+	m.On("GetChainList", mock.Anything).Return(chainList).Once()
+}
+
+// MockGetChainListEmpty mocks the GetChainList method of the authority keeper.
+func MockGetChainListEmpty(m *mock.Mock) {
+	m.On("GetChainList", mock.Anything).Return([]chains.Chain{})
+}
+
 func SetAdminPolicies(ctx sdk.Context, ak *keeper.Keeper) string {
 	admin := sample.AccAddress()
 	ak.SetPolicies(ctx, types.Policies{Items: []*types.Policy{

x/authority/keeper/grpc_query_chain_info_test.go

@@ -22,10 +22,12 @@ func TestKeeper_ChainInfo(t *testing.T) {
 	t.Run("chain info not found", func(t *testing.T) {
 		k, ctx := keepertest.AuthorityKeeper(t)
 
-		chainInfo, err := k.ChainInfo(ctx, &types.QueryGetChainInfoRequest{})
+		res, err := k.ChainInfo(ctx, &types.QueryGetChainInfoRequest{})
 		require.NoError(t, err)
-		require.Equal(t, chainInfo, types.ChainInfo{
-			Chains: []chains.Chain{},
+		require.Equal(t, res, &types.QueryGetChainInfoResponse{
+			ChainInfo: types.ChainInfo{
+				Chains: []chains.Chain{},
+			},
 		})
 	})
 

x/crosschain/keeper/evm_hooks_test.go

@@ -317,7 +317,7 @@ func TestKeeper_ProcessZRC20WithdrawalEvent(t *testing.T) {
 		ctx = ctx.WithChainID("test_21-1")
 
 		err = k.ProcessZRC20WithdrawalEvent(ctx, event, emittingContract, txOrigin.Hex())
-		require.ErrorContains(t, err, "failed to convert chainID: chain 21 not found")
+		require.ErrorContains(t, err, "failed to convert chainID")
 		require.Empty(t, k.GetAllCrossChainTx(ctx))
 	})
 

x/crosschain/keeper/msg_server_add_outbound_tracker_test.go

@@ -359,6 +359,7 @@ func TestMsgServer_AddToOutboundTracker(t *testing.T) {
 			Nonce:     42,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, authoritytypes.ErrUnauthorized)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.AddOutboundTracker(ctx, &msg)
 		require.NoError(t, err)
 		tracker, found := k.GetOutboundTracker(ctx, chainID, 42)
@@ -418,6 +419,7 @@ func TestMsgServer_AddToOutboundTracker(t *testing.T) {
 			Nonce:     42,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, authoritytypes.ErrUnauthorized)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.AddOutboundTracker(ctx, &msg)
 		require.NoError(t, err)
 		tracker, found := k.GetOutboundTracker(ctx, chainID, 42)
@@ -500,6 +502,7 @@ func TestMsgServer_AddToOutboundTracker(t *testing.T) {
 			Nonce:     42,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, authoritytypes.ErrUnauthorized)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.AddOutboundTracker(ctx, &msg)
 		require.ErrorIs(t, err, observertypes.ErrTssNotFound)
 	})
@@ -541,6 +544,7 @@ func TestMsgServer_AddToOutboundTracker(t *testing.T) {
 			Nonce:     42,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, authoritytypes.ErrUnauthorized)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.AddOutboundTracker(ctx, &msg)
 		require.ErrorIs(t, err, types.ErrTxBodyVerificationFail)
 	})

x/crosschain/keeper/msg_server_migrate_tss_funds_test.go

@@ -108,6 +108,7 @@ func TestKeeper_MigrateTSSFundsForChain(t *testing.T) {
 			Amount:  amount,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.MigrateTssFunds(ctx, &msg)
 		require.NoError(t, err)
 		hash := crypto.Keccak256Hash([]byte(indexString))
@@ -141,6 +142,7 @@ func TestKeeper_MigrateTSSFundsForChain(t *testing.T) {
 			Amount:  amount,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.MigrateTssFunds(ctx, &msg)
 		require.NoError(t, err)
 		hash := crypto.Keccak256Hash([]byte(indexString))
@@ -376,6 +378,7 @@ func TestMsgServer_MigrateTssFunds(t *testing.T) {
 			Amount:  amount,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.MigrateTssFunds(ctx, &msg)
 		require.NoError(t, err)
 		hash := crypto.Keccak256Hash([]byte(indexString))
@@ -406,6 +409,7 @@ func TestMsgServer_MigrateTssFunds(t *testing.T) {
 			Amount:  amount,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.MigrateTssFunds(ctx, &msg)
 		require.ErrorContains(t, err, crosschaintypes.ErrCannotMigrateTssFunds.Error())
 		hash := crypto.Keccak256Hash([]byte(indexString))
@@ -507,6 +511,7 @@ func TestMsgServer_MigrateTssFunds(t *testing.T) {
 			Amount:  amount,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.MigrateTssFunds(ctx, &msg)
 		require.ErrorIs(t, err, crosschaintypes.ErrCannotMigrateTssFunds)
 		require.ErrorContains(t, err, "cannot migrate funds while there are pending migrations")

x/crosschain/keeper/msg_server_refund_aborted_tx_test.go

@@ -116,6 +116,7 @@ func TestMsgServer_RefundAbortedCCTX(t *testing.T) {
 			RefundAddress: cctx.InboundParams.Sender,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.RefundAbortedCCTX(ctx, &msg)
 		require.NoError(t, err)
 
@@ -160,6 +161,7 @@ func TestMsgServer_RefundAbortedCCTX(t *testing.T) {
 			RefundAddress: cctx.InboundParams.Sender,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.RefundAbortedCCTX(ctx, &msg)
 		require.NoError(t, err)
 
@@ -274,6 +276,7 @@ func TestMsgServer_RefundAbortedCCTX(t *testing.T) {
 			RefundAddress: refundAddress.String(),
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.RefundAbortedCCTX(ctx, &msg)
 		require.NoError(t, err)
 
@@ -325,6 +328,7 @@ func TestMsgServer_RefundAbortedCCTX(t *testing.T) {
 			RefundAddress: cctx.InboundParams.Sender,
 		}
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, &msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.RefundAbortedCCTX(ctx, &msg)
 		require.NoError(t, err)
 

x/crosschain/keeper/msg_server_vote_inbound_tx_test.go

@@ -53,10 +53,10 @@ func TestKeeper_VoteInbound(t *testing.T) {
 		to, from := int64(1337), int64(101)
 		supportedChains := zk.ObserverKeeper.GetSupportedChains(ctx)
 		for _, chain := range supportedChains {
-			if chains.IsEVMChain(chain.ChainId) {
+			if chains.IsEVMChain(chain.ChainId, []chains.Chain{}) {
 				from = chain.ChainId
 			}
-			if chains.IsZetaChain(chain.ChainId) {
+			if chains.IsZetaChain(chain.ChainId, []chains.Chain{}) {
 				to = chain.ChainId
 			}
 		}
@@ -201,10 +201,10 @@ func TestKeeper_VoteInbound(t *testing.T) {
 		to, from := int64(1337), int64(101)
 		supportedChains := zk.ObserverKeeper.GetSupportedChains(ctx)
 		for _, chain := range supportedChains {
-			if chains.IsEVMChain(chain.ChainId) {
+			if chains.IsEVMChain(chain.ChainId, []chains.Chain{}) {
 				from = chain.ChainId
 			}
-			if chains.IsZetaChain(chain.ChainId) {
+			if chains.IsZetaChain(chain.ChainId, []chains.Chain{}) {
 				to = chain.ChainId
 			}
 		}

x/fungible/keeper/msg_server_deploy_fungible_coin_zrc20_test.go

@@ -42,6 +42,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) {
 			1000000,
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		res, err := msgServer.DeployFungibleCoinZRC20(ctx, msg)
 		require.NoError(t, err)
 		gasAddress := res.Address
@@ -174,6 +175,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) {
 			1000000,
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := keeper.NewMsgServerImpl(*k).DeployFungibleCoinZRC20(ctx, msg)
 		require.Error(t, err)
 		require.ErrorIs(t, err, observertypes.ErrSupportedChains)
@@ -203,6 +205,7 @@ func TestMsgServer_DeployFungibleCoinZRC20(t *testing.T) {
 			1000000,
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, deployMsg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 
 		// Attempt to deploy the same gas token twice should result in error
 		_, err := keeper.NewMsgServerImpl(*k).DeployFungibleCoinZRC20(ctx, deployMsg)

x/fungible/keeper/msg_server_remove_foreign_coin_test.go

@@ -36,6 +36,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) {
 
 		msg := types.NewMsgRemoveForeignCoin(admin, zrc20.Hex())
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.RemoveForeignCoin(ctx, msg)
 		require.NoError(t, err)
 		_, found = k.GetForeignCoins(ctx, zrc20.Hex())
@@ -59,6 +60,7 @@ func TestMsgServer_RemoveForeignCoin(t *testing.T) {
 
 		msg := types.NewMsgRemoveForeignCoin(admin, zrc20.Hex())
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, authoritytypes.ErrUnauthorized)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err := msgServer.RemoveForeignCoin(ctx, msg)
 		require.Error(t, err)
 		require.ErrorIs(t, err, authoritytypes.ErrUnauthorized)

x/fungible/keeper/msg_server_update_contract_bytecode_test.go

@@ -102,6 +102,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) {
 			codeHash,
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateContractBytecode(ctx, msg)
 		require.NoError(t, err)
 
@@ -147,6 +148,7 @@ func TestKeeper_UpdateContractBytecode(t *testing.T) {
 			codeHash,
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateContractBytecode(ctx, msg)
 		require.NoError(t, err)
 		balance, err = k.BalanceOfZRC4(ctx, zrc20, addr1)

x/fungible/keeper/msg_server_update_system_contract_test.go

@@ -77,6 +77,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) {
 		// can update the system contract
 		msg := types.NewMsgUpdateSystemContract(admin, newSystemContract.Hex())
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateSystemContract(ctx, msg)
 		require.NoError(t, err)
 
@@ -245,6 +246,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) {
 		// can't update the system contract
 		msg := types.NewMsgUpdateSystemContract(admin, newSystemContract.Hex())
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateSystemContract(ctx, msg)
 		require.ErrorIs(t, err, types.ErrContractCall)
 
@@ -255,6 +257,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) {
 		// can't update the system contract
 		msg = types.NewMsgUpdateSystemContract(admin, newSystemContract.Hex())
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateSystemContract(ctx, msg)
 		require.ErrorIs(t, err, types.ErrContractCall)
 
@@ -265,6 +268,7 @@ func TestKeeper_UpdateSystemContract(t *testing.T) {
 		// can't update the system contract
 		msg = types.NewMsgUpdateSystemContract(admin, newSystemContract.Hex())
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateSystemContract(ctx, msg)
 		require.ErrorIs(t, err, types.ErrContractCall)
 	})

x/fungible/keeper/msg_server_update_zrc20_withdraw_fee_test.go

@@ -49,6 +49,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) {
 			math.NewUint(42),
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateZRC20WithdrawFee(ctx, msg)
 		require.NoError(t, err)
 
@@ -68,6 +69,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) {
 			math.Uint{},
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateZRC20WithdrawFee(ctx, msg)
 		require.NoError(t, err)
 		protocolFee, err = k.QueryProtocolFlatFee(ctx, zrc20Addr)
@@ -85,6 +87,7 @@ func TestKeeper_UpdateZRC20WithdrawFee(t *testing.T) {
 			math.NewUint(44),
 		)
 		keepertest.MockCheckAuthorization(&authorityMock.Mock, msg, nil)
+		keepertest.MockGetChainListEmpty(&authorityMock.Mock)
 		_, err = msgServer.UpdateZRC20WithdrawFee(ctx, msg)
 		require.NoError(t, err)
 		protocolFee, err = k.QueryProtocolFlatFee(ctx, zrc20Addr)

zetaclient/chains/evm/observer/inbound.go

@@ -639,7 +639,10 @@ func (ob *Observer) BuildInboundVoteMsgForDepositedEvent(
 func (ob *Observer) BuildInboundVoteMsgForZetaSentEvent(
 	event *zetaconnector.ZetaConnectorNonEthZetaSent,
 ) *types.MsgVoteInbound {
-	destChain := chains.GetChainFromChainID(event.DestinationChainId.Int64(), ob.ZetacoreContext().GetAdditionalChains())
+	destChain := chains.GetChainFromChainID(
+		event.DestinationChainId.Int64(),
+		ob.ZetacoreContext().GetAdditionalChains(),
+	)
 	if destChain == nil {
 		ob.Logger().Inbound.Warn().Msgf("chain id not supported  %d", event.DestinationChainId.Int64())
 		return nil