Cleanup
This commit is contained in:
parent
df0f3a22da
commit
adab86c947
10
app/app.go
10
app/app.go
|
@ -15,7 +15,6 @@ import (
|
|||
|
||||
"github.com/cosmos/cosmos-sdk/errors"
|
||||
sm "github.com/cosmos/cosmos-sdk/state"
|
||||
"github.com/cosmos/cosmos-sdk/version"
|
||||
)
|
||||
|
||||
//nolint
|
||||
|
@ -29,6 +28,10 @@ const (
|
|||
// It should be embeded in another struct for CheckTx,
|
||||
// DeliverTx and initializing state from the genesis.
|
||||
type BaseApp struct {
|
||||
// Name is what is returned from info
|
||||
Name string
|
||||
|
||||
// this is the database state
|
||||
info *sm.ChainState
|
||||
*sm.State
|
||||
|
||||
|
@ -42,12 +45,13 @@ type BaseApp struct {
|
|||
}
|
||||
|
||||
// NewBaseApp creates a data store to handle queries
|
||||
func NewBaseApp(dbName string, cacheSize int, logger log.Logger) (*BaseApp, error) {
|
||||
func NewBaseApp(appName, dbName string, cacheSize int, logger log.Logger) (*BaseApp, error) {
|
||||
state, err := loadState(dbName, cacheSize)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
app := &BaseApp{
|
||||
Name: appName,
|
||||
State: state,
|
||||
height: state.LatestHeight(),
|
||||
info: sm.NewChainState(),
|
||||
|
@ -84,7 +88,7 @@ func (app *BaseApp) Info(req abci.RequestInfo) abci.ResponseInfo {
|
|||
|
||||
return abci.ResponseInfo{
|
||||
// TODO
|
||||
Data: fmt.Sprintf("Basecoin v%v", version.Version),
|
||||
Data: app.Name,
|
||||
LastBlockHeight: app.height,
|
||||
LastBlockAppHash: hash,
|
||||
}
|
||||
|
|
|
@ -4,6 +4,7 @@ import (
|
|||
"fmt"
|
||||
|
||||
abci "github.com/tendermint/abci/types"
|
||||
"github.com/tendermint/abci/version"
|
||||
"github.com/tendermint/tmlibs/log"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk"
|
||||
|
@ -26,7 +27,8 @@ var _ abci.Application = &Basecoin{}
|
|||
|
||||
// NewBasecoin - create a new instance of the basecoin application
|
||||
func NewBasecoin(handler sdk.Handler, dbName string, cacheSize int, logger log.Logger) (*Basecoin, error) {
|
||||
base, err := NewBaseApp(dbName, cacheSize, logger)
|
||||
appName := fmt.Sprintf("Basecoin v%v", version.Version)
|
||||
base, err := NewBaseApp(appName, dbName, cacheSize, logger)
|
||||
app := &Basecoin{
|
||||
BaseApp: base,
|
||||
handler: handler,
|
||||
|
@ -36,7 +38,8 @@ func NewBasecoin(handler sdk.Handler, dbName string, cacheSize int, logger log.L
|
|||
|
||||
// NewBasecoinTick - create a new instance of the basecoin application with tick functionality
|
||||
func NewBasecoinTick(handler sdk.Handler, tick Ticker, dbName string, cacheSize int, logger log.Logger) (*Basecoin, error) {
|
||||
base, err := NewBaseApp(dbName, cacheSize, logger)
|
||||
appName := fmt.Sprintf("Basecoin v%v", version.Version)
|
||||
base, err := NewBaseApp(appName, dbName, cacheSize, logger)
|
||||
app := &Basecoin{
|
||||
BaseApp: base,
|
||||
handler: handler,
|
||||
|
|
11
app/store.go
11
app/store.go
|
@ -1,11 +0,0 @@
|
|||
package app
|
||||
|
||||
// // MockStore returns an in-memory store only intended for testing
|
||||
// func MockStore() *Store {
|
||||
// res, err := NewStore("", 0, log.NewNopLogger())
|
||||
// if err != nil {
|
||||
// // should never happen, abort test if it does
|
||||
// panic(err)
|
||||
// }
|
||||
// return res
|
||||
// }
|
Loading…
Reference in New Issue