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

Commit

Permalink
Merge pull request #2139 from bandprotocol/remove-db
Browse files Browse the repository at this point in the history
chain: Remove db in favor of emitter
  • Loading branch information
sorawit authored Jul 3, 2020
2 parents 9e1f156 + 1f48e99 commit e2c9e55
Show file tree
Hide file tree
Showing 21 changed files with 3 additions and 2,589 deletions.
1 change: 1 addition & 0 deletions CHANGELOG_UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

### Chain

- (chore) [\#2139](https://github.com/bandprotocol/bandchain/pull/2139) Remove db in favor of emitter.
- (chore) [\#2108](https://github.com/bandprotocol/bandchain/pull/2108) Add script to run bandchain with emitter and flusher locally.
- (impv) [\#2132](https://github.com/bandprotocol/bandchain/pull/2132) Implement emitter handler for bank messages.
- (patch) [\#2135](https://github.com/bandprotocol/bandchain/pull/2135) Bump Cosmos-SDK to version 0.38.5.
Expand Down
305 changes: 0 additions & 305 deletions chain/app/db_app.go

This file was deleted.

25 changes: 1 addition & 24 deletions chain/cmd/bandd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package main
import (
"encoding/json"
"io"
"strings"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client/debug"
Expand All @@ -23,13 +22,11 @@ import (
dbm "github.com/tendermint/tm-db"

"github.com/bandprotocol/bandchain/chain/app"
banddb "github.com/bandprotocol/bandchain/chain/db"
"github.com/bandprotocol/bandchain/chain/emitter"
)

const (
flagInvCheckPeriod = "inv-check-period"
flagWithDB = "with-db"
flagWithEmitter = "with-emitter"
)

Expand Down Expand Up @@ -62,7 +59,6 @@ func main() {
// Prepare and add persistent flags.
executor := cli.PrepareBaseCmd(rootCmd, "BAND", app.DefaultNodeHome)
rootCmd.PersistentFlags().UintVar(&invCheckPeriod, flagInvCheckPeriod, 0, "Assert registered invariants every N blocks")
rootCmd.PersistentFlags().String(flagWithDB, "", "[Experimental] Flush blockchain state to SQL database")
rootCmd.PersistentFlags().String(flagWithEmitter, "", "[Experimental] Use Kafka emitter")
err := executor.Execute()
if err != nil {
Expand All @@ -81,26 +77,7 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer) abci.Application
for _, h := range viper.GetIntSlice(server.FlagUnsafeSkipUpgrades) {
skipUpgradeHeights[int64(h)] = true
}

if viper.IsSet(flagWithDB) {
dbSplit := strings.SplitN(viper.GetString(flagWithDB), ":", 2)
if len(dbSplit) != 2 {
panic("Invalid DB string format")
}
bandDB, err := banddb.NewDB(dbSplit[0], dbSplit[1])
if err != nil {
panic(err)
}
return app.NewDBBandApp(
logger, db, traceStore, true, invCheckPeriod, skipUpgradeHeights,
viper.GetString(flags.FlagHome), bandDB,
baseapp.SetPruning(store.NewPruningOptionsFromString(viper.GetString("pruning"))),
baseapp.SetMinGasPrices(viper.GetString(server.FlagMinGasPrices)),
baseapp.SetHaltHeight(viper.GetUint64(server.FlagHaltHeight)),
baseapp.SetHaltTime(viper.GetUint64(server.FlagHaltTime)),
baseapp.SetInterBlockCache(cache),
)
} else if viper.IsSet(flagWithEmitter) {
if viper.IsSet(flagWithEmitter) {
return emitter.NewBandAppWithEmitter(
viper.GetString(flagWithEmitter), logger, db, traceStore, true, invCheckPeriod,
skipUpgradeHeights, viper.GetString(flags.FlagHome),
Expand Down
Loading

0 comments on commit e2c9e55

Please sign in to comment.