From 97d439e81e29f23ecc1c441835e77e0a58804f11 Mon Sep 17 00:00:00 2001
From: Thomas Nguy <thomas.nguy@crypto.com>
Date: Wed, 8 Sep 2021 10:36:23 +0900
Subject: [PATCH] fix conflict after rebase

---
 x/cronos/keeper/ibc.go            | 2 +-
 x/cronos/keeper/ibc_hooks_test.go | 3 +--
 x/cronos/keeper/ibc_test.go       | 3 +--
 x/cronos/keeper/params_test.go    | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/x/cronos/keeper/ibc.go b/x/cronos/keeper/ibc.go
index 89ba856f46..d45e665387 100644
--- a/x/cronos/keeper/ibc.go
+++ b/x/cronos/keeper/ibc.go
@@ -90,7 +90,7 @@ func (k Keeper) IbcTransferCoins(ctx sdk.Context, from, destination string, coin
 			amountToBurn := c.Amount.Sub(amount8decRem)
 			if amountToBurn.IsZero() {
 				// Amount too small
-				break
+				continue
 			}
 			coins := sdk.NewCoins(sdk.NewCoin(evmParams.EvmDenom, amountToBurn))
 
diff --git a/x/cronos/keeper/ibc_hooks_test.go b/x/cronos/keeper/ibc_hooks_test.go
index 50bb7aae4a..cf470993bd 100644
--- a/x/cronos/keeper/ibc_hooks_test.go
+++ b/x/cronos/keeper/ibc_hooks_test.go
@@ -7,7 +7,6 @@ import (
 	keepertest "github.com/crypto-org-chain/cronos/x/cronos/keeper/mock"
 	"github.com/crypto-org-chain/cronos/x/cronos/types"
 	"github.com/tharsis/ethermint/crypto/ethsecp256k1"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 func (suite *KeeperTestSuite) TestOnRecvTransfer() {
@@ -74,9 +73,9 @@ func (suite *KeeperTestSuite) TestOnRecvTransfer() {
 				suite.app.GetKey(types.StoreKey),
 				suite.app.GetKey(types.MemStoreKey),
 				suite.app.GetSubspace(types.ModuleName),
-				suite.app.GetSubspace(evmtypes.ModuleName),
 				suite.app.BankKeeper,
 				keepertest.IbcKeeperMock{},
+				suite.app.EvmKeeper,
 			)
 			suite.app.CronosKeeper = cronosKeeper
 
diff --git a/x/cronos/keeper/ibc_test.go b/x/cronos/keeper/ibc_test.go
index ffdc0bf17a..08ddc5edb0 100644
--- a/x/cronos/keeper/ibc_test.go
+++ b/x/cronos/keeper/ibc_test.go
@@ -8,7 +8,6 @@ import (
 	keepertest "github.com/crypto-org-chain/cronos/x/cronos/keeper/mock"
 	"github.com/crypto-org-chain/cronos/x/cronos/types"
 	"github.com/tharsis/ethermint/crypto/ethsecp256k1"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 func (suite *KeeperTestSuite) TestConvertVouchersToEvmCoins() {
@@ -195,9 +194,9 @@ func (suite *KeeperTestSuite) TestIbcTransferCoins() {
 				suite.app.GetKey(types.StoreKey),
 				suite.app.GetKey(types.MemStoreKey),
 				suite.app.GetSubspace(types.ModuleName),
-				suite.app.GetSubspace(evmtypes.ModuleName),
 				suite.app.BankKeeper,
 				keepertest.IbcKeeperMock{},
+				suite.app.EvmKeeper,
 			)
 			suite.app.CronosKeeper = cronosKeeper
 
diff --git a/x/cronos/keeper/params_test.go b/x/cronos/keeper/params_test.go
index af97e3f172..69d27d63cc 100644
--- a/x/cronos/keeper/params_test.go
+++ b/x/cronos/keeper/params_test.go
@@ -6,7 +6,6 @@ import (
 	cronosmodulekeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
 	keepertest "github.com/crypto-org-chain/cronos/x/cronos/keeper/mock"
 	"github.com/crypto-org-chain/cronos/x/cronos/types"
-	evmtypes "github.com/tharsis/ethermint/x/evm/types"
 )
 
 func (suite *KeeperTestSuite) TestGetSourceChannelID() {
@@ -42,9 +41,9 @@ func (suite *KeeperTestSuite) TestGetSourceChannelID() {
 				suite.app.GetKey(types.StoreKey),
 				suite.app.GetKey(types.MemStoreKey),
 				suite.app.GetSubspace(types.ModuleName),
-				suite.app.GetSubspace(evmtypes.ModuleName),
 				suite.app.BankKeeper,
 				keepertest.IbcKeeperMock{},
+				suite.app.EvmKeeper,
 			)
 			suite.app.CronosKeeper = cronosKeeper