smeb_y/0g-chain
1
0
Fork 0
mirror of https://github.com/0glabs/0g-chain.git synced 2024-12-26 00:05:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

generalize app name

Browse Source
This commit is contained in:
rhuairahrighairigh 2019-06-20 18:02:29 +01:00
parent 17911d89f3
commit ec312fefc8
9 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/app.go
View File

@ -38,7 +38,7 @@ var (
) )
// Extended ABCI application // Extended ABCI application
type GaiaApp struct { type App struct {
*bam.BaseApp *bam.BaseApp
cdc *codec.Codec cdc *codec.Codec
@ -71,17 +71,17 @@ type GaiaApp struct {
paramsKeeper params.Keeper paramsKeeper params.Keeper
} }
// NewGaiaApp returns a reference to an initialized GaiaApp. // NewApp returns a reference to an initialized App.
func NewGaiaApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, func NewApp(logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool,
invCheckPeriod uint, invCheckPeriod uint,
baseAppOptions ...func(*bam.BaseApp)) *GaiaApp { baseAppOptions ...func(*bam.BaseApp)) *App {
cdc := MakeCodec() cdc := MakeCodec()
bApp := bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...) bApp := bam.NewBaseApp(appName, logger, db, auth.DefaultTxDecoder(cdc), baseAppOptions...)
bApp.SetCommitMultiStoreTracer(traceStore) bApp.SetCommitMultiStoreTracer(traceStore)
var app = &GaiaApp{ var app = &App{
BaseApp: bApp, BaseApp: bApp,
cdc: cdc, cdc: cdc,
invCheckPeriod: invCheckPeriod, invCheckPeriod: invCheckPeriod,
@ -220,7 +220,7 @@ func MakeCodec() *codec.Codec {
} }
// application updates every end block // application updates every end block
func (app *GaiaApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
// mint new tokens for the previous block // mint new tokens for the previous block
mint.BeginBlocker(ctx, app.mintKeeper) mint.BeginBlocker(ctx, app.mintKeeper)
@ -241,7 +241,7 @@ func (app *GaiaApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) ab
// application updates every end block // application updates every end block
// nolint: unparam // nolint: unparam
func (app *GaiaApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock { func (app *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.ResponseEndBlock {
tags := gov.EndBlocker(ctx, app.govKeeper) tags := gov.EndBlocker(ctx, app.govKeeper)
validatorUpdates, endBlockerTags := staking.EndBlocker(ctx, app.stakingKeeper) validatorUpdates, endBlockerTags := staking.EndBlocker(ctx, app.stakingKeeper)
tags = append(tags, endBlockerTags...) tags = append(tags, endBlockerTags...)
@ -257,7 +257,7 @@ func (app *GaiaApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.R
} }
// initialize store from a genesis state // initialize store from a genesis state
func (app *GaiaApp) initFromGenesisState(ctx sdk.Context, genesisState GenesisState) []abci.ValidatorUpdate { func (app *App) initFromGenesisState(ctx sdk.Context, genesisState GenesisState) []abci.ValidatorUpdate {
genesisState.Sanitize() genesisState.Sanitize()
// load the accounts // load the accounts
@ -309,7 +309,7 @@ func (app *GaiaApp) initFromGenesisState(ctx sdk.Context, genesisState GenesisSt
} }
// custom logic for gaia initialization // custom logic for gaia initialization
func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { func (app *App) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain {
stateJSON := req.AppStateBytes stateJSON := req.AppStateBytes
// TODO is this now the whole genesis file? // TODO is this now the whole genesis file?
@ -346,7 +346,7 @@ func (app *GaiaApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) abci
} }
// load a particular height // load a particular height
func (app *GaiaApp) LoadHeight(height int64) error { func (app *App) LoadHeight(height int64) error {
return app.LoadVersion(height, app.keyMain) return app.LoadVersion(height, app.keyMain)
} }

6
app/app_test.go
View File

@ -22,7 +22,7 @@ import (
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
) )
func setGenesis(gapp *GaiaApp, accs ...*auth.BaseAccount) error { func setGenesis(gapp *App, accs ...*auth.BaseAccount) error {
genaccs := make([]GenesisAccount, len(accs)) genaccs := make([]GenesisAccount, len(accs))
for i, acc := range accs { for i, acc := range accs {
genaccs[i] = NewGenesisAccount(acc) genaccs[i] = NewGenesisAccount(acc)
@ -55,11 +55,11 @@ func setGenesis(gapp *GaiaApp, accs ...*auth.BaseAccount) error {
func TestGaiadExport(t *testing.T) { func TestGaiadExport(t *testing.T) {
db := db.NewMemDB() db := db.NewMemDB()
gapp := NewGaiaApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0) gapp := NewApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0)
setGenesis(gapp) setGenesis(gapp)
// Making a new app object with the db, so that initchain hasn't been called // Making a new app object with the db, so that initchain hasn't been called
newGapp := NewGaiaApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0) newGapp := NewApp(log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, 0)
_, _, err := newGapp.ExportAppStateAndValidators(false, []string{}) _, _, err := newGapp.ExportAppStateAndValidators(false, []string{})
require.NoError(t, err, "ExportAppStateAndValidators should not have an error") require.NoError(t, err, "ExportAppStateAndValidators should not have an error")
} }

4
app/export.go
View File

@ -20,7 +20,7 @@ import (
) )
// export the state of gaia for a genesis file // export the state of gaia for a genesis file
func (app *GaiaApp) ExportAppStateAndValidators(forZeroHeight bool, jailWhiteList []string) ( func (app *App) ExportAppStateAndValidators(forZeroHeight bool, jailWhiteList []string) (
appState json.RawMessage, validators []tmtypes.GenesisValidator, err error) { appState json.RawMessage, validators []tmtypes.GenesisValidator, err error) {
// as if they could withdraw from the start of the next block // as if they could withdraw from the start of the next block
@ -59,7 +59,7 @@ func (app *GaiaApp) ExportAppStateAndValidators(forZeroHeight bool, jailWhiteLis
} }
// prepare for fresh start at zero height // prepare for fresh start at zero height
func (app *GaiaApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList []string) { func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList []string) {
applyWhiteList := false applyWhiteList := false
//Check if there is a whitelist //Check if there is a whitelist

8
app/genesis.go
View File

@ -156,7 +156,7 @@ func (ga *GenesisAccount) ToAccount() auth.Account {
// Create the core parameters for genesis initialization for gaia // Create the core parameters for genesis initialization for gaia
// note that the pubkey input is this machines pubkey // note that the pubkey input is this machines pubkey
func GaiaAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []json.RawMessage) ( func AppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []json.RawMessage) (
genesisState GenesisState, err error) { genesisState GenesisState, err error) {
if err = cdc.UnmarshalJSON(genDoc.AppState, &genesisState); err != nil { if err = cdc.UnmarshalJSON(genDoc.AppState, &genesisState); err != nil {
@ -292,11 +292,11 @@ func validateGenesisStateAccounts(accs []GenesisAccount) error {
return nil return nil
} }
// GaiaAppGenState but with JSON // AppGenState but with JSON
func GaiaAppGenStateJSON(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []json.RawMessage) ( func AppGenStateJSON(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []json.RawMessage) (
appState json.RawMessage, err error) { appState json.RawMessage, err error) {
// create the final app state // create the final app state
genesisState, err := GaiaAppGenState(cdc, genDoc, appGenTxs) genesisState, err := AppGenState(cdc, genDoc, appGenTxs)
if err != nil { if err != nil {
return nil, err return nil, err
} }

8
app/genesis_test.go
View File

@ -70,7 +70,7 @@ func TestToAccount(t *testing.T) {
require.Equal(t, vacc, acc.(*auth.ContinuousVestingAccount)) require.Equal(t, vacc, acc.(*auth.ContinuousVestingAccount))
} }
func TestGaiaAppGenTx(t *testing.T) { func TestAppGenTx(t *testing.T) {
cdc := MakeCodec() cdc := MakeCodec()
_ = cdc _ = cdc
@ -79,13 +79,13 @@ func TestGaiaAppGenTx(t *testing.T) {
//TODO test the account created has the correct pubkey //TODO test the account created has the correct pubkey
} }
func TestGaiaAppGenState(t *testing.T) { func TestAppGenState(t *testing.T) {
cdc := MakeCodec() cdc := MakeCodec()
_ = cdc _ = cdc
var genDoc tmtypes.GenesisDoc var genDoc tmtypes.GenesisDoc
// test unmarshalling error // test unmarshalling error
_, err := GaiaAppGenState(cdc, genDoc, []json.RawMessage{}) _, err := AppGenState(cdc, genDoc, []json.RawMessage{})
require.Error(t, err) require.Error(t, err)
appState := makeGenesisState(t, []auth.StdTx{}) appState := makeGenesisState(t, []auth.StdTx{})
@ -93,7 +93,7 @@ func TestGaiaAppGenState(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
// test validation error // test validation error
_, err = GaiaAppGenState(cdc, genDoc, []json.RawMessage{}) _, err = AppGenState(cdc, genDoc, []json.RawMessage{})
require.Error(t, err) require.Error(t, err)
// TODO test must provide at least genesis transaction // TODO test must provide at least genesis transaction

4
app/invariants.go
View File

@ -9,12 +9,12 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types" sdk "github.com/cosmos/cosmos-sdk/types"
) )
func (app *GaiaApp) assertRuntimeInvariants() { func (app *App) assertRuntimeInvariants() {
ctx := app.NewContext(false, abci.Header{Height: app.LastBlockHeight() + 1}) ctx := app.NewContext(false, abci.Header{Height: app.LastBlockHeight() + 1})
app.assertRuntimeInvariantsOnContext(ctx) app.assertRuntimeInvariantsOnContext(ctx)
} }
func (app *GaiaApp) assertRuntimeInvariantsOnContext(ctx sdk.Context) { func (app *App) assertRuntimeInvariantsOnContext(ctx sdk.Context) {
start := time.Now() start := time.Now()
invarRoutes := app.crisisKeeper.Routes() invarRoutes := app.crisisKeeper.Routes()
for _, ir := range invarRoutes { for _, ir := range invarRoutes {

20
app/sim_test.go
View File

@ -61,7 +61,7 @@ func init() {
} }
// helper function for populating input for SimulateFromSeed // helper function for populating input for SimulateFromSeed
func getSimulateFromSeedInput(tb testing.TB, app *GaiaApp) ( func getSimulateFromSeedInput(tb testing.TB, app *App) (
testing.TB, *baseapp.BaseApp, simulation.AppStateFn, int64, testing.TB, *baseapp.BaseApp, simulation.AppStateFn, int64,
simulation.WeightedOperations, sdk.Invariants, int, int, bool, bool) { simulation.WeightedOperations, sdk.Invariants, int, int, bool, bool) {
@ -273,7 +273,7 @@ func appStateFn(r *rand.Rand, accs []simulation.Account, genesisTimestamp time.T
return appStateRandomizedFn(r, accs, genesisTimestamp) return appStateRandomizedFn(r, accs, genesisTimestamp)
} }
func testAndRunTxs(app *GaiaApp) []simulation.WeightedOperation { func testAndRunTxs(app *App) []simulation.WeightedOperation {
return []simulation.WeightedOperation{ return []simulation.WeightedOperation{
{5, authsim.SimulateDeductFee(app.accountKeeper, app.feeCollectionKeeper)}, {5, authsim.SimulateDeductFee(app.accountKeeper, app.feeCollectionKeeper)},
{100, banksim.SimulateMsgSend(app.accountKeeper, app.bankKeeper)}, {100, banksim.SimulateMsgSend(app.accountKeeper, app.bankKeeper)},
@ -292,7 +292,7 @@ func testAndRunTxs(app *GaiaApp) []simulation.WeightedOperation {
} }
} }
func invariants(app *GaiaApp) []sdk.Invariant { func invariants(app *App) []sdk.Invariant {
return []sdk.Invariant{ return []sdk.Invariant{
simulation.PeriodicInvariant(bank.NonnegativeBalanceInvariant(app.accountKeeper), period, 0), simulation.PeriodicInvariant(bank.NonnegativeBalanceInvariant(app.accountKeeper), period, 0),
simulation.PeriodicInvariant(distr.AllInvariants(app.distrKeeper, app.stakingKeeper), period, 0), simulation.PeriodicInvariant(distr.AllInvariants(app.distrKeeper, app.stakingKeeper), period, 0),
@ -319,7 +319,7 @@ func BenchmarkFullGaiaSimulation(b *testing.B) {
db.Close() db.Close()
os.RemoveAll(dir) os.RemoveAll(dir)
}() }()
app := NewGaiaApp(logger, db, nil, true, 0) app := NewApp(logger, db, nil, true, 0)
// Run randomized simulation // Run randomized simulation
// TODO parameterize numbers, save for a later PR // TODO parameterize numbers, save for a later PR
@ -354,7 +354,7 @@ func TestFullGaiaSimulation(t *testing.T) {
db.Close() db.Close()
os.RemoveAll(dir) os.RemoveAll(dir)
}() }()
app := NewGaiaApp(logger, db, nil, true, 0, fauxMerkleModeOpt) app := NewApp(logger, db, nil, true, 0, fauxMerkleModeOpt)
require.Equal(t, "GaiaApp", app.Name()) require.Equal(t, "GaiaApp", app.Name())
// Run randomized simulation // Run randomized simulation
@ -388,7 +388,7 @@ func TestGaiaImportExport(t *testing.T) {
db.Close() db.Close()
os.RemoveAll(dir) os.RemoveAll(dir)
}() }()
app := NewGaiaApp(logger, db, nil, true, 0, fauxMerkleModeOpt) app := NewApp(logger, db, nil, true, 0, fauxMerkleModeOpt)
require.Equal(t, "GaiaApp", app.Name()) require.Equal(t, "GaiaApp", app.Name())
// Run randomized simulation // Run randomized simulation
@ -415,7 +415,7 @@ func TestGaiaImportExport(t *testing.T) {
newDB.Close() newDB.Close()
os.RemoveAll(newDir) os.RemoveAll(newDir)
}() }()
newApp := NewGaiaApp(log.NewNopLogger(), newDB, nil, true, 0, fauxMerkleModeOpt) newApp := NewApp(log.NewNopLogger(), newDB, nil, true, 0, fauxMerkleModeOpt)
require.Equal(t, "GaiaApp", newApp.Name()) require.Equal(t, "GaiaApp", newApp.Name())
var genesisState GenesisState var genesisState GenesisState
err = app.cdc.UnmarshalJSON(appState, &genesisState) err = app.cdc.UnmarshalJSON(appState, &genesisState)
@ -478,7 +478,7 @@ func TestGaiaSimulationAfterImport(t *testing.T) {
db.Close() db.Close()
os.RemoveAll(dir) os.RemoveAll(dir)
}() }()
app := NewGaiaApp(logger, db, nil, true, 0, fauxMerkleModeOpt) app := NewApp(logger, db, nil, true, 0, fauxMerkleModeOpt)
require.Equal(t, "GaiaApp", app.Name()) require.Equal(t, "GaiaApp", app.Name())
// Run randomized simulation // Run randomized simulation
@ -514,7 +514,7 @@ func TestGaiaSimulationAfterImport(t *testing.T) {
newDB.Close() newDB.Close()
os.RemoveAll(newDir) os.RemoveAll(newDir)
}() }()
newApp := NewGaiaApp(log.NewNopLogger(), newDB, nil, true, 0, fauxMerkleModeOpt) newApp := NewApp(log.NewNopLogger(), newDB, nil, true, 0, fauxMerkleModeOpt)
require.Equal(t, "GaiaApp", newApp.Name()) require.Equal(t, "GaiaApp", newApp.Name())
newApp.InitChain(abci.RequestInitChain{ newApp.InitChain(abci.RequestInitChain{
AppStateBytes: appState, AppStateBytes: appState,
@ -542,7 +542,7 @@ func TestAppStateDeterminism(t *testing.T) {
for j := 0; j < numTimesToRunPerSeed; j++ { for j := 0; j < numTimesToRunPerSeed; j++ {
logger := log.NewNopLogger() logger := log.NewNopLogger()
db := dbm.NewMemDB() db := dbm.NewMemDB()
app := NewGaiaApp(logger, db, nil, true, 0) app := NewApp(logger, db, nil, true, 0)
// Run randomized simulation // Run randomized simulation
simulation.SimulateFromSeed( simulation.SimulateFromSeed(

6
cmd/gaiad/main.go
View File

@ -66,7 +66,7 @@ func main() {
} }
func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer) abci.Application { func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer) abci.Application {
return app.NewGaiaApp( return app.NewApp(
logger, db, traceStore, true, invCheckPeriod, logger, db, traceStore, true, invCheckPeriod,
baseapp.SetPruning(store.NewPruningOptionsFromString(viper.GetString("pruning"))), baseapp.SetPruning(store.NewPruningOptionsFromString(viper.GetString("pruning"))),
baseapp.SetMinGasPrices(viper.GetString(server.FlagMinGasPrices)), baseapp.SetMinGasPrices(viper.GetString(server.FlagMinGasPrices)),
@ -78,13 +78,13 @@ func exportAppStateAndTMValidators(
) (json.RawMessage, []tmtypes.GenesisValidator, error) { ) (json.RawMessage, []tmtypes.GenesisValidator, error) {
if height != -1 { if height != -1 {
gApp := app.NewGaiaApp(logger, db, traceStore, false, uint(1)) gApp := app.NewApp(logger, db, traceStore, false, uint(1))
err := gApp.LoadHeight(height) err := gApp.LoadHeight(height)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
return gApp.ExportAppStateAndValidators(forZeroHeight, jailWhiteList) return gApp.ExportAppStateAndValidators(forZeroHeight, jailWhiteList)
} }
gApp := app.NewGaiaApp(logger, db, traceStore, true, uint(1)) gApp := app.NewApp(logger, db, traceStore, true, uint(1))
return gApp.ExportAppStateAndValidators(forZeroHeight, jailWhiteList) return gApp.ExportAppStateAndValidators(forZeroHeight, jailWhiteList)
} }

2
init/collect.go
View File

@ -111,7 +111,7 @@ func genAppStateFromConfig(
cfg.WriteConfigFile(filepath.Join(config.RootDir, "config", "config.toml"), config) cfg.WriteConfigFile(filepath.Join(config.RootDir, "config", "config.toml"), config)
appState, err = app.GaiaAppGenStateJSON(cdc, genDoc, genTxs) appState, err = app.AppGenStateJSON(cdc, genDoc, genTxs)
if err != nil { if err != nil {
return return
} }