Skip to content
This repository has been archived by the owner on Nov 16, 2022. It is now read-only.

Commit

Permalink
Disable zoracle for wenchang release
Browse files Browse the repository at this point in the history
  • Loading branch information
sorawit committed Feb 7, 2020
1 parent 493b4a2 commit 561a99c
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions chain/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/slashing"
"github.com/cosmos/cosmos-sdk/x/staking"
"github.com/cosmos/cosmos-sdk/x/supply"

"github.com/bandprotocol/d3n/chain/x/zoracle"
// "github.com/bandprotocol/d3n/chain/x/zoracle"
)

const (
Expand Down Expand Up @@ -58,7 +57,7 @@ var (
slashing.AppModuleBasic{},
supply.AppModuleBasic{},
// D3N-specific modules
zoracle.AppModuleBasic{},
// zoracle.AppModuleBasic{},
)
// account permissions
maccPerms = map[string][]string{
Expand Down Expand Up @@ -108,7 +107,7 @@ type bandApp struct {
govKeeper gov.Keeper
crisisKeeper crisis.Keeper
paramsKeeper params.Keeper
zoracleKeeper zoracle.Keeper
// zoracleKeeper zoracle.Keeper

// Module Manager
mm *module.Manager
Expand All @@ -131,7 +130,7 @@ func NewBandApp(
keys := sdk.NewKVStoreKeys(
bam.MainStoreKey, auth.StoreKey, staking.StoreKey,
supply.StoreKey, mint.StoreKey, distr.StoreKey, slashing.StoreKey,
gov.StoreKey, params.StoreKey, zoracle.StoreKey,
gov.StoreKey, params.StoreKey, /* zoracle.StoreKey, */
)

tkeys := sdk.NewTransientStoreKeys(staking.TStoreKey, params.TStoreKey)
Expand Down Expand Up @@ -240,20 +239,20 @@ func NewBandApp(
app.slashingKeeper.Hooks()),
)

app.zoracleKeeper = zoracle.NewKeeper(
app.cdc,
keys[zoracle.StoreKey],
app.bankKeeper,
app.stakingKeeper,
)
// app.zoracleKeeper = zoracle.NewKeeper(
// app.cdc,
// keys[zoracle.StoreKey],
// app.bankKeeper,
// app.stakingKeeper,
// )

app.mm = module.NewManager(
genaccounts.NewAppModule(app.accountKeeper),
genutil.NewAppModule(app.accountKeeper, app.stakingKeeper, app.BaseApp.DeliverTx),
auth.NewAppModule(app.accountKeeper),
bank.NewAppModule(app.bankKeeper, app.accountKeeper),
crisis.NewAppModule(&app.crisisKeeper),
zoracle.NewAppModule(app.zoracleKeeper),
// zoracle.NewAppModule(app.zoracleKeeper),
supply.NewAppModule(app.supplyKeeper, app.accountKeeper),
distr.NewAppModule(app.distrKeeper, app.supplyKeeper),
gov.NewAppModule(app.govKeeper, app.supplyKeeper),
Expand All @@ -263,7 +262,7 @@ func NewBandApp(
)

app.mm.SetOrderBeginBlockers(mint.ModuleName, distr.ModuleName, slashing.ModuleName)
app.mm.SetOrderEndBlockers(zoracle.ModuleName, crisis.ModuleName, gov.ModuleName, staking.ModuleName)
app.mm.SetOrderEndBlockers( /* zoracle.ModuleName, */ crisis.ModuleName, gov.ModuleName, staking.ModuleName)

// Sets the order of Genesis - Order matters, genutil is to always come last
// NOTE: The genutils moodule must occur after staking so that pools are
Expand All @@ -277,7 +276,7 @@ func NewBandApp(
slashing.ModuleName,
gov.ModuleName,
mint.ModuleName,
zoracle.ModuleName,
// zoracle.ModuleName,
supply.ModuleName,
crisis.ModuleName,
genutil.ModuleName,
Expand Down

0 comments on commit 561a99c

Please sign in to comment.