Browse Source

Cleaup based on Antons PR comments

pull/1780/head
Ethan Frey 7 years ago
parent
commit
46e1f1ae65
3 changed files with 6 additions and 8 deletions
  1. +2
    -4
      example/dummy/dummy.go
  2. +4
    -3
      example/dummy/persistent_dummy.go
  3. +0
    -1
      tests/test_cli/test.sh

+ 2
- 4
example/dummy/dummy.go View File

@ -1,7 +1,6 @@
package dummy
import (
"fmt"
"strings"
"github.com/tendermint/abci/types"
@ -34,7 +33,6 @@ func (app *DummyApplication) DeliverTx(tx []byte) types.Result {
} else {
app.state.Set(tx, tx)
}
fmt.Println("set data")
return types.OK
}
@ -63,7 +61,7 @@ func (app *DummyApplication) Commit() types.Result {
func (app *DummyApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) {
if reqQuery.Prove {
value, proof, err := app.state.GetWithProof(reqQuery.Data)
// be stupid here
// if this wasn't a dummy app, we'd do something smarter
if err != nil {
panic(err)
}
@ -71,7 +69,7 @@ func (app *DummyApplication) Query(reqQuery types.RequestQuery) (resQuery types.
resQuery.Key = reqQuery.Data
resQuery.Value = value
resQuery.Proof = wire.BinaryBytes(proof)
if value == nil {
if value != nil {
resQuery.Log = "exists"
} else {
resQuery.Log = "does not exist"


+ 4
- 3
example/dummy/persistent_dummy.go View File

@ -89,14 +89,14 @@ func (app *PersistentDummyApplication) CheckTx(tx []byte) types.Result {
}
func (app *PersistentDummyApplication) Commit() types.Result {
app.height = app.blockHeader.Height
h := app.blockHeader.Height
// Save a new version
var appHash []byte
var err error
if app.app.state.Size() > 0 {
appHash, err = app.app.state.SaveVersion(app.height)
appHash, err = app.app.state.SaveVersion(h)
if err != nil {
// if this wasn't a dummy app, we'd do something smarter
panic(err)
@ -104,7 +104,8 @@ func (app *PersistentDummyApplication) Commit() types.Result {
app.logger.Info("Saved state", "root", appHash)
}
app.logger.Info("Commit block", "height", app.height, "root", appHash)
app.height = h
app.logger.Info("Commit block", "height", h, "root", appHash)
return types.NewResultOK(appHash, "")
}


+ 0
- 1
tests/test_cli/test.sh View File

@ -15,7 +15,6 @@ function testExample() {
echo "Example $N"
$APP &> /dev/null &
# $APP &> ./app.out &
sleep 2
abci-cli --verbose batch < "$INPUT" > "${INPUT}.out.new"
killall "$APP"


Loading…
Cancel
Save