Merge branch 'scaffold/migration-module' into chore/migration/state-prep

* scaffold/migration-module:
  chore: review feedback improvements
  refactor: migration keeper in cosmos app
  chore: fix some function names in comment (#1019)

app/app.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	migrationmodulekeeper "github.com/pokt-network/poktroll/x/migration/keeper"
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 	"io"
 	"os"
@@ -70,7 +69,6 @@ type App struct {
 	// simulation manager
 	sm *module.SimulationManager
 
-	MigrationKeeper migrationmodulekeeper.Keeper
 	// this line is used by starport scaffolding # stargate/app/keeperDeclaration
 	// Ignite CLI adds keepers here when scaffolding new modules. Please move the created keeper to the `keepers` package.
 }
@@ -216,7 +214,7 @@ func New(
 		&app.Keepers.ProofKeeper,
 		&app.Keepers.TokenomicsKeeper,
 		&app.Keepers.SharedKeeper,
-		&app.MigrationKeeper,
+		&app.Keepers.MigrationKeeper,
 		// this line is used by starport scaffolding # stargate/app/keeperDefinition
 		// Ignite CLI adds keepers here when scaffolding new modules. Please move the created keeper to the `keepers` package.
 	); err != nil {

app/keepers/types.go

@@ -32,6 +32,7 @@ import (
 
 	applicationmodulekeeper "github.com/pokt-network/poktroll/x/application/keeper"
 	gatewaymodulekeeper "github.com/pokt-network/poktroll/x/gateway/keeper"
+	migrationmodulekeeper "github.com/pokt-network/poktroll/x/migration/keeper"
 	proofmodulekeeper "github.com/pokt-network/poktroll/x/proof/keeper"
 	servicemodulekeeper "github.com/pokt-network/poktroll/x/service/keeper"
 	sessionmodulekeeper "github.com/pokt-network/poktroll/x/session/keeper"
@@ -82,4 +83,5 @@ type Keepers struct {
 	ProofKeeper       proofmodulekeeper.Keeper
 	TokenomicsKeeper  tokenomicsmodulekeeper.Keeper
 	SharedKeeper      sharedmodulekeeper.Keeper
+	MigrationKeeper   migrationmodulekeeper.Keeper
 }

e2e/tests/node.go

@@ -187,7 +187,7 @@ func (p *pocketdBin) runPocketCmd(args ...string) (*commandResult, error) {
 	return r, err
 }
 
-// runCurlPostCmd is a helper to run a command using the local pocketd binary with the flags provided
+// runCurlCmd is a helper to run a command using the local pocketd binary with the flags provided
 func (p *pocketdBin) runCurlCmd(rpcBaseURL, service, method, path, appAddr, data string, args ...string) (*commandResult, error) {
 	rpcUrl, err := url.Parse(rpcBaseURL)
 	if err != nil {

e2e/tests/reset_params_test.go

@@ -28,7 +28,7 @@ func (s *suite) resetAllModuleParamsToDefaults() {
 	s.sendAuthzExecTx(s.granteeName, resetTxJSONFile.Name())
 }
 
-// allMoudlesMsgUpdateParamsToDefaultsAny returns a slice of Any messages, each corresponding
+// allModulesMsgUpdateParamsToDefaultsAny returns a slice of Any messages, each corresponding
 // to a MsgUpdateParams for a module, populated with the respective default values.
 func (s *suite) allModulesMsgUpdateParamsToDefaultsAny() []*codectypes.Any {
 	s.Helper()

proto/poktroll/migration/params.proto

@@ -11,6 +11,4 @@ option (gogoproto.stable_marshaler_all) = true;
 message Params {
   option (amino.name) = "poktroll/x/migration/Params";
   option (gogoproto.equal) = true;
-
-
 }