Application uses new ParamsXxx and ResultXxx Types

types/application.go

@@ -6,23 +6,23 @@ import (
 
 // Application is an interface that enables any finite, deterministic state machine
 // to be driven by a blockchain-based replication engine via the ABCI.
-// All methods take a RequestXxx argument and return a ResponseXxx argument,
+// All methods take a ParamsXxx argument and return a ResultXxx argument,
 // except CheckTx/DeliverTx, which take `tx []byte`, and `Commit`, which takes nothing.
 type Application interface {
 	// Info/Query Connection
-	Info(RequestInfo) ResponseInfo                // Return application info
-	SetOption(RequestSetOption) ResponseSetOption // Set application option
-	Query(RequestQuery) ResponseQuery             // Query for state
+	Info(ParamsInfo) ResultInfo                // Return application info
+	SetOption(ParamsSetOption) ResultSetOption // Set application option
+	Query(ParamsQuery) ResultQuery             // Query for state
 
 	// Mempool Connection
-	CheckTx(tx []byte) ResponseCheckTx // Validate a tx for the mempool
+	CheckTx(tx []byte) ResultCheckTx // Validate a tx for the mempool
 
 	// Consensus Connection
-	InitChain(RequestInitChain) ResponseInitChain    // Initialize blockchain with validators and other info from TendermintCore
-	BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block
-	DeliverTx(tx []byte) ResponseDeliverTx           // Deliver a tx for full processing
-	EndBlock(RequestEndBlock) ResponseEndBlock       // Signals the end of a block, returns changes to the validator set
-	Commit() ResponseCommit                          // Commit the state and return the application Merkle root hash
+	InitChain(ParamsInitChain) ResultInitChain    // Initialize blockchain with validators and other info from TendermintCore
+	BeginBlock(ParamsBeginBlock) ResultBeginBlock // Signals the beginning of a block
+	DeliverTx(tx []byte) ResultDeliverTx          // Deliver a tx for full processing
+	EndBlock(ParamsEndBlock) ResultEndBlock       // Signals the end of a block, returns changes to the validator set
+	Commit() ResultCommit                         // Commit the state and return the application Merkle root hash
 }
 
 //-------------------------------------------------------
@@ -37,40 +37,40 @@ func NewBaseApplication() *BaseApplication {
 	return &BaseApplication{}
 }
 
-func (BaseApplication) Info(req RequestInfo) ResponseInfo {
-	return ResponseInfo{}
+func (BaseApplication) Info(req ParamsInfo) ResultInfo {
+	return ResultInfo{}
 }
 
-func (BaseApplication) SetOption(req RequestSetOption) ResponseSetOption {
-	return ResponseSetOption{}
+func (BaseApplication) SetOption(req ParamsSetOption) ResultSetOption {
+	return ResultSetOption{}
 }
 
-func (BaseApplication) DeliverTx(tx []byte) ResponseDeliverTx {
-	return ResponseDeliverTx{Code: CodeTypeOK}
+func (BaseApplication) DeliverTx(tx []byte) ResultDeliverTx {
+	return ResultDeliverTx{Code: CodeTypeOK}
 }
 
-func (BaseApplication) CheckTx(tx []byte) ResponseCheckTx {
-	return ResponseCheckTx{Code: CodeTypeOK}
+func (BaseApplication) CheckTx(tx []byte) ResultCheckTx {
+	return ResultCheckTx{Code: CodeTypeOK}
 }
 
-func (BaseApplication) Commit() ResponseCommit {
-	return ResponseCommit{}
+func (BaseApplication) Commit() ResultCommit {
+	return ResultCommit{}
 }
 
-func (BaseApplication) Query(req RequestQuery) ResponseQuery {
-	return ResponseQuery{Code: CodeTypeOK}
+func (BaseApplication) Query(req ParamsQuery) ResultQuery {
+	return ResultQuery{Code: CodeTypeOK}
 }
 
-func (BaseApplication) InitChain(req RequestInitChain) ResponseInitChain {
-	return ResponseInitChain{}
+func (BaseApplication) InitChain(req ParamsInitChain) ResultInitChain {
+	return ResultInitChain{}
 }
 
-func (BaseApplication) BeginBlock(req RequestBeginBlock) ResponseBeginBlock {
-	return ResponseBeginBlock{}
+func (BaseApplication) BeginBlock(req ParamsBeginBlock) ResultBeginBlock {
+	return ResultBeginBlock{}
 }
 
-func (BaseApplication) EndBlock(req RequestEndBlock) ResponseEndBlock {
-	return ResponseEndBlock{}
+func (BaseApplication) EndBlock(req ParamsEndBlock) ResultEndBlock {
+	return ResultEndBlock{}
 }
 
 //-------------------------------------------------------
@@ -84,55 +84,55 @@ func NewGRPCApplication(app Application) *GRPCApplication {
 	return &GRPCApplication{app}
 }
 
-func (app *GRPCApplication) Echo(ctx context.Context, req *RequestEcho) (*ResponseEcho, error) {
-	return &ResponseEcho{req.Message}, nil
+func (app *GRPCApplication) Echo(ctx context.Context, req *ParamsEcho) (*ResultEcho, error) {
+	return &ResultEcho{req.Message}, nil
 }
 
-func (app *GRPCApplication) Flush(ctx context.Context, req *RequestFlush) (*ResponseFlush, error) {
-	return &ResponseFlush{}, nil
+func (app *GRPCApplication) Flush(ctx context.Context, req *ParamsFlush) (*ResultFlush, error) {
+	return &ResultFlush{}, nil
 }
 
-func (app *GRPCApplication) Info(ctx context.Context, req *RequestInfo) (*ResponseInfo, error) {
+func (app *GRPCApplication) Info(ctx context.Context, req *ParamsInfo) (*ResultInfo, error) {
 	res := app.app.Info(*req)
 	return &res, nil
 }
 
-func (app *GRPCApplication) SetOption(ctx context.Context, req *RequestSetOption) (*ResponseSetOption, error) {
+func (app *GRPCApplication) SetOption(ctx context.Context, req *ParamsSetOption) (*ResultSetOption, error) {
 	res := app.app.SetOption(*req)
 	return &res, nil
 }
 
-func (app *GRPCApplication) DeliverTx(ctx context.Context, req *RequestDeliverTx) (*ResponseDeliverTx, error) {
+func (app *GRPCApplication) DeliverTx(ctx context.Context, req *ParamsDeliverTx) (*ResultDeliverTx, error) {
 	res := app.app.DeliverTx(req.Tx)
 	return &res, nil
 }
 
-func (app *GRPCApplication) CheckTx(ctx context.Context, req *RequestCheckTx) (*ResponseCheckTx, error) {
+func (app *GRPCApplication) CheckTx(ctx context.Context, req *ParamsCheckTx) (*ResultCheckTx, error) {
 	res := app.app.CheckTx(req.Tx)
 	return &res, nil
 }
 
-func (app *GRPCApplication) Query(ctx context.Context, req *RequestQuery) (*ResponseQuery, error) {
+func (app *GRPCApplication) Query(ctx context.Context, req *ParamsQuery) (*ResultQuery, error) {
 	res := app.app.Query(*req)
 	return &res, nil
 }
 
-func (app *GRPCApplication) Commit(ctx context.Context, req *RequestCommit) (*ResponseCommit, error) {
+func (app *GRPCApplication) Commit(ctx context.Context, req *ParamsCommit) (*ResultCommit, error) {
 	res := app.app.Commit()
 	return &res, nil
 }
 
-func (app *GRPCApplication) InitChain(ctx context.Context, req *RequestInitChain) (*ResponseInitChain, error) {
+func (app *GRPCApplication) InitChain(ctx context.Context, req *ParamsInitChain) (*ResultInitChain, error) {
 	res := app.app.InitChain(*req)
 	return &res, nil
 }
 
-func (app *GRPCApplication) BeginBlock(ctx context.Context, req *RequestBeginBlock) (*ResponseBeginBlock, error) {
+func (app *GRPCApplication) BeginBlock(ctx context.Context, req *ParamsBeginBlock) (*ResultBeginBlock, error) {
 	res := app.app.BeginBlock(*req)
 	return &res, nil
 }
 
-func (app *GRPCApplication) EndBlock(ctx context.Context, req *RequestEndBlock) (*ResponseEndBlock, error) {
+func (app *GRPCApplication) EndBlock(ctx context.Context, req *ParamsEndBlock) (*ResultEndBlock, error) {
 	res := app.app.EndBlock(*req)
 	return &res, nil
 }

types/params.go

@@ -0,0 +1,51 @@
+package types
+
+type ParamsEcho struct {
+	Message string `json:"message,omitempty"`
+}
+
+type ParamsFlush struct {
+}
+
+type ParamsInfo struct {
+	Version string `json:"version,omitempty"`
+}
+
+type ParamsSetOption struct {
+	Key   string `json:"key,omitempty"`
+	Value string `json:"value,omitempty"`
+}
+
+type ParamsInitChain struct {
+	Validators   []Validator `json:"validators"`
+	GenesisBytes []byte      `json:"genesis_bytes,omitempty"`
+}
+
+type ParamsQuery struct {
+	Data   []byte `json:"data,omitempty"`
+	Path   string `json:"path,omitempty"`
+	Height int64  `json:"height,omitempty"`
+	Prove  bool   `json:"prove,omitempty"`
+}
+
+type ParamsBeginBlock struct {
+	Hash                []byte             `json:"hash,omitempty"`
+	Header              Header             `json:"header"`
+	Validators          []SigningValidator `json:"validators,omitempty"`
+	ByzantineValidators []Evidence         `json:"byzantine_validators"`
+}
+
+type ParamsCheckTx struct {
+	Tx []byte `json:"tx,omitempty"`
+}
+
+type ParamsDeliverTx struct {
+	Tx []byte `json:"tx,omitempty"`
+}
+
+type ParamsEndBlock struct {
+	Height int64 `json:"height,omitempty"`
+}
+
+type ParamsCommit struct {
+}

types/result.go

@@ -0,0 +1,82 @@
+package types
+
+import common "github.com/tendermint/tmlibs/common"
+
+// nondeterministic
+type ResultException struct {
+	Error string `json:"error,omitempty"`
+}
+
+type ResultEcho struct {
+	Message string `json:"message,omitempty"`
+}
+
+type ResultFlush struct {
+}
+
+type ResultInfo struct {
+	Data             string `json:"data,omitempty"`
+	Version          string `json:"version,omitempty"`
+	LastBlockHeight  int64  `json:"last_block_height,omitempty"`
+	LastBlockAppHash []byte `json:"last_block_app_hash,omitempty"`
+}
+
+type ResultSetOption struct {
+	Code uint32 `json:"code,omitempty"`
+	// bytes data = 2;
+	Log  string `json:"log,omitempty"`
+	Info string `json:"info,omitempty"`
+}
+
+type ResultInitChain struct {
+	Validators []Validator `json:"validators"`
+}
+
+type ResultQuery struct {
+	Code uint32 `json:"code,omitempty"`
+	// bytes data = 2; // use "value" instead.
+	Log    string `json:"log,omitempty"`
+	Info   string `json:"info,omitempty"`
+	Index  int64  `json:"index,omitempty"`
+	Key    []byte `json:"key,omitempty"`
+	Value  []byte `json:"value,omitempty"`
+	Proof  []byte `json:"proof,omitempty"`
+	Height int64  `json:"height,omitempty"`
+}
+
+type ResultBeginBlock struct {
+	Tags []common.KVPair `json:"tags,omitempty"`
+}
+
+type ResultCheckTx struct {
+	Code      uint32          `json:"code,omitempty"`
+	Data      []byte          `json:"data,omitempty"`
+	Log       string          `json:"log,omitempty"`
+	Info      string          `json:"info,omitempty"`
+	GasWanted int64           `json:"gas_wanted,omitempty"`
+	GasUsed   int64           `json:"gas_used,omitempty"`
+	Tags      []common.KVPair `json:"tags,omitempty"`
+	Fee       common.KI64Pair `json:"fee"`
+}
+
+type ResultDeliverTx struct {
+	Code      uint32          `json:"code,omitempty"`
+	Data      []byte          `json:"data,omitempty"`
+	Log       string          `json:"log,omitempty"`
+	Info      string          `json:"info,omitempty"`
+	GasWanted int64           `json:"gas_wanted,omitempty"`
+	GasUsed   int64           `json:"gas_used,omitempty"`
+	Tags      []common.KVPair `json:"tags,omitempty"`
+	Fee       common.KI64Pair `json:"fee"`
+}
+
+type ResultEndBlock struct {
+	ValidatorUpdates      []Validator      `json:"validator_updates"`
+	ConsensusParamUpdates *ConsensusParams `json:"consensus_param_updates,omitempty"`
+	Tags                  []common.KVPair  `json:"tags,omitempty"`
+}
+
+type ResultCommit struct {
+	// reserve 1
+	Data []byte `json:"data,omitempty"`
+}