Skip to content

Refactor out BaseApp, StoreApp (per spec #1 and #2) #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Oct 25, 2017
Merged

Refactor out BaseApp, StoreApp (per spec #1 and #2) #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e863e1b
Started separating BaseApp from Basecoin
ethanfrey Oct 16, 2017
987c046
Pull out basecoin stuff
ethanfrey Oct 16, 2017
9d1205f
Merged app.Store into app.BaseApp
ethanfrey Oct 16, 2017
c1d36ee
Fixed all tests
ethanfrey Oct 16, 2017
df0f3a2
Separate genesis parsing from basecoin
ethanfrey Oct 16, 2017
adab86c
Cleanup
ethanfrey Oct 16, 2017
3a16fa9
Clean up genesis handling
ethanfrey Oct 16, 2017
f65215a
Big cleanup of app dir
ethanfrey Oct 16, 2017
3316bfc
Abort on error with genesis app_options
ethanfrey Oct 16, 2017
9b20615
Eyes takes init state, fix cli test about genesis
ethanfrey Oct 16, 2017
4855b3c
StoreApp explicitly exposes some State methods, not embedded, for bet…
ethanfrey Oct 17, 2017
fbe88ee
Clean up state.State as we only support persistence
ethanfrey Oct 17, 2017
6305399
Pulled genesis file parsing into own package, for clarity
ethanfrey Oct 17, 2017
7631680
Cleanup names in genesis package
ethanfrey Oct 17, 2017
acdc083
Clean up genesis, add godoc to genesis and app
ethanfrey Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 0 additions & 240 deletions app/app.go
View file
Open in desktop

This file was deleted.

82 changes: 28 additions & 54 deletions app/app_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func DefaultHandler(feeDenom string) sdk.Handler {
type appTest struct {
t *testing.T
chainID string
app *Basecoin
app *BaseApp
acctIn *coin.AccountWithKey
acctOut *coin.AccountWithKey
}
Expand Down Expand Up @@ -100,8 +100,8 @@ func (at *appTest) feeTx(coins coin.Coins, toll coin.Coin, sequence uint32) sdk.

// set the account on the app through InitState
func (at *appTest) initAccount(acct *coin.AccountWithKey) {
res := at.app.InitState("coin/account", acct.MakeOption())
require.EqualValues(at.t, res, "Success")
err := at.app.InitState("coin", "account", acct.MakeOption())
require.Nil(at.t, err, "%+v", err)
}

// reset the in and out accs to be one account each with 7mycoin
Expand All @@ -112,17 +112,13 @@ func (at *appTest) reset() {
// Note: switch logger if you want to get more info
logger := log.TestingLogger()
// logger := log.NewTracingLogger(log.NewTMLogger(os.Stdout))
store, err := NewStore("", 0, logger.With("module", "store"))
require.Nil(at.t, err, "%+v", err)

at.app = NewBasecoin(
DefaultHandler("mycoin"),
store,
logger.With("module", "app"),
)
store, err := NewStoreApp("app-test", "", 0, logger)
require.Nil(at.t, err, "%+v", err)
at.app = NewBaseApp(store, DefaultHandler("mycoin"), nil)

res := at.app.InitState("base/chain_id", at.chainID)
require.EqualValues(at.t, res, "Success")
err = at.app.InitState("base", "chain_id", at.chainID)
require.Nil(at.t, err, "%+v", err)

at.initAccount(at.acctIn)
at.initAccount(at.acctOut)
Expand All @@ -146,9 +142,9 @@ func getAddr(addr []byte, state state.SimpleDB) (coin.Coins, error) {
func (at *appTest) exec(t *testing.T, tx sdk.Tx, checkTx bool) (res abci.Result, diffIn, diffOut coin.Coins) {
require := require.New(t)

initBalIn, err := getBalance(at.acctIn.Actor(), at.app.GetState())
initBalIn, err := getBalance(at.acctIn.Actor(), at.app.Append())
require.Nil(err, "%+v", err)
initBalOut, err := getBalance(at.acctOut.Actor(), at.app.GetState())
initBalOut, err := getBalance(at.acctOut.Actor(), at.app.Append())
require.Nil(err, "%+v", err)

txBytes := wire.BinaryBytes(tx)
Expand All @@ -158,9 +154,9 @@ func (at *appTest) exec(t *testing.T, tx sdk.Tx, checkTx bool) (res abci.Result,
res = at.app.DeliverTx(txBytes)
}

endBalIn, err := getBalance(at.acctIn.Actor(), at.app.GetState())
endBalIn, err := getBalance(at.acctIn.Actor(), at.app.Append())
require.Nil(err, "%+v", err)
endBalOut, err := getBalance(at.acctOut.Actor(), at.app.GetState())
endBalOut, err := getBalance(at.acctOut.Actor(), at.app.Append())
require.Nil(err, "%+v", err)
return res, endBalIn.Minus(initBalIn), endBalOut.Minus(initBalOut)
}
Expand All @@ -172,29 +168,24 @@ func TestInitState(t *testing.T) {
require := require.New(t)

logger := log.TestingLogger()
store, err := NewStore("", 0, logger.With("module", "store"))
store, err := NewStoreApp("app-test", "", 0, logger)
require.Nil(err, "%+v", err)

app := NewBasecoin(
DefaultHandler("atom"),
store,
logger.With("module", "app"),
)
app := NewBaseApp(store, DefaultHandler("atom"), nil)

//testing ChainID
chainID := "testChain"
res := app.InitState("base/chain_id", chainID)
err = app.InitState("base", "chain_id", chainID)
require.Nil(err, "%+v", err)
assert.EqualValues(app.GetChainID(), chainID)
assert.EqualValues(res, "Success")

// make a nice account...
bal := coin.Coins{{"atom", 77}, {"eth", 12}}
acct := coin.NewAccountWithKey(bal)
res = app.InitState("coin/account", acct.MakeOption())
require.EqualValues(res, "Success")
err = app.InitState("coin", "account", acct.MakeOption())
require.Nil(err, "%+v", err)

// make sure it is set correctly, with some balance
coins, err := getBalance(acct.Actor(), app.GetState())
coins, err := getBalance(acct.Actor(), app.Append())
require.Nil(err)
assert.Equal(bal, coins)

Expand All @@ -218,23 +209,22 @@ func TestInitState(t *testing.T) {
}
]
}`
res = app.InitState("coin/account", unsortAcc)
require.EqualValues(res, "Success")
err = app.InitState("coin", "account", unsortAcc)
require.Nil(err, "%+v", err)

coins, err = getAddr(unsortAddr, app.GetState())
coins, err = getAddr(unsortAddr, app.Append())
require.Nil(err)
assert.True(coins.IsValid())
assert.Equal(unsortCoins, coins)

res = app.InitState("base/dslfkgjdas", "")
assert.NotEqual(res, "Success")
err = app.InitState("base", "dslfkgjdas", "")
require.NotNil(err)

res = app.InitState("dslfkgjdas", "")
assert.NotEqual(res, "Success")

res = app.InitState("dslfkgjdas/szfdjzs", "")
assert.NotEqual(res, "Success")
err = app.InitState("", "dslfkgjdas", "")
require.NotNil(err)

err = app.InitState("dslfkgjdas", "szfdjzs", "")
require.NotNil(err)
}

// Test CheckTx and DeliverTx with insufficient and sufficient balance
Expand Down Expand Up @@ -301,19 +291,3 @@ func TestQuery(t *testing.T) {
})
assert.NotEqual(resQueryPreCommit, resQueryPostCommit, "Query should change before/after commit")
}

func TestSplitKey(t *testing.T) {
assert := assert.New(t)
prefix, suffix := splitKey("foo/bar")
assert.EqualValues("foo", prefix)
assert.EqualValues("bar", suffix)

prefix, suffix = splitKey("foobar")
assert.EqualValues("base", prefix)
assert.EqualValues("foobar", suffix)

prefix, suffix = splitKey("some/complex/issue")
assert.EqualValues("some", prefix)
assert.EqualValues("complex/issue", suffix)

}
Loading