Skip to content

Commit

Permalink
fix(node): decompose initDB to make CI happy
Browse files Browse the repository at this point in the history
  • Loading branch information
Wondertan committed Jun 4, 2021
1 parent 6b35d36 commit dc1179d
Showing 1 changed file with 13 additions and 27 deletions.
40 changes: 13 additions & 27 deletions node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"time"

ipld "github.com/ipfs/go-ipld-format"
iface "github.com/ipfs/interface-go-ipfs-core"
"github.com/libp2p/go-libp2p-core/routing"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down Expand Up @@ -220,26 +219,6 @@ type Node struct {
ipfsClose io.Closer
}

func initDBs(
config *cfg.Config,
dbProvider DBProvider,
dag iface.APIDagService,
) (blockStore *store.BlockStore, stateDB dbm.DB, err error) {
var blockStoreDB dbm.DB
blockStoreDB, err = dbProvider(&DBContext{"blockstore", config})
if err != nil {
return
}
blockStore = store.NewBlockStore(blockStoreDB, dag)

stateDB, err = dbProvider(&DBContext{"state", config})
if err != nil {
return
}

return
}

func createAndStartProxyAppConns(clientCreator proxy.ClientCreator, logger log.Logger) (proxy.AppConns, error) {
proxyApp := proxy.NewAppConns(clientCreator)
proxyApp.SetLogger(logger.With("module", "proxy"))
Expand Down Expand Up @@ -646,12 +625,7 @@ func NewNode(config *cfg.Config,
logger log.Logger,
options ...Option) (*Node, error) {

dag, ipfsNode, err := ipfsProvider()
if err != nil {
return nil, err
}

blockStore, stateDB, err := initDBs(config, dbProvider, dag)
stateDB, err := dbProvider(&DBContext{"state", config})
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -706,6 +680,18 @@ func NewNode(config *cfg.Config,
stateSync = false
}

dag, ipfsNode, err := ipfsProvider()
if err != nil {
return nil, err
}

blockStoreDB, err := dbProvider(&DBContext{"blockstore", config})
if err != nil {
return nil, err
}

blockStore := store.NewBlockStore(blockStoreDB, dag)

// Create the handshaker, which calls RequestInfo, sets the AppVersion on the state,
// and replays any blocks as necessary to sync tendermint with the app.
consensusLogger := logger.With("module", "consensus")
Expand Down

0 comments on commit dc1179d

Please sign in to comment.