Remove TMSP Commit/Rollback; Add CheckTx

example/golang/counter.go

@@ -2,111 +2,77 @@ package example
 
 import (
 	"encoding/binary"
-	"sync"
 
 	. "github.com/tendermint/go-common"
 	"github.com/tendermint/tmsp/types"
 )
 
 type CounterApplication struct {
-	mtx         sync.Mutex
-	hashCount   int
-	txCount     int
-	commitCount int
-	serial      bool
+	hashCount int
+	txCount   int
+	serial    bool
 }
 
 func NewCounterApplication(serial bool) *CounterApplication {
 	return &CounterApplication{serial: serial}
 }
 
-func (app *CounterApplication) Open() types.AppContext {
-	return &CounterAppContext{
-		app:         app,
-		hashCount:   app.hashCount,
-		txCount:     app.txCount,
-		commitCount: app.commitCount,
-		serial:      app.serial,
-	}
-}
-
-//--------------------------------------------------------------------------------
-
-type CounterAppContext struct {
-	app         *CounterApplication
-	hashCount   int
-	txCount     int
-	commitCount int
-	serial      bool
-}
-
-func (appC *CounterAppContext) Echo(message string) string {
+func (app *CounterApplication) Echo(message string) string {
 	return message
 }
 
-func (appC *CounterAppContext) Info() []string {
-	return []string{Fmt("hash, tx, commit counts:%d, %d, %d", appC.hashCount, appC.txCount, appC.commitCount)}
+func (app *CounterApplication) Info() []string {
+	return []string{Fmt("hashes:%v, txs:%v", app.hashCount, app.txCount)}
 }
 
-func (appC *CounterAppContext) SetOption(key string, value string) types.RetCode {
+func (app *CounterApplication) SetOption(key string, value string) types.RetCode {
 	if key == "serial" && value == "on" {
-		appC.serial = true
+		app.serial = true
 	}
 	return 0
 }
 
-func (appC *CounterAppContext) AppendTx(tx []byte) ([]types.Event, types.RetCode) {
-	if appC.serial {
+func (app *CounterApplication) AppendTx(tx []byte) ([]types.Event, types.RetCode) {
+	if app.serial {
 		tx8 := make([]byte, 8)
 		copy(tx8, tx)
 		txValue := binary.LittleEndian.Uint64(tx8)
-		if txValue != uint64(appC.txCount) {
+		if txValue != uint64(app.txCount) {
 			return nil, types.RetCodeInternalError
 		}
 	}
-	appC.txCount += 1
+	app.txCount += 1
 	return nil, 0
 }
 
-func (appC *CounterAppContext) GetHash() ([]byte, types.RetCode) {
-	appC.hashCount += 1
-	if appC.txCount == 0 {
+func (app *CounterApplication) CheckTx(tx []byte) types.RetCode {
+	if app.serial {
+		tx8 := make([]byte, 8)
+		copy(tx8, tx)
+		txValue := binary.LittleEndian.Uint64(tx8)
+		if txValue < uint64(app.txCount) {
+			return types.RetCodeInternalError
+		}
+	}
+	return 0
+}
+
+func (app *CounterApplication) GetHash() ([]byte, types.RetCode) {
+	app.hashCount += 1
+
+	if app.txCount == 0 {
 		return nil, 0
 	} else {
 		hash := make([]byte, 32)
-		binary.LittleEndian.PutUint64(hash, uint64(appC.txCount))
+		binary.LittleEndian.PutUint64(hash, uint64(app.txCount))
 		return hash, 0
 	}
 }
 
-func (appC *CounterAppContext) Commit() types.RetCode {
-	appC.commitCount += 1
-
-	appC.app.mtx.Lock()
-	appC.app.hashCount = appC.hashCount
-	appC.app.txCount = appC.txCount
-	appC.app.commitCount = appC.commitCount
-	appC.app.mtx.Unlock()
+func (app *CounterApplication) AddListener(key string) types.RetCode {
 	return 0
 }
 
-func (appC *CounterAppContext) Rollback() types.RetCode {
-	appC.app.mtx.Lock()
-	appC.hashCount = appC.app.hashCount
-	appC.txCount = appC.app.txCount
-	appC.commitCount = appC.app.commitCount
-	appC.app.mtx.Unlock()
+func (app *CounterApplication) RemListener(key string) types.RetCode {
 	return 0
 }
-
-func (appC *CounterAppContext) AddListener(key string) types.RetCode {
-	return 0
-}
-
-func (appC *CounterAppContext) RemListener(key string) types.RetCode {
-	return 0
-}
-
-func (appC *CounterAppContext) Close() error {
-	return nil
-}