Resolve merge conflicts

b-harvest · Jul 24, 2024 · f5ddab1 · f5ddab1
1 parent 9e696e8
commit f5ddab1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/x/coinswap/simulation/operation.go b/x/coinswap/simulation/operation.go
@@ -8,8 +8,7 @@ import (
 
 	errorsmod "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
-	"github.com/Canto-Network/Canto/v7/x/coinswap/keeper"
-	"github.com/Canto-Network/Canto/v7/x/coinswap/types"
+
 	"github.com/Canto-Network/Canto/v7/app/params"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"

diff --git a/x/erc20/simulation/decoder.go b/x/erc20/simulation/decoder.go
@@ -21,7 +21,7 @@ func NewDecodeStore(cdc codec.Codec) func(kvA, kvB kv.Pair) string {
 			cdc.MustUnmarshal(kvB.Value, &tpB)
 			return fmt.Sprintf("%v\n%v", tpA, tpB)
 
-		case bytes.Equal(kvA.Key[:1], types.KeyPrefixTokenPairByERC20):
+		case bytes.Equal(kvA.Key[:1], types.KeyPrefixTokenPairByERC20Address):
 			var tpA, tpB types.TokenPair
 			cdc.MustUnmarshal(kvA.Value, &tpA)
 			cdc.MustUnmarshal(kvB.Value, &tpB)

diff --git a/x/govshuttle/module.go b/x/govshuttle/module.go
@@ -132,7 +132,6 @@ func (am AppModule) Name() string {
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper))
 	types.RegisterQueryServer(cfg.QueryServer(), am.keeper)
-	types.RegisterMsgServer(cfg.MsgServer(), am.keeper)
 }
 
 // RegisterInvariants registers the capability module's invariants.