LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge PR #5171: Remove NFT module

Browse Source
This commit is contained in:
Marko
2019-10-11 10:18:21 -04:00
committed by Alexander Bezobchuk
parent 18de630d0a
commit bb6bed4ed3
57 changed files with 13 additions and 5660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simapp/app.go
+2 -8
View File
@@ -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()
simapp/params.go
-4
View File
@@ -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"
)
simapp/sim_test.go
-44
View File
@@ -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),
// },
}
}