diff --git a/client/local_client.go b/client/local_client.go index 28ef6f32..06db859b 100644 --- a/client/local_client.go +++ b/client/local_client.go @@ -38,13 +38,13 @@ func (app *localClient) Stop() bool { func (app *localClient) FlushAsync() *ReqRes { // Do nothing - return newLocalReqRes(types.RequestFlush(), nil) + return newLocalReqRes(types.ToRequestFlush(), nil) } func (app *localClient) EchoAsync(msg string) *ReqRes { return app.callback( - types.RequestEcho(msg), - types.ResponseEcho(msg), + types.ToRequestEcho(msg), + types.ToResponseEcho(msg), ) } @@ -53,8 +53,8 @@ func (app *localClient) InfoAsync() *ReqRes { info := app.Application.Info() app.mtx.Unlock() return app.callback( - types.RequestInfo(), - types.ResponseInfo(info), + types.ToRequestInfo(), + types.ToResponseInfo(info), ) } @@ -63,8 +63,8 @@ func (app *localClient) SetOptionAsync(key string, value string) *ReqRes { log := app.Application.SetOption(key, value) app.mtx.Unlock() return app.callback( - types.RequestSetOption(key, value), - types.ResponseSetOption(log), + types.ToRequestSetOption(key, value), + types.ToResponseSetOption(log), ) } @@ -73,8 +73,8 @@ func (app *localClient) AppendTxAsync(tx []byte) *ReqRes { res := app.Application.AppendTx(tx) app.mtx.Unlock() return app.callback( - types.RequestAppendTx(tx), - types.ResponseAppendTx(res.Code, res.Data, res.Log), + types.ToRequestAppendTx(tx), + types.ToResponseAppendTx(res.Code, res.Data, res.Log), ) } @@ -83,8 +83,8 @@ func (app *localClient) CheckTxAsync(tx []byte) *ReqRes { res := app.Application.CheckTx(tx) app.mtx.Unlock() return app.callback( - types.RequestCheckTx(tx), - types.ResponseCheckTx(res.Code, res.Data, res.Log), + types.ToRequestCheckTx(tx), + types.ToResponseCheckTx(res.Code, res.Data, res.Log), ) } @@ -93,8 +93,8 @@ func (app *localClient) QueryAsync(tx []byte) *ReqRes { res := app.Application.Query(tx) app.mtx.Unlock() return app.callback( - types.RequestQuery(tx), - types.ResponseQuery(res.Code, res.Data, res.Log), + types.ToRequestQuery(tx), + types.ToResponseQuery(res.Code, res.Data, res.Log), ) } @@ -103,8 +103,8 @@ func (app *localClient) CommitAsync() *ReqRes { res := app.Application.Commit() app.mtx.Unlock() return app.callback( - types.RequestCommit(), - types.ResponseCommit(res.Code, res.Data, res.Log), + types.ToRequestCommit(), + types.ToResponseCommit(res.Code, res.Data, res.Log), ) } @@ -114,8 +114,8 @@ func (app *localClient) InitChainAsync(validators []*types.Validator) *ReqRes { bcApp.InitChain(validators) } reqRes := app.callback( - types.RequestInitChain(validators), - types.ResponseInitChain(), + types.ToRequestInitChain(validators), + types.ToResponseInitChain(), ) app.mtx.Unlock() return reqRes @@ -128,8 +128,8 @@ func (app *localClient) BeginBlockAsync(height uint64) *ReqRes { } app.mtx.Unlock() return app.callback( - types.RequestBeginBlock(height), - types.ResponseBeginBlock(), + types.ToRequestBeginBlock(height), + types.ToResponseBeginBlock(), ) } @@ -141,8 +141,8 @@ func (app *localClient) EndBlockAsync(height uint64) *ReqRes { } app.mtx.Unlock() return app.callback( - types.RequestEndBlock(height), - types.ResponseEndBlock(validators), + types.ToRequestEndBlock(height), + types.ToResponseEndBlock(validators), ) } diff --git a/client/remote_client.go b/client/remote_client.go index d0aff152..5d6dd6dc 100644 --- a/client/remote_client.go +++ b/client/remote_client.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "net" + "reflect" "sync" "time" @@ -13,6 +14,11 @@ import ( "github.com/tendermint/tmsp/types" ) +const ( + OK = types.CodeType_OK + LOG = "" +) + const reqQueueSize = 256 // TODO make configurable const maxResponseSize = 1048576 // 1MB TODO make configurable const flushThrottleMS = 20 // Don't wait longer than... @@ -122,7 +128,7 @@ func (cli *remoteClient) sendRequestsRoutine(conn net.Conn) { select { case <-cli.flushTimer.Ch: select { - case cli.reqQueue <- NewReqRes(types.RequestFlush()): + case cli.reqQueue <- NewReqRes(types.ToRequestFlush()): default: // Probably will fill the buffer, or retry later. } @@ -136,7 +142,7 @@ func (cli *remoteClient) sendRequestsRoutine(conn net.Conn) { return } // log.Debug("Sent request", "requestType", reflect.TypeOf(reqres.Request), "request", reqres.Request) - if reqres.Request.Type == types.MessageType_Flush { + if _, ok := reqres.Request.Requests.(*types.Request_Flush); ok { err = w.Flush() if err != nil { cli.StopForError(err) @@ -156,10 +162,10 @@ func (cli *remoteClient) recvResponseRoutine(conn net.Conn) { cli.StopForError(err) return } - switch res.Type { - case types.MessageType_Exception: + switch r := res.Responses.(type) { + case *types.Response_Exception: // XXX After setting cli.err, release waiters (e.g. reqres.Done()) - cli.StopForError(errors.New(res.Error)) + cli.StopForError(errors.New(r.Exception.Error)) default: // log.Debug("Received response", "responseType", reflect.TypeOf(res), "response", res) err := cli.didRecvResponse(res) @@ -183,12 +189,12 @@ func (cli *remoteClient) didRecvResponse(res *types.Response) error { // Get the first ReqRes next := cli.reqSent.Front() if next == nil { - return fmt.Errorf("Unexpected result type %v when nothing expected", res.Type) + return fmt.Errorf("Unexpected result type %v when nothing expected", reflect.TypeOf(res.Responses)) } reqres := next.Value.(*ReqRes) if !resMatchesReq(reqres.Request, res) { return fmt.Errorf("Unexpected result type %v when response to %v expected", - res.Type, reqres.Request.Type) + reflect.TypeOf(res.Responses), reflect.TypeOf(reqres.Request.Requests)) } reqres.Response = res // Set response @@ -211,128 +217,128 @@ func (cli *remoteClient) didRecvResponse(res *types.Response) error { //---------------------------------------- func (cli *remoteClient) EchoAsync(msg string) *ReqRes { - return cli.queueRequest(types.RequestEcho(msg)) + return cli.queueRequest(types.ToRequestEcho(msg)) } func (cli *remoteClient) FlushAsync() *ReqRes { - return cli.queueRequest(types.RequestFlush()) + return cli.queueRequest(types.ToRequestFlush()) } func (cli *remoteClient) InfoAsync() *ReqRes { - return cli.queueRequest(types.RequestInfo()) + return cli.queueRequest(types.ToRequestInfo()) } func (cli *remoteClient) SetOptionAsync(key string, value string) *ReqRes { - return cli.queueRequest(types.RequestSetOption(key, value)) + return cli.queueRequest(types.ToRequestSetOption(key, value)) } func (cli *remoteClient) AppendTxAsync(tx []byte) *ReqRes { - return cli.queueRequest(types.RequestAppendTx(tx)) + return cli.queueRequest(types.ToRequestAppendTx(tx)) } func (cli *remoteClient) CheckTxAsync(tx []byte) *ReqRes { - return cli.queueRequest(types.RequestCheckTx(tx)) + return cli.queueRequest(types.ToRequestCheckTx(tx)) } func (cli *remoteClient) QueryAsync(query []byte) *ReqRes { - return cli.queueRequest(types.RequestQuery(query)) + return cli.queueRequest(types.ToRequestQuery(query)) } func (cli *remoteClient) CommitAsync() *ReqRes { - return cli.queueRequest(types.RequestCommit()) + return cli.queueRequest(types.ToRequestCommit()) } func (cli *remoteClient) InitChainAsync(validators []*types.Validator) *ReqRes { - return cli.queueRequest(types.RequestInitChain(validators)) + return cli.queueRequest(types.ToRequestInitChain(validators)) } func (cli *remoteClient) BeginBlockAsync(height uint64) *ReqRes { - return cli.queueRequest(types.RequestBeginBlock(height)) + return cli.queueRequest(types.ToRequestBeginBlock(height)) } func (cli *remoteClient) EndBlockAsync(height uint64) *ReqRes { - return cli.queueRequest(types.RequestEndBlock(height)) + return cli.queueRequest(types.ToRequestEndBlock(height)) } //---------------------------------------- func (cli *remoteClient) EchoSync(msg string) (res types.Result) { - reqres := cli.queueRequest(types.RequestEcho(msg)) + reqres := cli.queueRequest(types.ToRequestEcho(msg)) cli.FlushSync() if cli.err != nil { return types.ErrInternalError.SetLog(cli.err.Error()) } - resp := reqres.Response - return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} + resp := reqres.Response.GetEcho() + return types.Result{Code: OK, Data: []byte(resp.Message), Log: LOG} } func (cli *remoteClient) FlushSync() error { - cli.queueRequest(types.RequestFlush()).Wait() + cli.queueRequest(types.ToRequestFlush()).Wait() return cli.err } func (cli *remoteClient) InfoSync() (res types.Result) { - reqres := cli.queueRequest(types.RequestInfo()) + reqres := cli.queueRequest(types.ToRequestInfo()) cli.FlushSync() if cli.err != nil { return types.ErrInternalError.SetLog(cli.err.Error()) } - resp := reqres.Response - return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} + resp := reqres.Response.GetInfo() + return types.Result{Code: OK, Data: []byte(resp.Info), Log: LOG} } func (cli *remoteClient) SetOptionSync(key string, value string) (res types.Result) { - reqres := cli.queueRequest(types.RequestSetOption(key, value)) + reqres := cli.queueRequest(types.ToRequestSetOption(key, value)) cli.FlushSync() if cli.err != nil { return types.ErrInternalError.SetLog(cli.err.Error()) } - resp := reqres.Response - return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} + resp := reqres.Response.GetSetOption() + return types.Result{Code: OK, Data: nil, Log: resp.Log} } func (cli *remoteClient) AppendTxSync(tx []byte) (res types.Result) { - reqres := cli.queueRequest(types.RequestAppendTx(tx)) + reqres := cli.queueRequest(types.ToRequestAppendTx(tx)) cli.FlushSync() if cli.err != nil { return types.ErrInternalError.SetLog(cli.err.Error()) } - resp := reqres.Response + resp := reqres.Response.GetAppendTx() return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} } func (cli *remoteClient) CheckTxSync(tx []byte) (res types.Result) { - reqres := cli.queueRequest(types.RequestCheckTx(tx)) + reqres := cli.queueRequest(types.ToRequestCheckTx(tx)) cli.FlushSync() if cli.err != nil { return types.ErrInternalError.SetLog(cli.err.Error()) } - resp := reqres.Response + resp := reqres.Response.GetCheckTx() return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} } func (cli *remoteClient) QuerySync(query []byte) (res types.Result) { - reqres := cli.queueRequest(types.RequestQuery(query)) + reqres := cli.queueRequest(types.ToRequestQuery(query)) cli.FlushSync() if cli.err != nil { return types.ErrInternalError.SetLog(cli.err.Error()) } - resp := reqres.Response + resp := reqres.Response.GetQuery() return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} } func (cli *remoteClient) CommitSync() (res types.Result) { - reqres := cli.queueRequest(types.RequestCommit()) + reqres := cli.queueRequest(types.ToRequestCommit()) cli.FlushSync() if cli.err != nil { return types.ErrInternalError.SetLog(cli.err.Error()) } - resp := reqres.Response + resp := reqres.Response.GetCommit() return types.Result{Code: resp.Code, Data: resp.Data, Log: resp.Log} } func (cli *remoteClient) InitChainSync(validators []*types.Validator) (err error) { - cli.queueRequest(types.RequestInitChain(validators)) + cli.queueRequest(types.ToRequestInitChain(validators)) cli.FlushSync() if cli.err != nil { return cli.err @@ -341,7 +347,7 @@ func (cli *remoteClient) InitChainSync(validators []*types.Validator) (err error } func (cli *remoteClient) BeginBlockSync(height uint64) (err error) { - cli.queueRequest(types.RequestBeginBlock(height)) + cli.queueRequest(types.ToRequestBeginBlock(height)) cli.FlushSync() if cli.err != nil { return cli.err @@ -350,12 +356,12 @@ func (cli *remoteClient) BeginBlockSync(height uint64) (err error) { } func (cli *remoteClient) EndBlockSync(height uint64) (validators []*types.Validator, err error) { - reqres := cli.queueRequest(types.RequestEndBlock(height)) + reqres := cli.queueRequest(types.ToRequestEndBlock(height)) cli.FlushSync() if cli.err != nil { return nil, cli.err } - return reqres.Response.Validators, nil + return reqres.Response.GetEndBlock().Diffs, nil } //---------------------------------------- @@ -366,8 +372,8 @@ func (cli *remoteClient) queueRequest(req *types.Request) *ReqRes { cli.reqQueue <- reqres // Maybe auto-flush, or unset auto-flush - switch req.Type { - case types.MessageType_Flush: + switch req.Requests.(type) { + case *types.Request_Flush: cli.flushTimer.Unset() default: cli.flushTimer.Set() @@ -379,5 +385,27 @@ func (cli *remoteClient) queueRequest(req *types.Request) *ReqRes { //---------------------------------------- func resMatchesReq(req *types.Request, res *types.Response) (ok bool) { - return req.Type == res.Type + switch req.Requests.(type) { + case *types.Request_Echo: + _, ok = res.Responses.(*types.Response_Echo) + case *types.Request_Flush: + _, ok = res.Responses.(*types.Response_Flush) + case *types.Request_Info: + _, ok = res.Responses.(*types.Response_Info) + case *types.Request_SetOption: + _, ok = res.Responses.(*types.Response_SetOption) + case *types.Request_AppendTx: + _, ok = res.Responses.(*types.Response_AppendTx) + case *types.Request_CheckTx: + _, ok = res.Responses.(*types.Response_CheckTx) + case *types.Request_Commit: + _, ok = res.Responses.(*types.Response_Commit) + case *types.Request_Query: + _, ok = res.Responses.(*types.Response_Query) + case *types.Request_InitChain: + _, ok = res.Responses.(*types.Response_InitChain) + case *types.Request_EndBlock: + _, ok = res.Responses.(*types.Response_EndBlock) + } + return ok } diff --git a/server/server.go b/server/server.go index e64ab30b..dd2430a1 100644 --- a/server/server.go +++ b/server/server.go @@ -125,45 +125,46 @@ func (s *Server) handleRequests(closeConn chan error, conn net.Conn, responses c } func (s *Server) handleRequest(req *types.Request, responses chan<- *types.Response) { - switch req.Type { - case types.MessageType_Echo: - responses <- types.ResponseEcho(string(req.Data)) - case types.MessageType_Flush: - responses <- types.ResponseFlush() - case types.MessageType_Info: + switch r := req.Requests.(type) { + case *types.Request_Echo: + responses <- types.ToResponseEcho(r.Echo.Message) + case *types.Request_Flush: + responses <- types.ToResponseFlush() + case *types.Request_Info: data := s.app.Info() - responses <- types.ResponseInfo(data) - case types.MessageType_SetOption: - logStr := s.app.SetOption(req.Key, req.Value) - responses <- types.ResponseSetOption(logStr) - case types.MessageType_AppendTx: - res := s.app.AppendTx(req.Data) - responses <- types.ResponseAppendTx(res.Code, res.Data, res.Log) - case types.MessageType_CheckTx: - res := s.app.CheckTx(req.Data) - responses <- types.ResponseCheckTx(res.Code, res.Data, res.Log) - case types.MessageType_Commit: + responses <- types.ToResponseInfo(data) + case *types.Request_SetOption: + so := r.SetOption + logStr := s.app.SetOption(so.Key, so.Value) + responses <- types.ToResponseSetOption(logStr) + case *types.Request_AppendTx: + res := s.app.AppendTx(r.AppendTx.Tx) + responses <- types.ToResponseAppendTx(res.Code, res.Data, res.Log) + case *types.Request_CheckTx: + res := s.app.CheckTx(r.CheckTx.Tx) + responses <- types.ToResponseCheckTx(res.Code, res.Data, res.Log) + case *types.Request_Commit: res := s.app.Commit() - responses <- types.ResponseCommit(res.Code, res.Data, res.Log) - case types.MessageType_Query: - res := s.app.Query(req.Data) - responses <- types.ResponseQuery(res.Code, res.Data, res.Log) - case types.MessageType_InitChain: + responses <- types.ToResponseCommit(res.Code, res.Data, res.Log) + case *types.Request_Query: + res := s.app.Query(r.Query.Query) + responses <- types.ToResponseQuery(res.Code, res.Data, res.Log) + case *types.Request_InitChain: if app, ok := s.app.(types.BlockchainAware); ok { - app.InitChain(req.Validators) - responses <- types.ResponseInitChain() + app.InitChain(r.InitChain.Validators) + responses <- types.ToResponseInitChain() } else { - responses <- types.ResponseInitChain() + responses <- types.ToResponseInitChain() } - case types.MessageType_EndBlock: + case *types.Request_EndBlock: if app, ok := s.app.(types.BlockchainAware); ok { - validators := app.EndBlock(req.Height) - responses <- types.ResponseEndBlock(validators) + validators := app.EndBlock(r.EndBlock.Height) + responses <- types.ToResponseEndBlock(validators) } else { - responses <- types.ResponseEndBlock(nil) + responses <- types.ToResponseEndBlock(nil) } default: - responses <- types.ResponseException("Unknown request") + responses <- types.ToResponseException("Unknown request") } } @@ -178,7 +179,7 @@ func (s *Server) handleResponses(closeConn chan error, responses <-chan *types.R closeConn <- fmt.Errorf("Error in handleResponses: %v", err.Error()) return } - if res.Type == types.MessageType_Flush { + if _, ok := res.Responses.(*types.Response_Flush); ok { err = bufWriter.Flush() if err != nil { closeConn <- fmt.Errorf("Error in handleResponses: %v", err.Error()) diff --git a/types/messages.go b/types/messages.go index facc3bfc..730e3d6f 100644 --- a/types/messages.go +++ b/types/messages.go @@ -7,169 +7,143 @@ import ( "github.com/tendermint/go-wire" ) -func RequestEcho(message string) *Request { +func ToRequestEcho(message string) *Request { return &Request{ - Type: MessageType_Echo, - Data: []byte(message), + Requests: &Request_Echo{&RequestEcho{}}, } } -func RequestFlush() *Request { +func ToRequestFlush() *Request { return &Request{ - Type: MessageType_Flush, + Requests: &Request_Flush{&RequestFlush{}}, } } -func RequestInfo() *Request { +func ToRequestInfo() *Request { return &Request{ - Type: MessageType_Info, + Requests: &Request_Info{&RequestInfo{}}, } } -func RequestSetOption(key string, value string) *Request { +func ToRequestSetOption(key string, value string) *Request { return &Request{ - Type: MessageType_SetOption, - Key: key, - Value: value, + Requests: &Request_SetOption{&RequestSetOption{key, value}}, } } -func RequestAppendTx(txBytes []byte) *Request { +func ToRequestAppendTx(txBytes []byte) *Request { return &Request{ - Type: MessageType_AppendTx, - Data: txBytes, + Requests: &Request_AppendTx{&RequestAppendTx{txBytes}}, } } -func RequestCheckTx(txBytes []byte) *Request { +func ToRequestCheckTx(txBytes []byte) *Request { return &Request{ - Type: MessageType_CheckTx, - Data: txBytes, + Requests: &Request_CheckTx{&RequestCheckTx{txBytes}}, } } -func RequestCommit() *Request { +func ToRequestCommit() *Request { return &Request{ - Type: MessageType_Commit, + Requests: &Request_Commit{&RequestCommit{}}, } } -func RequestQuery(queryBytes []byte) *Request { +func ToRequestQuery(queryBytes []byte) *Request { return &Request{ - Type: MessageType_Query, - Data: queryBytes, + Requests: &Request_Query{&RequestQuery{queryBytes}}, } } -func RequestInitChain(validators []*Validator) *Request { +func ToRequestInitChain(validators []*Validator) *Request { return &Request{ - Type: MessageType_InitChain, - Validators: validators, + Requests: &Request_InitChain{&RequestInitChain{validators}}, } } -func RequestBeginBlock(height uint64) *Request { +func ToRequestBeginBlock(height uint64) *Request { return &Request{ - Type: MessageType_BeginBlock, - Height: height, + Requests: &Request_BeginBlock{&RequestBeginBlock{height}}, } } -func RequestEndBlock(height uint64) *Request { +func ToRequestEndBlock(height uint64) *Request { return &Request{ - Type: MessageType_EndBlock, - Height: height, + Requests: &Request_EndBlock{&RequestEndBlock{height}}, } } //---------------------------------------- -func ResponseException(errStr string) *Response { +func ToResponseException(errStr string) *Response { return &Response{ - Type: MessageType_Exception, - Error: errStr, + Responses: &Response_Exception{&ResponseException{errStr}}, } } -func ResponseEcho(message string) *Response { +func ToResponseEcho(message string) *Response { return &Response{ - Type: MessageType_Echo, - Data: []byte(message), + Responses: &Response_Echo{&ResponseEcho{message}}, } } -func ResponseFlush() *Response { +func ToResponseFlush() *Response { return &Response{ - Type: MessageType_Flush, + Responses: &Response_Flush{&ResponseFlush{}}, } } -func ResponseInfo(info string) *Response { +func ToResponseInfo(info string) *Response { return &Response{ - Type: MessageType_Info, - Data: []byte(info), + Responses: &Response_Info{&ResponseInfo{info}}, } } -func ResponseSetOption(log string) *Response { +func ToResponseSetOption(log string) *Response { return &Response{ - Type: MessageType_SetOption, - Log: log, + Responses: &Response_SetOption{&ResponseSetOption{log}}, } } -func ResponseAppendTx(code CodeType, data []byte, log string) *Response { +func ToResponseAppendTx(code CodeType, data []byte, log string) *Response { return &Response{ - Type: MessageType_AppendTx, - Code: code, - Data: data, - Log: log, + Responses: &Response_AppendTx{&ResponseAppendTx{code, data, log}}, } } -func ResponseCheckTx(code CodeType, data []byte, log string) *Response { +func ToResponseCheckTx(code CodeType, data []byte, log string) *Response { return &Response{ - Type: MessageType_CheckTx, - Code: code, - Data: data, - Log: log, + Responses: &Response_CheckTx{&ResponseCheckTx{code, data, log}}, } } -func ResponseCommit(code CodeType, data []byte, log string) *Response { +func ToResponseCommit(code CodeType, data []byte, log string) *Response { return &Response{ - Type: MessageType_Commit, - Code: code, - Data: data, - Log: log, + Responses: &Response_Commit{&ResponseCommit{code, data, log}}, } } -func ResponseQuery(code CodeType, data []byte, log string) *Response { +func ToResponseQuery(code CodeType, data []byte, log string) *Response { return &Response{ - Type: MessageType_Query, - Code: code, - Data: data, - Log: log, + Responses: &Response_Query{&ResponseQuery{code, data, log}}, } } -func ResponseInitChain() *Response { +func ToResponseInitChain() *Response { return &Response{ - Type: MessageType_InitChain, + Responses: &Response_InitChain{&ResponseInitChain{}}, } } -func ResponseBeginBlock() *Response { +func ToResponseBeginBlock() *Response { return &Response{ - Type: MessageType_BeginBlock, + Responses: &Response_BeginBlock{&ResponseBeginBlock{}}, } } -func ResponseEndBlock(validators []*Validator) *Response { +func ToResponseEndBlock(validators []*Validator) *Response { return &Response{ - Type: MessageType_EndBlock, - Validators: validators, + Responses: &Response_EndBlock{&ResponseEndBlock{validators}}, } } diff --git a/types/types.pb.go b/types/types.pb.go index 933e62ca..5e94e290 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -1,16 +1,39 @@ // Code generated by protoc-gen-go. -// source: types/types.proto +// source: types.proto // DO NOT EDIT! /* Package types is a generated protocol buffer package. It is generated from these files: - types/types.proto + types.proto It has these top-level messages: Request + RequestEcho + RequestFlush + RequestInfo + RequestSetOption + RequestAppendTx + RequestCheckTx + RequestQuery + RequestCommit + RequestInitChain + RequestBeginBlock + RequestEndBlock Response + ResponseException + ResponseEcho + ResponseFlush + ResponseInfo + ResponseSetOption + ResponseAppendTx + ResponseCheckTx + ResponseQuery + ResponseCommit + ResponseInitChain + ResponseBeginBlock + ResponseEndBlock Validator */ package types @@ -24,6 +47,10 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +const _ = proto.ProtoPackageIsVersion1 + type MessageType int32 const ( @@ -187,12 +214,19 @@ func (x CodeType) String() string { func (CodeType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } type Request struct { - Type MessageType `protobuf:"varint,1,opt,name=type,enum=types.MessageType" json:"type,omitempty"` - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - Key string `protobuf:"bytes,3,opt,name=key" json:"key,omitempty"` - Value string `protobuf:"bytes,4,opt,name=value" json:"value,omitempty"` - Validators []*Validator `protobuf:"bytes,5,rep,name=validators" json:"validators,omitempty"` - Height uint64 `protobuf:"varint,6,opt,name=height" json:"height,omitempty"` + // Types that are valid to be assigned to Requests: + // *Request_Echo + // *Request_Flush + // *Request_Info + // *Request_SetOption + // *Request_AppendTx + // *Request_CheckTx + // *Request_Commit + // *Request_Query + // *Request_InitChain + // *Request_BeginBlock + // *Request_EndBlock + Requests isRequest_Requests `protobuf_oneof:"requests"` } func (m *Request) Reset() { *m = Request{} } @@ -200,30 +234,1036 @@ func (m *Request) String() string { return proto.CompactTextString(m) func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } -func (m *Request) GetValidators() []*Validator { +type isRequest_Requests interface { + isRequest_Requests() +} + +type Request_Echo struct { + Echo *RequestEcho `protobuf:"bytes,1,opt,name=echo,oneof"` +} +type Request_Flush struct { + Flush *RequestFlush `protobuf:"bytes,2,opt,name=flush,oneof"` +} +type Request_Info struct { + Info *RequestInfo `protobuf:"bytes,3,opt,name=info,oneof"` +} +type Request_SetOption struct { + SetOption *RequestSetOption `protobuf:"bytes,4,opt,name=set_option,json=setOption,oneof"` +} +type Request_AppendTx struct { + AppendTx *RequestAppendTx `protobuf:"bytes,5,opt,name=append_tx,json=appendTx,oneof"` +} +type Request_CheckTx struct { + CheckTx *RequestCheckTx `protobuf:"bytes,6,opt,name=check_tx,json=checkTx,oneof"` +} +type Request_Commit struct { + Commit *RequestCommit `protobuf:"bytes,7,opt,name=commit,oneof"` +} +type Request_Query struct { + Query *RequestQuery `protobuf:"bytes,8,opt,name=query,oneof"` +} +type Request_InitChain struct { + InitChain *RequestInitChain `protobuf:"bytes,9,opt,name=init_chain,json=initChain,oneof"` +} +type Request_BeginBlock struct { + BeginBlock *RequestBeginBlock `protobuf:"bytes,10,opt,name=begin_block,json=beginBlock,oneof"` +} +type Request_EndBlock struct { + EndBlock *RequestEndBlock `protobuf:"bytes,11,opt,name=end_block,json=endBlock,oneof"` +} + +func (*Request_Echo) isRequest_Requests() {} +func (*Request_Flush) isRequest_Requests() {} +func (*Request_Info) isRequest_Requests() {} +func (*Request_SetOption) isRequest_Requests() {} +func (*Request_AppendTx) isRequest_Requests() {} +func (*Request_CheckTx) isRequest_Requests() {} +func (*Request_Commit) isRequest_Requests() {} +func (*Request_Query) isRequest_Requests() {} +func (*Request_InitChain) isRequest_Requests() {} +func (*Request_BeginBlock) isRequest_Requests() {} +func (*Request_EndBlock) isRequest_Requests() {} + +func (m *Request) GetRequests() isRequest_Requests { + if m != nil { + return m.Requests + } + return nil +} + +func (m *Request) GetEcho() *RequestEcho { + if x, ok := m.GetRequests().(*Request_Echo); ok { + return x.Echo + } + return nil +} + +func (m *Request) GetFlush() *RequestFlush { + if x, ok := m.GetRequests().(*Request_Flush); ok { + return x.Flush + } + return nil +} + +func (m *Request) GetInfo() *RequestInfo { + if x, ok := m.GetRequests().(*Request_Info); ok { + return x.Info + } + return nil +} + +func (m *Request) GetSetOption() *RequestSetOption { + if x, ok := m.GetRequests().(*Request_SetOption); ok { + return x.SetOption + } + return nil +} + +func (m *Request) GetAppendTx() *RequestAppendTx { + if x, ok := m.GetRequests().(*Request_AppendTx); ok { + return x.AppendTx + } + return nil +} + +func (m *Request) GetCheckTx() *RequestCheckTx { + if x, ok := m.GetRequests().(*Request_CheckTx); ok { + return x.CheckTx + } + return nil +} + +func (m *Request) GetCommit() *RequestCommit { + if x, ok := m.GetRequests().(*Request_Commit); ok { + return x.Commit + } + return nil +} + +func (m *Request) GetQuery() *RequestQuery { + if x, ok := m.GetRequests().(*Request_Query); ok { + return x.Query + } + return nil +} + +func (m *Request) GetInitChain() *RequestInitChain { + if x, ok := m.GetRequests().(*Request_InitChain); ok { + return x.InitChain + } + return nil +} + +func (m *Request) GetBeginBlock() *RequestBeginBlock { + if x, ok := m.GetRequests().(*Request_BeginBlock); ok { + return x.BeginBlock + } + return nil +} + +func (m *Request) GetEndBlock() *RequestEndBlock { + if x, ok := m.GetRequests().(*Request_EndBlock); ok { + return x.EndBlock + } + return nil +} + +// XXX_OneofFuncs is for the internal use of the proto package. +func (*Request) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { + return _Request_OneofMarshaler, _Request_OneofUnmarshaler, _Request_OneofSizer, []interface{}{ + (*Request_Echo)(nil), + (*Request_Flush)(nil), + (*Request_Info)(nil), + (*Request_SetOption)(nil), + (*Request_AppendTx)(nil), + (*Request_CheckTx)(nil), + (*Request_Commit)(nil), + (*Request_Query)(nil), + (*Request_InitChain)(nil), + (*Request_BeginBlock)(nil), + (*Request_EndBlock)(nil), + } +} + +func _Request_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { + m := msg.(*Request) + // requests + switch x := m.Requests.(type) { + case *Request_Echo: + b.EncodeVarint(1<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Echo); err != nil { + return err + } + case *Request_Flush: + b.EncodeVarint(2<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Flush); err != nil { + return err + } + case *Request_Info: + b.EncodeVarint(3<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Info); err != nil { + return err + } + case *Request_SetOption: + b.EncodeVarint(4<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.SetOption); err != nil { + return err + } + case *Request_AppendTx: + b.EncodeVarint(5<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.AppendTx); err != nil { + return err + } + case *Request_CheckTx: + b.EncodeVarint(6<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.CheckTx); err != nil { + return err + } + case *Request_Commit: + b.EncodeVarint(7<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Commit); err != nil { + return err + } + case *Request_Query: + b.EncodeVarint(8<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Query); err != nil { + return err + } + case *Request_InitChain: + b.EncodeVarint(9<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.InitChain); err != nil { + return err + } + case *Request_BeginBlock: + b.EncodeVarint(10<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.BeginBlock); err != nil { + return err + } + case *Request_EndBlock: + b.EncodeVarint(11<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.EndBlock); err != nil { + return err + } + case nil: + default: + return fmt.Errorf("Request.Requests has unexpected type %T", x) + } + return nil +} + +func _Request_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { + m := msg.(*Request) + switch tag { + case 1: // requests.echo + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestEcho) + err := b.DecodeMessage(msg) + m.Requests = &Request_Echo{msg} + return true, err + case 2: // requests.flush + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestFlush) + err := b.DecodeMessage(msg) + m.Requests = &Request_Flush{msg} + return true, err + case 3: // requests.info + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestInfo) + err := b.DecodeMessage(msg) + m.Requests = &Request_Info{msg} + return true, err + case 4: // requests.set_option + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestSetOption) + err := b.DecodeMessage(msg) + m.Requests = &Request_SetOption{msg} + return true, err + case 5: // requests.append_tx + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestAppendTx) + err := b.DecodeMessage(msg) + m.Requests = &Request_AppendTx{msg} + return true, err + case 6: // requests.check_tx + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestCheckTx) + err := b.DecodeMessage(msg) + m.Requests = &Request_CheckTx{msg} + return true, err + case 7: // requests.commit + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestCommit) + err := b.DecodeMessage(msg) + m.Requests = &Request_Commit{msg} + return true, err + case 8: // requests.query + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestQuery) + err := b.DecodeMessage(msg) + m.Requests = &Request_Query{msg} + return true, err + case 9: // requests.init_chain + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestInitChain) + err := b.DecodeMessage(msg) + m.Requests = &Request_InitChain{msg} + return true, err + case 10: // requests.begin_block + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestBeginBlock) + err := b.DecodeMessage(msg) + m.Requests = &Request_BeginBlock{msg} + return true, err + case 11: // requests.end_block + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(RequestEndBlock) + err := b.DecodeMessage(msg) + m.Requests = &Request_EndBlock{msg} + return true, err + default: + return false, nil + } +} + +func _Request_OneofSizer(msg proto.Message) (n int) { + m := msg.(*Request) + // requests + switch x := m.Requests.(type) { + case *Request_Echo: + s := proto.Size(x.Echo) + n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_Flush: + s := proto.Size(x.Flush) + n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_Info: + s := proto.Size(x.Info) + n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_SetOption: + s := proto.Size(x.SetOption) + n += proto.SizeVarint(4<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_AppendTx: + s := proto.Size(x.AppendTx) + n += proto.SizeVarint(5<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_CheckTx: + s := proto.Size(x.CheckTx) + n += proto.SizeVarint(6<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_Commit: + s := proto.Size(x.Commit) + n += proto.SizeVarint(7<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_Query: + s := proto.Size(x.Query) + n += proto.SizeVarint(8<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_InitChain: + s := proto.Size(x.InitChain) + n += proto.SizeVarint(9<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_BeginBlock: + s := proto.Size(x.BeginBlock) + n += proto.SizeVarint(10<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Request_EndBlock: + s := proto.Size(x.EndBlock) + n += proto.SizeVarint(11<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case nil: + default: + panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + } + return n +} + +type RequestEcho struct { + Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` +} + +func (m *RequestEcho) Reset() { *m = RequestEcho{} } +func (m *RequestEcho) String() string { return proto.CompactTextString(m) } +func (*RequestEcho) ProtoMessage() {} +func (*RequestEcho) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } + +type RequestFlush struct { +} + +func (m *RequestFlush) Reset() { *m = RequestFlush{} } +func (m *RequestFlush) String() string { return proto.CompactTextString(m) } +func (*RequestFlush) ProtoMessage() {} +func (*RequestFlush) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } + +type RequestInfo struct { +} + +func (m *RequestInfo) Reset() { *m = RequestInfo{} } +func (m *RequestInfo) String() string { return proto.CompactTextString(m) } +func (*RequestInfo) ProtoMessage() {} +func (*RequestInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } + +type RequestSetOption struct { + Key string `protobuf:"bytes,1,opt,name=key" json:"key,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"` +} + +func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } +func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } +func (*RequestSetOption) ProtoMessage() {} +func (*RequestSetOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } + +type RequestAppendTx struct { + Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` +} + +func (m *RequestAppendTx) Reset() { *m = RequestAppendTx{} } +func (m *RequestAppendTx) String() string { return proto.CompactTextString(m) } +func (*RequestAppendTx) ProtoMessage() {} +func (*RequestAppendTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } + +type RequestCheckTx struct { + Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` +} + +func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } +func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } +func (*RequestCheckTx) ProtoMessage() {} +func (*RequestCheckTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } + +type RequestQuery struct { + Query []byte `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` +} + +func (m *RequestQuery) Reset() { *m = RequestQuery{} } +func (m *RequestQuery) String() string { return proto.CompactTextString(m) } +func (*RequestQuery) ProtoMessage() {} +func (*RequestQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } + +type RequestCommit struct { +} + +func (m *RequestCommit) Reset() { *m = RequestCommit{} } +func (m *RequestCommit) String() string { return proto.CompactTextString(m) } +func (*RequestCommit) ProtoMessage() {} +func (*RequestCommit) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } + +type RequestInitChain struct { + Validators []*Validator `protobuf:"bytes,1,rep,name=validators" json:"validators,omitempty"` +} + +func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } +func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } +func (*RequestInitChain) ProtoMessage() {} +func (*RequestInitChain) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } + +func (m *RequestInitChain) GetValidators() []*Validator { if m != nil { return m.Validators } return nil } +type RequestBeginBlock struct { + Height uint64 `protobuf:"varint,1,opt,name=height" json:"height,omitempty"` +} + +func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } +func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } +func (*RequestBeginBlock) ProtoMessage() {} +func (*RequestBeginBlock) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } + +type RequestEndBlock struct { + Height uint64 `protobuf:"varint,1,opt,name=height" json:"height,omitempty"` +} + +func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } +func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } +func (*RequestEndBlock) ProtoMessage() {} +func (*RequestEndBlock) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } + type Response struct { - Type MessageType `protobuf:"varint,1,opt,name=type,enum=types.MessageType" json:"type,omitempty"` - Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` - Code CodeType `protobuf:"varint,3,opt,name=code,enum=types.CodeType" json:"code,omitempty"` - Error string `protobuf:"bytes,4,opt,name=error" json:"error,omitempty"` - Log string `protobuf:"bytes,5,opt,name=log" json:"log,omitempty"` - Validators []*Validator `protobuf:"bytes,6,rep,name=validators" json:"validators,omitempty"` + // Types that are valid to be assigned to Responses: + // *Response_Exception + // *Response_Echo + // *Response_Flush + // *Response_Info + // *Response_SetOption + // *Response_AppendTx + // *Response_CheckTx + // *Response_Commit + // *Response_Query + // *Response_InitChain + // *Response_BeginBlock + // *Response_EndBlock + Responses isResponse_Responses `protobuf_oneof:"responses"` } func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} -func (*Response) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } +func (*Response) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } -func (m *Response) GetValidators() []*Validator { +type isResponse_Responses interface { + isResponse_Responses() +} + +type Response_Exception struct { + Exception *ResponseException `protobuf:"bytes,1,opt,name=exception,oneof"` +} +type Response_Echo struct { + Echo *ResponseEcho `protobuf:"bytes,2,opt,name=echo,oneof"` +} +type Response_Flush struct { + Flush *ResponseFlush `protobuf:"bytes,3,opt,name=flush,oneof"` +} +type Response_Info struct { + Info *ResponseInfo `protobuf:"bytes,4,opt,name=info,oneof"` +} +type Response_SetOption struct { + SetOption *ResponseSetOption `protobuf:"bytes,5,opt,name=set_option,json=setOption,oneof"` +} +type Response_AppendTx struct { + AppendTx *ResponseAppendTx `protobuf:"bytes,6,opt,name=append_tx,json=appendTx,oneof"` +} +type Response_CheckTx struct { + CheckTx *ResponseCheckTx `protobuf:"bytes,7,opt,name=check_tx,json=checkTx,oneof"` +} +type Response_Commit struct { + Commit *ResponseCommit `protobuf:"bytes,8,opt,name=commit,oneof"` +} +type Response_Query struct { + Query *ResponseQuery `protobuf:"bytes,9,opt,name=query,oneof"` +} +type Response_InitChain struct { + InitChain *ResponseInitChain `protobuf:"bytes,10,opt,name=init_chain,json=initChain,oneof"` +} +type Response_BeginBlock struct { + BeginBlock *ResponseBeginBlock `protobuf:"bytes,11,opt,name=begin_block,json=beginBlock,oneof"` +} +type Response_EndBlock struct { + EndBlock *ResponseEndBlock `protobuf:"bytes,12,opt,name=end_block,json=endBlock,oneof"` +} + +func (*Response_Exception) isResponse_Responses() {} +func (*Response_Echo) isResponse_Responses() {} +func (*Response_Flush) isResponse_Responses() {} +func (*Response_Info) isResponse_Responses() {} +func (*Response_SetOption) isResponse_Responses() {} +func (*Response_AppendTx) isResponse_Responses() {} +func (*Response_CheckTx) isResponse_Responses() {} +func (*Response_Commit) isResponse_Responses() {} +func (*Response_Query) isResponse_Responses() {} +func (*Response_InitChain) isResponse_Responses() {} +func (*Response_BeginBlock) isResponse_Responses() {} +func (*Response_EndBlock) isResponse_Responses() {} + +func (m *Response) GetResponses() isResponse_Responses { if m != nil { - return m.Validators + return m.Responses + } + return nil +} + +func (m *Response) GetException() *ResponseException { + if x, ok := m.GetResponses().(*Response_Exception); ok { + return x.Exception + } + return nil +} + +func (m *Response) GetEcho() *ResponseEcho { + if x, ok := m.GetResponses().(*Response_Echo); ok { + return x.Echo + } + return nil +} + +func (m *Response) GetFlush() *ResponseFlush { + if x, ok := m.GetResponses().(*Response_Flush); ok { + return x.Flush + } + return nil +} + +func (m *Response) GetInfo() *ResponseInfo { + if x, ok := m.GetResponses().(*Response_Info); ok { + return x.Info + } + return nil +} + +func (m *Response) GetSetOption() *ResponseSetOption { + if x, ok := m.GetResponses().(*Response_SetOption); ok { + return x.SetOption + } + return nil +} + +func (m *Response) GetAppendTx() *ResponseAppendTx { + if x, ok := m.GetResponses().(*Response_AppendTx); ok { + return x.AppendTx + } + return nil +} + +func (m *Response) GetCheckTx() *ResponseCheckTx { + if x, ok := m.GetResponses().(*Response_CheckTx); ok { + return x.CheckTx + } + return nil +} + +func (m *Response) GetCommit() *ResponseCommit { + if x, ok := m.GetResponses().(*Response_Commit); ok { + return x.Commit + } + return nil +} + +func (m *Response) GetQuery() *ResponseQuery { + if x, ok := m.GetResponses().(*Response_Query); ok { + return x.Query + } + return nil +} + +func (m *Response) GetInitChain() *ResponseInitChain { + if x, ok := m.GetResponses().(*Response_InitChain); ok { + return x.InitChain + } + return nil +} + +func (m *Response) GetBeginBlock() *ResponseBeginBlock { + if x, ok := m.GetResponses().(*Response_BeginBlock); ok { + return x.BeginBlock + } + return nil +} + +func (m *Response) GetEndBlock() *ResponseEndBlock { + if x, ok := m.GetResponses().(*Response_EndBlock); ok { + return x.EndBlock + } + return nil +} + +// XXX_OneofFuncs is for the internal use of the proto package. +func (*Response) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { + return _Response_OneofMarshaler, _Response_OneofUnmarshaler, _Response_OneofSizer, []interface{}{ + (*Response_Exception)(nil), + (*Response_Echo)(nil), + (*Response_Flush)(nil), + (*Response_Info)(nil), + (*Response_SetOption)(nil), + (*Response_AppendTx)(nil), + (*Response_CheckTx)(nil), + (*Response_Commit)(nil), + (*Response_Query)(nil), + (*Response_InitChain)(nil), + (*Response_BeginBlock)(nil), + (*Response_EndBlock)(nil), + } +} + +func _Response_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { + m := msg.(*Response) + // responses + switch x := m.Responses.(type) { + case *Response_Exception: + b.EncodeVarint(1<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Exception); err != nil { + return err + } + case *Response_Echo: + b.EncodeVarint(2<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Echo); err != nil { + return err + } + case *Response_Flush: + b.EncodeVarint(3<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Flush); err != nil { + return err + } + case *Response_Info: + b.EncodeVarint(4<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Info); err != nil { + return err + } + case *Response_SetOption: + b.EncodeVarint(5<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.SetOption); err != nil { + return err + } + case *Response_AppendTx: + b.EncodeVarint(6<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.AppendTx); err != nil { + return err + } + case *Response_CheckTx: + b.EncodeVarint(7<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.CheckTx); err != nil { + return err + } + case *Response_Commit: + b.EncodeVarint(8<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Commit); err != nil { + return err + } + case *Response_Query: + b.EncodeVarint(9<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.Query); err != nil { + return err + } + case *Response_InitChain: + b.EncodeVarint(10<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.InitChain); err != nil { + return err + } + case *Response_BeginBlock: + b.EncodeVarint(11<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.BeginBlock); err != nil { + return err + } + case *Response_EndBlock: + b.EncodeVarint(12<<3 | proto.WireBytes) + if err := b.EncodeMessage(x.EndBlock); err != nil { + return err + } + case nil: + default: + return fmt.Errorf("Response.Responses has unexpected type %T", x) + } + return nil +} + +func _Response_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { + m := msg.(*Response) + switch tag { + case 1: // responses.exception + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseException) + err := b.DecodeMessage(msg) + m.Responses = &Response_Exception{msg} + return true, err + case 2: // responses.echo + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseEcho) + err := b.DecodeMessage(msg) + m.Responses = &Response_Echo{msg} + return true, err + case 3: // responses.flush + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseFlush) + err := b.DecodeMessage(msg) + m.Responses = &Response_Flush{msg} + return true, err + case 4: // responses.info + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseInfo) + err := b.DecodeMessage(msg) + m.Responses = &Response_Info{msg} + return true, err + case 5: // responses.set_option + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseSetOption) + err := b.DecodeMessage(msg) + m.Responses = &Response_SetOption{msg} + return true, err + case 6: // responses.append_tx + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseAppendTx) + err := b.DecodeMessage(msg) + m.Responses = &Response_AppendTx{msg} + return true, err + case 7: // responses.check_tx + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseCheckTx) + err := b.DecodeMessage(msg) + m.Responses = &Response_CheckTx{msg} + return true, err + case 8: // responses.commit + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseCommit) + err := b.DecodeMessage(msg) + m.Responses = &Response_Commit{msg} + return true, err + case 9: // responses.query + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseQuery) + err := b.DecodeMessage(msg) + m.Responses = &Response_Query{msg} + return true, err + case 10: // responses.init_chain + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseInitChain) + err := b.DecodeMessage(msg) + m.Responses = &Response_InitChain{msg} + return true, err + case 11: // responses.begin_block + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseBeginBlock) + err := b.DecodeMessage(msg) + m.Responses = &Response_BeginBlock{msg} + return true, err + case 12: // responses.end_block + if wire != proto.WireBytes { + return true, proto.ErrInternalBadWireType + } + msg := new(ResponseEndBlock) + err := b.DecodeMessage(msg) + m.Responses = &Response_EndBlock{msg} + return true, err + default: + return false, nil + } +} + +func _Response_OneofSizer(msg proto.Message) (n int) { + m := msg.(*Response) + // responses + switch x := m.Responses.(type) { + case *Response_Exception: + s := proto.Size(x.Exception) + n += proto.SizeVarint(1<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_Echo: + s := proto.Size(x.Echo) + n += proto.SizeVarint(2<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_Flush: + s := proto.Size(x.Flush) + n += proto.SizeVarint(3<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_Info: + s := proto.Size(x.Info) + n += proto.SizeVarint(4<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_SetOption: + s := proto.Size(x.SetOption) + n += proto.SizeVarint(5<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_AppendTx: + s := proto.Size(x.AppendTx) + n += proto.SizeVarint(6<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_CheckTx: + s := proto.Size(x.CheckTx) + n += proto.SizeVarint(7<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_Commit: + s := proto.Size(x.Commit) + n += proto.SizeVarint(8<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_Query: + s := proto.Size(x.Query) + n += proto.SizeVarint(9<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_InitChain: + s := proto.Size(x.InitChain) + n += proto.SizeVarint(10<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_BeginBlock: + s := proto.Size(x.BeginBlock) + n += proto.SizeVarint(11<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case *Response_EndBlock: + s := proto.Size(x.EndBlock) + n += proto.SizeVarint(12<<3 | proto.WireBytes) + n += proto.SizeVarint(uint64(s)) + n += s + case nil: + default: + panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + } + return n +} + +type ResponseException struct { + Error string `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` +} + +func (m *ResponseException) Reset() { *m = ResponseException{} } +func (m *ResponseException) String() string { return proto.CompactTextString(m) } +func (*ResponseException) ProtoMessage() {} +func (*ResponseException) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } + +type ResponseEcho struct { + Message string `protobuf:"bytes,1,opt,name=message" json:"message,omitempty"` +} + +func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } +func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } +func (*ResponseEcho) ProtoMessage() {} +func (*ResponseEcho) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } + +type ResponseFlush struct { +} + +func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } +func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } +func (*ResponseFlush) ProtoMessage() {} +func (*ResponseFlush) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } + +type ResponseInfo struct { + Info string `protobuf:"bytes,1,opt,name=info" json:"info,omitempty"` +} + +func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } +func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } +func (*ResponseInfo) ProtoMessage() {} +func (*ResponseInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } + +type ResponseSetOption struct { + Log string `protobuf:"bytes,1,opt,name=log" json:"log,omitempty"` +} + +func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } +func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } +func (*ResponseSetOption) ProtoMessage() {} +func (*ResponseSetOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} } + +type ResponseAppendTx struct { + Code CodeType `protobuf:"varint,1,opt,name=code,enum=types.CodeType" json:"code,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log" json:"log,omitempty"` +} + +func (m *ResponseAppendTx) Reset() { *m = ResponseAppendTx{} } +func (m *ResponseAppendTx) String() string { return proto.CompactTextString(m) } +func (*ResponseAppendTx) ProtoMessage() {} +func (*ResponseAppendTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} } + +type ResponseCheckTx struct { + Code CodeType `protobuf:"varint,1,opt,name=code,enum=types.CodeType" json:"code,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log" json:"log,omitempty"` +} + +func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } +func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } +func (*ResponseCheckTx) ProtoMessage() {} +func (*ResponseCheckTx) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} } + +type ResponseQuery struct { + Code CodeType `protobuf:"varint,1,opt,name=code,enum=types.CodeType" json:"code,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log" json:"log,omitempty"` +} + +func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } +func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } +func (*ResponseQuery) ProtoMessage() {} +func (*ResponseQuery) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} } + +type ResponseCommit struct { + Code CodeType `protobuf:"varint,1,opt,name=code,enum=types.CodeType" json:"code,omitempty"` + Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log" json:"log,omitempty"` +} + +func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } +func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } +func (*ResponseCommit) ProtoMessage() {} +func (*ResponseCommit) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} } + +type ResponseInitChain struct { +} + +func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } +func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } +func (*ResponseInitChain) ProtoMessage() {} +func (*ResponseInitChain) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} } + +type ResponseBeginBlock struct { +} + +func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } +func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } +func (*ResponseBeginBlock) ProtoMessage() {} +func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} } + +type ResponseEndBlock struct { + Diffs []*Validator `protobuf:"bytes,4,rep,name=diffs" json:"diffs,omitempty"` +} + +func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } +func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } +func (*ResponseEndBlock) ProtoMessage() {} +func (*ResponseEndBlock) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} } + +func (m *ResponseEndBlock) GetDiffs() []*Validator { + if m != nil { + return m.Diffs } return nil } @@ -236,62 +1276,117 @@ type Validator struct { func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} -func (*Validator) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } +func (*Validator) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} } func init() { proto.RegisterType((*Request)(nil), "types.Request") + proto.RegisterType((*RequestEcho)(nil), "types.RequestEcho") + proto.RegisterType((*RequestFlush)(nil), "types.RequestFlush") + proto.RegisterType((*RequestInfo)(nil), "types.RequestInfo") + proto.RegisterType((*RequestSetOption)(nil), "types.RequestSetOption") + proto.RegisterType((*RequestAppendTx)(nil), "types.RequestAppendTx") + proto.RegisterType((*RequestCheckTx)(nil), "types.RequestCheckTx") + proto.RegisterType((*RequestQuery)(nil), "types.RequestQuery") + proto.RegisterType((*RequestCommit)(nil), "types.RequestCommit") + proto.RegisterType((*RequestInitChain)(nil), "types.RequestInitChain") + proto.RegisterType((*RequestBeginBlock)(nil), "types.RequestBeginBlock") + proto.RegisterType((*RequestEndBlock)(nil), "types.RequestEndBlock") proto.RegisterType((*Response)(nil), "types.Response") + proto.RegisterType((*ResponseException)(nil), "types.ResponseException") + proto.RegisterType((*ResponseEcho)(nil), "types.ResponseEcho") + proto.RegisterType((*ResponseFlush)(nil), "types.ResponseFlush") + proto.RegisterType((*ResponseInfo)(nil), "types.ResponseInfo") + proto.RegisterType((*ResponseSetOption)(nil), "types.ResponseSetOption") + proto.RegisterType((*ResponseAppendTx)(nil), "types.ResponseAppendTx") + proto.RegisterType((*ResponseCheckTx)(nil), "types.ResponseCheckTx") + proto.RegisterType((*ResponseQuery)(nil), "types.ResponseQuery") + proto.RegisterType((*ResponseCommit)(nil), "types.ResponseCommit") + proto.RegisterType((*ResponseInitChain)(nil), "types.ResponseInitChain") + proto.RegisterType((*ResponseBeginBlock)(nil), "types.ResponseBeginBlock") + proto.RegisterType((*ResponseEndBlock)(nil), "types.ResponseEndBlock") proto.RegisterType((*Validator)(nil), "types.Validator") proto.RegisterEnum("types.MessageType", MessageType_name, MessageType_value) proto.RegisterEnum("types.CodeType", CodeType_name, CodeType_value) } var fileDescriptor0 = []byte{ - // 729 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x94, 0x4b, 0x4f, 0xeb, 0x46, - 0x14, 0xc7, 0xeb, 0xc4, 0x09, 0xc9, 0x09, 0x84, 0xc9, 0x90, 0x80, 0x5b, 0x75, 0x81, 0xa8, 0x54, - 0x21, 0x16, 0xb4, 0xa2, 0xab, 0x2e, 0x49, 0x1a, 0x50, 0x84, 0x80, 0xd4, 0x3c, 0xf6, 0xc6, 0x3e, - 0x89, 0xa7, 0x71, 0x66, 0x8c, 0x3d, 0x06, 0xd2, 0xef, 0x55, 0x55, 0xba, 0xfb, 0xbb, 0xb8, 0xef, - 0xc7, 0x27, 0xba, 0x33, 0x7e, 0x24, 0x21, 0x77, 0x71, 0x17, 0x77, 0x13, 0xcd, 0xf9, 0xfd, 0x67, - 0xce, 0x39, 0xff, 0x33, 0x13, 0x43, 0x4b, 0xce, 0x42, 0x8c, 0x7f, 0x4b, 0x7f, 0x0f, 0xc3, 0x48, - 0x48, 0x41, 0x2b, 0x69, 0xb0, 0xf7, 0xbf, 0x01, 0x6b, 0x36, 0xde, 0x27, 0x18, 0x4b, 0xfa, 0x2b, - 0x98, 0x1a, 0x5a, 0xc6, 0xae, 0xb1, 0xdf, 0x3c, 0xa2, 0x87, 0xd9, 0xf6, 0x73, 0x8c, 0x63, 0x67, - 0x8c, 0xd7, 0x2a, 0xb0, 0x53, 0x9d, 0x52, 0x30, 0x3d, 0x47, 0x3a, 0x56, 0x49, 0xed, 0x5b, 0xb7, - 0xd3, 0x35, 0x25, 0x50, 0x9e, 0xe0, 0xcc, 0x2a, 0x2b, 0x54, 0xb7, 0xf5, 0x92, 0xb6, 0xa1, 0xf2, - 0xe0, 0x04, 0x09, 0x5a, 0x66, 0xca, 0xb2, 0x80, 0xfe, 0x0e, 0xa0, 0x16, 0x4c, 0x9d, 0x11, 0x51, - 0x6c, 0x55, 0x76, 0xcb, 0xfb, 0x8d, 0x23, 0x92, 0x57, 0xba, 0x2d, 0x04, 0x7b, 0x69, 0x0f, 0xdd, - 0x86, 0xaa, 0x8f, 0x6c, 0xec, 0x4b, 0xab, 0xaa, 0x12, 0x99, 0x76, 0x1e, 0xed, 0xbd, 0x34, 0xa0, - 0x66, 0x63, 0x1c, 0x0a, 0x1e, 0xe3, 0x77, 0xb5, 0xfe, 0x0b, 0x98, 0xae, 0xf0, 0x30, 0xed, 0xbd, - 0x79, 0xb4, 0x99, 0x9f, 0xed, 0x29, 0x94, 0x1d, 0xd4, 0xa2, 0x76, 0x83, 0x51, 0x24, 0xa2, 0xc2, - 0x4d, 0x1a, 0x68, 0xd7, 0x81, 0x18, 0x2b, 0x1b, 0xa9, 0x6b, 0xb5, 0x5c, 0xf1, 0x57, 0xfd, 0xb6, - 0xbf, 0xbd, 0x3f, 0xa1, 0x3e, 0x17, 0xb4, 0xd9, 0x30, 0xb9, 0x3b, 0x53, 0x93, 0x34, 0xd2, 0x0e, - 0xf3, 0x48, 0x97, 0x0f, 0xc5, 0x23, 0x46, 0x69, 0xe3, 0xa6, 0x9d, 0x05, 0x07, 0x2f, 0x0c, 0x68, - 0x2c, 0x79, 0xa4, 0x9b, 0xd0, 0xb8, 0x48, 0x82, 0x20, 0x47, 0xe4, 0x07, 0x5a, 0x03, 0xb3, 0xef, - 0xfa, 0x82, 0x18, 0xb4, 0x0e, 0x95, 0x93, 0x20, 0x89, 0x7d, 0x52, 0xd2, 0x70, 0xc0, 0x47, 0x82, - 0x94, 0xe9, 0x06, 0xd4, 0xaf, 0x50, 0x5e, 0x86, 0x92, 0x09, 0x4e, 0x4c, 0x1d, 0xf6, 0x9f, 0x5c, - 0xcc, 0xc2, 0x0a, 0x5d, 0x87, 0xda, 0x71, 0x18, 0x22, 0xf7, 0xae, 0x9f, 0x48, 0x8b, 0x36, 0x60, - 0xad, 0xe7, 0xa3, 0x3b, 0x51, 0x81, 0x9a, 0x22, 0x54, 0x7b, 0x62, 0x3a, 0x65, 0x92, 0x6c, 0xe9, - 0xcc, 0x7f, 0x27, 0x18, 0xcd, 0x48, 0x5b, 0x27, 0x18, 0x70, 0x26, 0x7b, 0xbe, 0xc3, 0x38, 0xe9, - 0xd0, 0x26, 0x40, 0x17, 0xc7, 0x8c, 0x77, 0x03, 0xe1, 0x4e, 0xc8, 0xb6, 0x4e, 0xd8, 0xe7, 0x5e, - 0x16, 0xed, 0x1c, 0xfc, 0x57, 0x81, 0x5a, 0x31, 0x64, 0x5a, 0x85, 0xd2, 0xe5, 0x99, 0x6a, 0xb8, - 0x05, 0x1b, 0x03, 0x2e, 0x31, 0xe2, 0x4e, 0xd0, 0xd7, 0x13, 0x56, 0x9d, 0x2b, 0xd4, 0xe7, 0xea, - 0x0e, 0x18, 0x1f, 0x67, 0xa8, 0xa4, 0x13, 0x75, 0x1d, 0xef, 0x42, 0x70, 0x17, 0x95, 0x0b, 0x02, - 0xeb, 0x37, 0xdc, 0x49, 0xa4, 0x2f, 0x22, 0xf6, 0x2f, 0x7a, 0xca, 0x48, 0x07, 0x5a, 0x03, 0x1e, - 0x27, 0xa3, 0x11, 0x73, 0x19, 0x72, 0x79, 0x92, 0x70, 0x2f, 0x56, 0x86, 0x28, 0x34, 0x6f, 0xf8, - 0x84, 0x8b, 0x47, 0x9e, 0xbf, 0x78, 0x52, 0xa5, 0x16, 0xb4, 0xbb, 0x4e, 0x8c, 0x7f, 0x25, 0x61, - 0xc0, 0x5c, 0x47, 0xe2, 0xb1, 0xe7, 0x45, 0x6a, 0x7c, 0x04, 0x75, 0x12, 0xad, 0x3c, 0xaf, 0x3d, - 0x2a, 0x0e, 0x3c, 0xcb, 0x8f, 0x18, 0x93, 0x31, 0xfd, 0x11, 0x3a, 0x5f, 0x29, 0x69, 0x65, 0x9f, - 0xfe, 0x0c, 0xd6, 0xaa, 0x74, 0xea, 0xc4, 0xc3, 0x88, 0x29, 0x03, 0x4c, 0x5d, 0x2e, 0xc9, 0xd4, - 0xf4, 0x55, 0x0c, 0x78, 0x98, 0x48, 0xf2, 0x4f, 0x51, 0x3f, 0xa7, 0x97, 0x89, 0xd4, 0x78, 0xb2, - 0x82, 0x87, 0xe9, 0xf3, 0x20, 0x01, 0xdd, 0x81, 0xad, 0x25, 0x7c, 0xa5, 0xfd, 0xe9, 0xe9, 0x4c, - 0x17, 0xfd, 0x66, 0x02, 0x1b, 0x73, 0x47, 0x26, 0x11, 0x12, 0xae, 0xde, 0x1a, 0xd5, 0x4a, 0x3e, - 0x92, 0xc2, 0xb8, 0x28, 0x2a, 0xe4, 0x3c, 0xaf, 0x10, 0xae, 0xe2, 0x20, 0x51, 0x37, 0x4b, 0xee, - 0x15, 0x26, 0xa7, 0xe2, 0x21, 0xa7, 0x7d, 0x2e, 0x99, 0x9c, 0x91, 0x57, 0x86, 0xf2, 0xb4, 0xb9, - 0xc0, 0xa7, 0x91, 0x48, 0x42, 0xf2, 0xda, 0x50, 0x5d, 0xd2, 0x05, 0x1d, 0x46, 0x22, 0x14, 0xb1, - 0x13, 0x90, 0x37, 0x86, 0xea, 0xa5, 0xa5, 0x84, 0xf9, 0x2d, 0x64, 0x07, 0xde, 0x16, 0x07, 0xe6, - 0xfc, 0x1c, 0xa7, 0x77, 0x18, 0x91, 0x77, 0x86, 0x1a, 0x76, 0x7b, 0x59, 0x98, 0xe7, 0x7a, 0x6f, - 0xe4, 0x1d, 0xcd, 0xa5, 0x5b, 0x21, 0x91, 0x7c, 0x28, 0x70, 0x3e, 0x87, 0x3c, 0xd1, 0x47, 0x83, - 0x6e, 0x41, 0x73, 0x81, 0xd3, 0xbd, 0x9f, 0x0c, 0xfa, 0x13, 0x74, 0x9e, 0x41, 0x75, 0xff, 0x43, - 0xfd, 0x8f, 0x23, 0x9f, 0x8d, 0xbb, 0x6a, 0xfa, 0xfd, 0xfc, 0xe3, 0x4b, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xc9, 0xcf, 0x96, 0x2d, 0x54, 0x05, 0x00, 0x00, + // 1244 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x57, 0xc9, 0x72, 0xdb, 0x46, + 0x13, 0x36, 0xc4, 0xbd, 0x49, 0x51, 0xc3, 0x11, 0x65, 0xc3, 0x7f, 0xfd, 0x07, 0x07, 0xd9, 0xbc, + 0x95, 0x92, 0x92, 0x2b, 0xae, 0x28, 0xc9, 0xc5, 0x92, 0x69, 0x45, 0xe5, 0xb2, 0xa5, 0xd0, 0xcb, + 0x21, 0x4b, 0xa9, 0x40, 0x70, 0x48, 0x22, 0xa2, 0x66, 0x60, 0x2c, 0xb6, 0x94, 0x77, 0xc8, 0xe3, + 0xe4, 0x92, 0x07, 0x48, 0x55, 0xf6, 0xe5, 0x89, 0x32, 0x3d, 0x33, 0x00, 0x09, 0x08, 0xca, 0x49, + 0xb7, 0x99, 0xee, 0xfe, 0x1a, 0x3d, 0xdd, 0x5f, 0x7f, 0x2c, 0x42, 0x3b, 0x3e, 0x0b, 0x58, 0xb4, + 0x19, 0x84, 0x22, 0x16, 0xb4, 0xa6, 0x2e, 0xce, 0x4f, 0x55, 0x68, 0x0c, 0xd9, 0xab, 0x84, 0x45, + 0x31, 0xbd, 0x09, 0x55, 0xe6, 0xcd, 0x84, 0x6d, 0xdd, 0xb0, 0x6e, 0xb6, 0xb7, 0xe8, 0xa6, 0x0e, + 0x37, 0xde, 0x81, 0xf4, 0x7c, 0x7e, 0x65, 0xa8, 0x22, 0xe8, 0x1d, 0xa8, 0x4d, 0xe6, 0x49, 0x34, + 0xb3, 0x57, 0x54, 0xe8, 0x7a, 0x3e, 0xf4, 0x11, 0xba, 0x64, 0xac, 0x8e, 0xc1, 0xb4, 0x3e, 0x9f, + 0x08, 0xbb, 0x52, 0x96, 0x76, 0x5f, 0x7a, 0x30, 0x2d, 0x46, 0xd0, 0x8f, 0x01, 0x22, 0x16, 0x1f, + 0x89, 0x20, 0xf6, 0x05, 0xb7, 0xab, 0x2a, 0xfe, 0x5a, 0x3e, 0xfe, 0x19, 0x8b, 0x0f, 0x94, 0x5b, + 0x82, 0x5a, 0x51, 0x7a, 0xa1, 0x1f, 0x41, 0xcb, 0x0d, 0x02, 0xc6, 0xc7, 0x47, 0xf1, 0xa9, 0x5d, + 0x53, 0xc0, 0xab, 0x79, 0xe0, 0x03, 0xe5, 0x7e, 0x7e, 0x2a, 0x71, 0x4d, 0xd7, 0x9c, 0xe9, 0x16, + 0x34, 0xbd, 0x19, 0xf3, 0x8e, 0x11, 0x55, 0x57, 0xa8, 0x8d, 0x3c, 0x6a, 0x17, 0xbd, 0x0a, 0xd4, + 0xf0, 0xf4, 0x91, 0x6e, 0x42, 0xdd, 0x13, 0x27, 0x27, 0x7e, 0x6c, 0x37, 0x14, 0xa2, 0x5f, 0x40, + 0x28, 0x9f, 0x04, 0x98, 0x28, 0xec, 0x95, 0x74, 0x84, 0x67, 0x76, 0xb3, 0xac, 0x57, 0x5f, 0xa0, + 0x0b, 0x7b, 0xa5, 0x62, 0xb0, 0x03, 0x3e, 0xf7, 0xe3, 0x23, 0x6f, 0xe6, 0xfa, 0xdc, 0x6e, 0x95, + 0x75, 0x60, 0x5f, 0xfa, 0x77, 0xd1, 0x8d, 0x1d, 0xf0, 0xd3, 0x0b, 0xfd, 0x14, 0xda, 0x23, 0x36, + 0xf5, 0xf9, 0xd1, 0x68, 0x2e, 0xbc, 0x63, 0x1b, 0x14, 0xd4, 0xce, 0x43, 0x77, 0x30, 0x60, 0x07, + 0xfd, 0x12, 0x0b, 0xa3, 0xec, 0x86, 0xed, 0xc3, 0xde, 0x69, 0x68, 0xbb, 0xac, 0x7d, 0x03, 0x3e, + 0x4e, 0x81, 0x4d, 0x66, 0xce, 0x3b, 0x00, 0xcd, 0x50, 0xbb, 0x23, 0xe7, 0x7d, 0x68, 0x2f, 0x31, + 0x85, 0xda, 0xd0, 0x38, 0x61, 0x51, 0xe4, 0x4e, 0x99, 0xa2, 0x53, 0x6b, 0x98, 0x5e, 0x9d, 0x2e, + 0x74, 0x96, 0x79, 0xe2, 0xac, 0x66, 0x40, 0xe4, 0x82, 0xf3, 0x09, 0x90, 0xe2, 0xa8, 0x29, 0x81, + 0xca, 0x31, 0x3b, 0x33, 0x89, 0xf0, 0x48, 0xfb, 0x50, 0x7b, 0xed, 0xce, 0x13, 0xa6, 0x08, 0xd8, + 0x1a, 0xea, 0x8b, 0xf3, 0x16, 0xac, 0x15, 0xa6, 0x4d, 0xbb, 0xb0, 0x22, 0x67, 0x8b, 0xc8, 0xce, + 0x50, 0x9e, 0x9c, 0x1b, 0xd0, 0xcd, 0x8f, 0xf6, 0x5c, 0xc4, 0x3b, 0x59, 0x7d, 0x6a, 0x36, 0xf8, + 0x29, 0x3d, 0x3f, 0x1d, 0xa2, 0x2f, 0xce, 0x1a, 0xac, 0xe6, 0x06, 0xee, 0x3c, 0xcc, 0xea, 0xce, + 0x06, 0x44, 0x3f, 0x04, 0x90, 0x85, 0xf9, 0x63, 0x37, 0x16, 0x61, 0x24, 0xf1, 0x15, 0xd9, 0x57, + 0x62, 0xfa, 0xfa, 0x32, 0x75, 0x0c, 0x97, 0x62, 0x9c, 0x3b, 0xd0, 0x3b, 0x37, 0x2b, 0x7a, 0x15, + 0xea, 0x33, 0xe6, 0x4f, 0x67, 0xb1, 0x2a, 0xa1, 0x3a, 0x34, 0x37, 0xe7, 0x56, 0xf6, 0xdc, 0x74, + 0x3a, 0x17, 0x86, 0x7e, 0x5f, 0x83, 0xe6, 0x90, 0x45, 0x81, 0xe0, 0x11, 0x93, 0x24, 0x6b, 0xb1, + 0x53, 0x8f, 0xe9, 0x2d, 0xb3, 0x0a, 0x44, 0xd1, 0x31, 0x83, 0xd4, 0x8f, 0x24, 0xcb, 0x82, 0xe9, + 0x2d, 0xa3, 0x10, 0xc5, 0xb5, 0x37, 0xa0, 0x65, 0x89, 0xb8, 0x9b, 0x4a, 0x44, 0xa5, 0xb0, 0x25, + 0x3a, 0xb6, 0xa0, 0x11, 0xb7, 0x8c, 0x46, 0x54, 0x4b, 0x13, 0xe7, 0x44, 0x62, 0x3b, 0x27, 0x12, + 0xb5, 0xd2, 0xf2, 0x2f, 0x50, 0x89, 0xfb, 0xcb, 0x2a, 0x51, 0x2f, 0x2c, 0x97, 0x46, 0x96, 0xca, + 0xc4, 0xbd, 0x25, 0x99, 0x68, 0x14, 0xb6, 0x43, 0xc3, 0x4a, 0x74, 0xe2, 0x83, 0x4c, 0x27, 0x9a, + 0x05, 0x65, 0x31, 0x90, 0xa2, 0x50, 0xdc, 0x4d, 0x89, 0xd6, 0x2a, 0xed, 0x58, 0x41, 0x29, 0xb6, + 0x73, 0x4a, 0x01, 0xa5, 0x6d, 0xb8, 0x40, 0x2a, 0x3e, 0xcb, 0x4b, 0x85, 0xde, 0xf7, 0xeb, 0x05, + 0xec, 0x85, 0x5a, 0x71, 0x7f, 0x59, 0x2b, 0x3a, 0xa5, 0x4d, 0x2c, 0x15, 0x8b, 0x36, 0xb4, 0x42, + 0xe3, 0x8f, 0x24, 0x75, 0x7b, 0xe7, 0xa8, 0x86, 0x9b, 0xc6, 0xc2, 0x50, 0x84, 0x66, 0xd1, 0xf5, + 0xc5, 0xb9, 0x89, 0xfb, 0xb8, 0x20, 0xd8, 0x7f, 0x28, 0x8b, 0xda, 0xc9, 0x25, 0x7a, 0x39, 0xce, + 0x02, 0x8a, 0x14, 0xa2, 0xd4, 0xb0, 0x4c, 0xe3, 0xd4, 0xd9, 0x79, 0x77, 0x51, 0x49, 0x4e, 0x70, + 0xe6, 0x62, 0x9a, 0x0a, 0x8e, 0x3c, 0x3a, 0xdf, 0xe0, 0x7a, 0xe7, 0x29, 0x42, 0xdf, 0x86, 0xaa, + 0x27, 0xc6, 0xba, 0x8c, 0xee, 0xd6, 0x9a, 0x69, 0xc2, 0xae, 0x34, 0x3d, 0x97, 0xa7, 0xa1, 0x72, + 0xe2, 0x37, 0xe5, 0x6e, 0xbb, 0x6a, 0x65, 0x3a, 0x43, 0x75, 0x4e, 0xd3, 0x57, 0x16, 0xe9, 0xbf, + 0xc6, 0x55, 0xce, 0x51, 0xe9, 0x32, 0xb3, 0x7f, 0xb9, 0x68, 0x8c, 0xd6, 0xb4, 0x4b, 0xcc, 0xfd, + 0x15, 0x0a, 0xea, 0x32, 0xa3, 0x2f, 0x33, 0xf9, 0xfa, 0x62, 0x38, 0x19, 0x97, 0x9d, 0x3e, 0xd0, + 0xf3, 0x24, 0xd5, 0xbf, 0x1b, 0x79, 0xfa, 0xd1, 0xf7, 0xa0, 0x36, 0xf6, 0x27, 0x93, 0x48, 0xca, + 0x4a, 0xb9, 0xf4, 0x6a, 0xb7, 0xb3, 0x0d, 0xad, 0xcc, 0x86, 0x12, 0x1a, 0x24, 0xa3, 0xc7, 0x2c, + 0x15, 0x7c, 0x73, 0x43, 0x76, 0x06, 0xe2, 0x0d, 0x0b, 0x55, 0xc9, 0xd5, 0xa1, 0xbe, 0xdc, 0xfe, + 0xd1, 0x82, 0xf6, 0x13, 0xcd, 0x3f, 0x7c, 0x1d, 0x5d, 0x83, 0xf6, 0xd3, 0x64, 0x3e, 0x37, 0x26, + 0x72, 0x85, 0x36, 0xa1, 0x8a, 0xb4, 0x25, 0x16, 0x6d, 0x41, 0x4d, 0xd1, 0x92, 0xac, 0xa0, 0x11, + 0x09, 0x49, 0x2a, 0x74, 0x15, 0x5a, 0x19, 0xed, 0x48, 0x15, 0xaf, 0xd9, 0x3e, 0x90, 0x1a, 0xed, + 0x40, 0x33, 0x65, 0x1b, 0xe9, 0xd1, 0x36, 0x34, 0x0c, 0x39, 0x88, 0xec, 0x1f, 0xd4, 0x75, 0xbf, + 0xc9, 0x3a, 0x66, 0x56, 0x73, 0x25, 0x7d, 0x4c, 0x90, 0x75, 0x8a, 0x6c, 0xc8, 0x1f, 0x37, 0x58, + 0xf4, 0x88, 0x5c, 0xc5, 0x84, 0x69, 0x77, 0xc8, 0xb5, 0xdb, 0x3f, 0xc8, 0x5f, 0x85, 0x74, 0x2e, + 0xb4, 0x0e, 0x2b, 0x07, 0x8f, 0x65, 0xc1, 0x3d, 0x58, 0xdd, 0xe7, 0x31, 0x0b, 0xb9, 0x3b, 0x1f, + 0xe0, 0x02, 0xca, 0xca, 0xa5, 0x69, 0xc0, 0xe5, 0xd8, 0x7c, 0x3e, 0xd5, 0xa6, 0x15, 0x4c, 0xb4, + 0xe3, 0x8e, 0x9f, 0x0a, 0xee, 0x31, 0xf9, 0x0a, 0x02, 0x9d, 0x17, 0xdc, 0x4d, 0xe2, 0x99, 0x08, + 0xfd, 0xef, 0xd8, 0x58, 0x3e, 0x64, 0x03, 0x7a, 0xfb, 0x3c, 0x4a, 0x26, 0x13, 0xdf, 0xf3, 0x19, + 0x8f, 0x1f, 0x25, 0x7c, 0x1c, 0xc9, 0x07, 0x51, 0xe8, 0xbe, 0xe0, 0xc7, 0x5c, 0xbc, 0xe1, 0xe6, + 0x97, 0x8b, 0xd4, 0xe5, 0x42, 0xf7, 0x77, 0xdc, 0x88, 0x3d, 0x4c, 0x82, 0xb9, 0xef, 0xb9, 0x31, + 0x7b, 0x30, 0x1e, 0x4b, 0xa1, 0x88, 0x08, 0xc3, 0x24, 0xe8, 0xc9, 0x7f, 0x7b, 0x92, 0x02, 0x72, + 0xf9, 0x19, 0x8b, 0xc8, 0x94, 0x5e, 0x87, 0x8d, 0x73, 0x1e, 0xf5, 0xe5, 0x19, 0xfd, 0x3f, 0xd8, + 0x45, 0xd7, 0x9e, 0x1b, 0x1d, 0x86, 0xbe, 0x7c, 0x80, 0x2f, 0x87, 0x4b, 0xb4, 0x57, 0xfd, 0x16, + 0xef, 0xf3, 0x20, 0x89, 0xc9, 0xb7, 0xe9, 0xf7, 0x8d, 0xf5, 0x20, 0x89, 0xd1, 0x7c, 0x5c, 0x30, + 0x1f, 0x2a, 0x7a, 0x90, 0x39, 0xbd, 0x06, 0xeb, 0x4b, 0xe6, 0x67, 0xf8, 0x3e, 0xec, 0xce, 0xc9, + 0xa2, 0x5e, 0xed, 0xf0, 0xa7, 0xdc, 0x8d, 0x93, 0x90, 0x11, 0x2e, 0xb9, 0x46, 0xd1, 0x63, 0x5a, + 0x92, 0x3e, 0x5c, 0xa4, 0x5f, 0x30, 0x76, 0xf3, 0x85, 0xa0, 0x68, 0x9e, 0x27, 0x72, 0xb2, 0xe4, + 0x95, 0x34, 0x93, 0x3d, 0xf1, 0xda, 0x58, 0x07, 0x3c, 0xf6, 0xe3, 0x33, 0xf2, 0xb3, 0x25, 0xdf, + 0xb4, 0xb6, 0x30, 0xef, 0x85, 0x22, 0x09, 0xc8, 0x2f, 0x96, 0xac, 0x92, 0x2e, 0xac, 0x87, 0xa1, + 0x08, 0x44, 0xe4, 0xce, 0xc9, 0xaf, 0x96, 0xac, 0xa5, 0x27, 0x1d, 0xd9, 0x14, 0x34, 0xe0, 0xb7, + 0x14, 0x90, 0xd9, 0x9f, 0xb0, 0x93, 0x11, 0x0b, 0xc9, 0xef, 0x96, 0x6c, 0x76, 0x7f, 0xd9, 0x91, + 0xe5, 0xfa, 0xc3, 0x32, 0x15, 0x65, 0xae, 0x97, 0x22, 0x66, 0xe4, 0xcf, 0xd4, 0x6c, 0xfa, 0x60, + 0x12, 0xfd, 0x65, 0xd1, 0x75, 0xe8, 0x2e, 0xcc, 0x2a, 0xf6, 0x6f, 0x8b, 0xfe, 0x0f, 0x36, 0x72, + 0x46, 0x39, 0xff, 0x43, 0xdc, 0x38, 0xf2, 0x8f, 0x35, 0xaa, 0xab, 0xbf, 0x30, 0xf7, 0xfe, 0x0d, + 0x00, 0x00, 0xff, 0xff, 0x54, 0x89, 0x64, 0x9a, 0xd1, 0x0c, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index 37a4fa6a..4df19b82 100644 --- a/types/types.proto +++ b/types/types.proto @@ -70,24 +70,136 @@ enum CodeType { // Request types message Request { - MessageType type = 1; - bytes data = 2; - string key = 3; - string value = 4; - repeated Validator validators = 5; - uint64 height = 6; + oneof requests{ + RequestEcho echo = 1; + RequestFlush flush = 2; + RequestInfo info = 3; + RequestSetOption set_option = 4; + RequestAppendTx append_tx = 5; + RequestCheckTx check_tx = 6; + RequestCommit commit = 7; + RequestQuery query = 8; + RequestInitChain init_chain = 9; + RequestBeginBlock begin_block = 10; + RequestEndBlock end_block = 11; + } +} + +message RequestEcho { + string message = 1; +} + +message RequestFlush { +} + +message RequestInfo { +} + +message RequestSetOption{ + string key = 1; + string value = 2; +} + +message RequestAppendTx{ + bytes tx = 1; +} + +message RequestCheckTx{ + bytes tx = 1; +} + +message RequestQuery{ + bytes query = 1; +} + +message RequestCommit{ +} + +message RequestInitChain{ + repeated Validator validators = 1; +} + +message RequestBeginBlock{ + uint64 height = 1; +} + +message RequestEndBlock{ + uint64 height = 1; } //---------------------------------------- // Response types + message Response { - MessageType type = 1; - bytes data = 2; - CodeType code = 3; - string error = 4; - string log = 5; - repeated Validator validators = 6; + oneof responses{ + ResponseException exception = 1; + ResponseEcho echo = 2; + ResponseFlush flush = 3; + ResponseInfo info = 4; + ResponseSetOption set_option = 5; + ResponseAppendTx append_tx = 6; + ResponseCheckTx check_tx = 7; + ResponseCommit commit = 8; + ResponseQuery query = 9; + ResponseInitChain init_chain = 10; + ResponseBeginBlock begin_block = 11; + ResponseEndBlock end_block = 12; + } +} + +message ResponseException{ + string error = 1; +} + +message ResponseEcho { + string message = 1; +} + +message ResponseFlush{ +} + +message ResponseInfo { + string info = 1; +} + +message ResponseSetOption{ + string log = 1; +} + +message ResponseAppendTx{ + CodeType code = 1; + bytes data = 2; + string log = 3; +} + +message ResponseCheckTx{ + CodeType code = 1; + bytes data = 2; + string log = 3; +} + +message ResponseQuery{ + CodeType code = 1; + bytes data = 2; + string log = 3; +} + +message ResponseCommit{ + CodeType code = 1; + bytes data = 2; + string log = 3; +} + + +message ResponseInitChain{ +} + +message ResponseBeginBlock{ +} + +message ResponseEndBlock{ + repeated Validator diffs = 4; } //----------------------------------------