refactor: keep the directory structure with the main branch code alwa…

…ys (#372)
irisnet · Jul 24, 2023 · 7b10a08 · 7b10a08
1 parent a9d4976
commit 7b10a08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 69 deletions.
diff --git a/modules/nft/handler.go b/modules/nft/handler.go
diff --git a/modules/nft/genesis.go → modules/nft/keeper/genesis.go b/modules/nft/genesis.go → modules/nft/keeper/genesis.go
@@ -1,14 +1,13 @@
-package nft
+package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/irisnet/irismod/modules/nft/keeper"
 	"github.com/irisnet/irismod/modules/nft/types"
 )
 
 // InitGenesis stores the NFT genesis.
-func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) {
+func (k Keeper) InitGenesis(ctx sdk.Context, data types.GenesisState) {
 	if err := types.ValidateGenesis(data); err != nil {
 		panic(err.Error())
 	}
@@ -24,11 +23,6 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, data types.GenesisState) {
 }
 
 // ExportGenesis returns a GenesisState for a given context and keeper.
-func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
+func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 	return types.NewGenesisState(k.GetCollections(ctx))
 }
-
-// DefaultGenesisState returns a default genesis state
-func DefaultGenesisState() *types.GenesisState {
-	return types.NewGenesisState([]types.Collection{})
-}
diff --git a/modules/nft/module.go → modules/nft/module/module.go b/modules/nft/module.go → modules/nft/module/module.go
@@ -1,4 +1,4 @@
-package nft
+package module
 
 import (
 	"context"
@@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
 
 // DefaultGenesis returns default genesis state as raw bytes for the NFT module.
 func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage {
-	return cdc.MustMarshalJSON(DefaultGenesisState())
+	return cdc.MustMarshalJSON(types.NewGenesisState([]types.Collection{}))
 }
 
 // ValidateGenesis performs genesis state validation for the NFT module.
@@ -130,27 +130,19 @@ func (am AppModule) InitGenesis(
 
 	cdc.MustUnmarshalJSON(data, &genesisState)
 
-	InitGenesis(ctx, am.keeper, genesisState)
+	am.keeper.InitGenesis(ctx, genesisState)
 	return []abci.ValidatorUpdate{}
 }
 
 // ExportGenesis returns the exported genesis state as raw bytes for the NFT module.
 func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
-	gs := ExportGenesis(ctx, am.keeper)
+	gs := am.keeper.ExportGenesis(ctx)
 	return cdc.MustMarshalJSON(gs)
 }
 
 // ConsensusVersion implements AppModule/ConsensusVersion.
 func (AppModule) ConsensusVersion() uint64 { return 1 }
 
-// BeginBlock performs a no-op.
-func (AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {}
-
-// EndBlock returns the end blocker for the NFT module. It returns no validator updates.
-func (AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
-	return []abci.ValidatorUpdate{}
-}
-
 // ____________________________________________________________________________
 
 // AppModuleSimulation functions

diff --git a/simapp/app.go b/simapp/app.go
@@ -104,8 +104,8 @@ import (
 	"github.com/irisnet/irismod/modules/mt"
 	mtkeeper "github.com/irisnet/irismod/modules/mt/keeper"
 	mttypes "github.com/irisnet/irismod/modules/mt/types"
-	"github.com/irisnet/irismod/modules/nft"
 	nftkeeper "github.com/irisnet/irismod/modules/nft/keeper"
+	nft "github.com/irisnet/irismod/modules/nft/module"
 	nfttypes "github.com/irisnet/irismod/modules/nft/types"
 	"github.com/irisnet/irismod/modules/oracle"
 	oracleKeeper "github.com/irisnet/irismod/modules/oracle/keeper"