Merge PR cosmos#5171: Remove NFT module

musalbas · Oct 11, 2019 · bb6bed4 · bb6bed4
1 parent 18de630
commit bb6bed4
Show file tree

Hide file tree

Showing 57 changed files with 13 additions and 5,660 deletions.
diff --git a/docs/spec/README.md b/docs/spec/README.md
@@ -13,17 +13,17 @@ block.
 
 ## Modules specifications
 
-- [Auth](./auth) - The structure and authentication of accounts and transactions.
-- [Bank](./bank) - Sending tokens.
-- [Governance](./governance) - Proposals and voting.
-- [Staking](./staking) - Proof-of-stake bonding, delegation, etc.
-- [Slashing](./slashing) - Validator punishment mechanisms.
-- [Distribution](./distribution) - Fee distribution, and staking token provision distribution.
-- [Crisis](./crisis) - Halting the blockchain under certain circumstances.
-- [Mint](./mint) - Staking token provision creation.
-- [Params](./params) - Globally available parameter store.
-- [Supply](./supply) - Total supply of the chain.
-- [NFT](./nft) - Non-fungible tokens.
+- [Auth](../../x/authspec) - The structure and authentication of accounts and transactions.
+- [Bank](../../x/bank/spec) - Sending tokens.
+- [Governance](../../x/governance/spec) - Proposals and voting.
+- [Staking](../../x/staking/spec) - Proof-of-stake bonding, delegation, etc.
+- [Slashing](../../x/slashing/spec) - Validator punishment mechanisms.
+- [Distribution](../../x/distribution/spec) - Fee distribution, and staking token provision distribution.
+- [Crisis](.../../x/crisis/spec) - Halting the blockchain under certain circumstances.
+- [Mint](../../x/mint/spec) - Staking token provision creation.
+- [Params](../../x/params/spec) - Globally available parameter store.
+- [Supply](../../x/supply/spec) - Total supply of the chain.
+- [NFT](https://github.com/cosmos/modules/tree/master/incubator/nft/docs/spec) - Non-fungible tokens.
 
 For details on the underlying blockchain and p2p protocols, see
 the [Tendermint specification](https://github.com/tendermint/tendermint/tree/master/docs/spec).
diff --git a/simapp/app.go b/simapp/app.go
@@ -22,7 +22,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	"github.com/cosmos/cosmos-sdk/x/gov"
 	"github.com/cosmos/cosmos-sdk/x/mint"
-	"github.com/cosmos/cosmos-sdk/x/nft"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
@@ -54,7 +53,6 @@ var (
 		params.AppModuleBasic{},
 		crisis.AppModuleBasic{},
 		slashing.AppModuleBasic{},
-		nft.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -102,7 +100,6 @@ type SimApp struct {
 	GovKeeper      gov.Keeper
 	CrisisKeeper   crisis.Keeper
 	ParamsKeeper   params.Keeper
-	NFTKeeper      nft.Keeper
 
 	// the module manager
 	mm *module.Manager
@@ -125,7 +122,7 @@ func NewSimApp(
 
 	keys := sdk.NewKVStoreKeys(bam.MainStoreKey, auth.StoreKey, staking.StoreKey,
 		supply.StoreKey, mint.StoreKey, distr.StoreKey, slashing.StoreKey,
-		gov.StoreKey, params.StoreKey, nft.StoreKey)
+		gov.StoreKey, params.StoreKey)
 	tkeys := sdk.NewTransientStoreKeys(params.TStoreKey)
 
 	app := &SimApp{
@@ -159,7 +156,6 @@ func NewSimApp(
 	app.SlashingKeeper = slashing.NewKeeper(app.cdc, keys[slashing.StoreKey], &stakingKeeper,
 		slashingSubspace, slashing.DefaultCodespace)
 	app.CrisisKeeper = crisis.NewKeeper(crisisSubspace, invCheckPeriod, app.SupplyKeeper, auth.FeeCollectorName)
-	app.NFTKeeper = nft.NewKeeper(app.cdc, keys[nft.StoreKey])
 
 	// register the proposal types
 	govRouter := gov.NewRouter()
@@ -188,7 +184,6 @@ func NewSimApp(
 		distr.NewAppModule(app.DistrKeeper, app.SupplyKeeper),
 		slashing.NewAppModule(app.SlashingKeeper, app.StakingKeeper),
 		staking.NewAppModule(app.StakingKeeper, app.AccountKeeper, app.SupplyKeeper),
-		nft.NewAppModule(app.NFTKeeper),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -203,7 +198,7 @@ func NewSimApp(
 	app.mm.SetOrderInitGenesis(
 		auth.ModuleName, distr.ModuleName, staking.ModuleName,
 		bank.ModuleName, slashing.ModuleName, gov.ModuleName,
-		mint.ModuleName, supply.ModuleName, crisis.ModuleName, nft.ModuleName,
+		mint.ModuleName, supply.ModuleName, crisis.ModuleName,
 		genutil.ModuleName,
 	)
 
@@ -223,7 +218,6 @@ func NewSimApp(
 		distr.NewAppModule(app.DistrKeeper, app.SupplyKeeper),
 		staking.NewAppModule(app.StakingKeeper, app.AccountKeeper, app.SupplyKeeper),
 		slashing.NewAppModule(app.SlashingKeeper, app.StakingKeeper),
-		// nft.NewAppModule(app.NFTKeeper),
 	)
 
 	app.sm.RegisterStoreDecoders()

diff --git a/simapp/params.go b/simapp/params.go
@@ -20,8 +20,4 @@ const (
 	OpWeightMsgUndelegate                              = "op_weight_msg_undelegate"
 	OpWeightMsgBeginRedelegate                         = "op_weight_msg_begin_redelegate"
 	OpWeightMsgUnjail                                  = "op_weight_msg_unjail"
-	OpWeightMsgTransferNFT                             = "op_weight_msg_transfer_nft"
-	OpWeightMsgEditNFTMetadata                         = "op_weight_msg_edit_nft_metadata"
-	OpWeightMsgMintNFT                                 = "op_weight_msg_mint_nft"
-	OpWeightMsgBurnNFT                                 = "op_weight_msg_burn_nft"
 )
diff --git a/simapp/sim_test.go b/simapp/sim_test.go
@@ -232,50 +232,6 @@ func testAndRunTxs(app *SimApp, config simulation.Config) []simulation.WeightedO
 			}(nil),
 			slashingsimops.SimulateMsgUnjail(app.SlashingKeeper),
 		},
-		// {
-		// 	func(_ *rand.Rand) int {
-		// 		var v int
-		// 		ap.GetOrGenerate(app.cdc, OpWeightMsgTransferNFT, &v, nil,
-		// 			func(_ *rand.Rand) {
-		// 				v = 33
-		// 			})
-		// 		return v
-		// 	}(nil),
-		// 	nftsimops.SimulateMsgTransferNFT(app.NFTKeeper),
-		// },
-		// {
-		// 	func(_ *rand.Rand) int {
-		// 		var v int
-		// 		ap.GetOrGenerate(app.cdc, OpWeightMsgEditNFTMetadata, &v, nil,
-		// 			func(_ *rand.Rand) {
-		// 				v = 5
-		// 			})
-		// 		return v
-		// 	}(nil),
-		// 	nftsimops.SimulateMsgEditNFTMetadata(app.NFTKeeper),
-		// },
-		// {
-		// 	func(_ *rand.Rand) int {
-		// 		var v int
-		// 		ap.GetOrGenerate(app.cdc, OpWeightMsgMintNFT, &v, nil,
-		// 			func(_ *rand.Rand) {
-		// 				v = 10
-		// 			})
-		// 		return v
-		// 	}(nil),
-		// 	nftsimops.SimulateMsgMintNFT(app.NFTKeeper),
-		// },
-		// {
-		// 	func(_ *rand.Rand) int {
-		// 		var v int
-		// 		ap.GetOrGenerate(app.cdc, OpWeightMsgBurnNFT, &v, nil,
-		// 			func(_ *rand.Rand) {
-		// 				v = 5
-		// 			})
-		// 		return v
-		// 	}(nil),
-		// 	nftsimops.SimulateMsgBurnNFT(app.NFTKeeper),
-		// },
 	}
 }
 

diff --git a/x/nft/CONTRACT.md b/x/nft/CONTRACT.md
diff --git a/x/nft/alias.go b/x/nft/alias.go