Browse Source

it compiles

pull/1184/head
Ethan Buchman 7 years ago
parent
commit
e7747f7d66
5 changed files with 12 additions and 3 deletions
  1. +3
    -2
      consensus/replay_file.go
  2. +3
    -0
      lite/proxy/query.go
  3. +2
    -0
      lite/proxy/wrapper.go
  4. +2
    -1
      node/node.go
  5. +2
    -0
      rpc/core/types/responses.go

+ 3
- 2
consensus/replay_file.go View File

@ -280,12 +280,13 @@ func (pb *playback) replayConsoleLoop() int {
// convenience for replay mode // convenience for replay mode
func newConsensusStateForReplay(config cfg.BaseConfig, csConfig *cfg.ConsensusConfig) *ConsensusState { func newConsensusStateForReplay(config cfg.BaseConfig, csConfig *cfg.ConsensusConfig) *ConsensusState {
dbType := dbm.DBBackendType(config.DBBackend)
// Get BlockStore // Get BlockStore
blockStoreDB := dbm.NewDB("blockstore", config.DBBackend, config.DBDir())
blockStoreDB := dbm.NewDB("blockstore", dbType, config.DBDir())
blockStore := bc.NewBlockStore(blockStoreDB) blockStore := bc.NewBlockStore(blockStoreDB)
// Get State // Get State
stateDB := dbm.NewDB("state", config.DBBackend, config.DBDir())
stateDB := dbm.NewDB("state", dbType, config.DBDir())
state, err := sm.MakeGenesisStateFromFile(config.GenesisFile()) state, err := sm.MakeGenesisStateFromFile(config.GenesisFile())
if err != nil { if err != nil {
cmn.Exit(err.Error()) cmn.Exit(err.Error())


+ 3
- 0
lite/proxy/query.go View File

@ -3,6 +3,8 @@ package proxy
import ( import (
"github.com/pkg/errors" "github.com/pkg/errors"
cmn "github.com/tendermint/tmlibs/common"
"github.com/tendermint/tendermint/lite" "github.com/tendermint/tendermint/lite"
"github.com/tendermint/tendermint/lite/client" "github.com/tendermint/tendermint/lite/client"
certerr "github.com/tendermint/tendermint/lite/errors" certerr "github.com/tendermint/tendermint/lite/errors"
@ -78,6 +80,7 @@ func GetWithProofOptions(path string, key []byte, opts rpcclient.ABCIQueryOption
return nil, nil, err return nil, nil, err
} }
_ = commit
return &ctypes.ResultABCIQuery{Response: resp}, nil, nil return &ctypes.ResultABCIQuery{Response: resp}, nil, nil
/* // TODO refactor so iavl stuff is not in tendermint core /* // TODO refactor so iavl stuff is not in tendermint core


+ 2
- 0
lite/proxy/wrapper.go View File

@ -1,6 +1,8 @@
package proxy package proxy
import ( import (
cmn "github.com/tendermint/tmlibs/common"
"github.com/tendermint/tendermint/lite" "github.com/tendermint/tendermint/lite"
certclient "github.com/tendermint/tendermint/lite/client" certclient "github.com/tendermint/tendermint/lite/client"
rpcclient "github.com/tendermint/tendermint/rpc/client" rpcclient "github.com/tendermint/tendermint/rpc/client"


+ 2
- 1
node/node.go View File

@ -53,7 +53,8 @@ type DBProvider func(*DBContext) (dbm.DB, error)
// DefaultDBProvider returns a database using the DBBackend and DBDir // DefaultDBProvider returns a database using the DBBackend and DBDir
// specified in the ctx.Config. // specified in the ctx.Config.
func DefaultDBProvider(ctx *DBContext) (dbm.DB, error) { func DefaultDBProvider(ctx *DBContext) (dbm.DB, error) {
return dbm.NewDB(ctx.ID, ctx.Config.DBBackend, ctx.Config.DBDir()), nil
dbType := dbm.DBBackendType(ctx.Config.DBBackend)
return dbm.NewDB(ctx.ID, dbType, ctx.Config.DBDir()), nil
} }
// GenesisDocProvider returns a GenesisDoc. // GenesisDocProvider returns a GenesisDoc.


+ 2
- 0
rpc/core/types/responses.go View File

@ -6,6 +6,8 @@ import (
abci "github.com/tendermint/abci/types" abci "github.com/tendermint/abci/types"
crypto "github.com/tendermint/go-crypto" crypto "github.com/tendermint/go-crypto"
cmn "github.com/tendermint/tmlibs/common"
cstypes "github.com/tendermint/tendermint/consensus/types" cstypes "github.com/tendermint/tendermint/consensus/types"
"github.com/tendermint/tendermint/p2p" "github.com/tendermint/tendermint/p2p"
"github.com/tendermint/tendermint/state" "github.com/tendermint/tendermint/state"


Loading…
Cancel
Save