address comments and fix linting

axelarnetwork · Nov 1, 2023 · 20a80d8 · 20a80d8
1 parent 02b39fb
commit 20a80d8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/app/app.go b/app/app.go
@@ -328,11 +328,11 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 	app.stakingKeeper = stakingK
 
 	// add capability keeper and ScopeToModule for ibc module
-	capabilityKeeper := capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey])
+	capabilityK := capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey])
 
 	// grant capabilities for the ibc and ibc-transfer modules
-	scopedIBCK := capabilityKeeper.ScopeToModule(ibchost.ModuleName)
-	scopedTransferK := capabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName)
+	scopedIBCK := capabilityK.ScopeToModule(ibchost.ModuleName)
+	scopedTransferK := capabilityK.ScopeToModule(ibctransfertypes.ModuleName)
 
 	// Create IBC Keeper
 	ibcKeeper := ibckeeper.NewKeeper(
@@ -450,7 +450,7 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 			panic(fmt.Sprintf("error while reading wasm config: %s", err))
 		}
 
-		scopedWasmK := capabilityKeeper.ScopeToModule(wasm.ModuleName)
+		scopedWasmK := capabilityK.ScopeToModule(wasm.ModuleName)
 		// The last arguments can contain custom message handlers, and custom query handlers,
 		// if we want to allow any custom callbacks
 		wasmOpts = append(wasmOpts, wasmkeeper.WithMessageHandlerDecorator(func(old wasmkeeper.Messenger) wasmkeeper.Messenger {
@@ -573,7 +573,7 @@ func NewAxelarApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest
 		upgrade.NewAppModule(upgradeK),
 		evidence.NewAppModule(*evidenceK),
 		params.NewAppModule(paramsK),
-		capability.NewAppModule(appCodec, *capabilityKeeper),
+		capability.NewAppModule(appCodec, *capabilityK),
 	}
 
 	// wasm module needs to be added in a specific order

diff --git a/x/evm/module.go b/x/evm/module.go
@@ -5,11 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/axelarnetwork/axelar-core/utils"
-	"github.com/axelarnetwork/axelar-core/x/evm/client/cli"
-	"github.com/axelarnetwork/axelar-core/x/evm/client/rest"
-	"github.com/axelarnetwork/axelar-core/x/evm/keeper"
-	"github.com/axelarnetwork/axelar-core/x/evm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -19,6 +14,12 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 	abci "github.com/tendermint/tendermint/abci/types"
+
+	"github.com/axelarnetwork/axelar-core/utils"
+	"github.com/axelarnetwork/axelar-core/x/evm/client/cli"
+	"github.com/axelarnetwork/axelar-core/x/evm/client/rest"
+	"github.com/axelarnetwork/axelar-core/x/evm/keeper"
+	"github.com/axelarnetwork/axelar-core/x/evm/types"
 )
 
 var (