From 9adb988e11e5308145ac125726b8a9c815289f0e Mon Sep 17 00:00:00 2001 From: "Kim, JinSan" Date: Mon, 28 Dec 2020 19:30:30 +0900 Subject: [PATCH 1/3] chore: remove abci flush() and make it buildable --- abci/client/client.go | 2 - abci/client/grpc_client.go | 9 - abci/client/local_client.go | 5 - abci/types/application.go | 4 - abci/types/messages.go | 12 - abci/types/types.pb.go | 1006 +++++++---------------------------- abci/types/types.proto | 7 - abci/types/typespb_test.go | 248 --------- mempool/clist_mempool.go | 7 - mempool/mempool.go | 5 - proxy/app_conn.go | 11 - state/execution.go | 8 - 12 files changed, 205 insertions(+), 1119 deletions(-) diff --git a/abci/client/client.go b/abci/client/client.go index c52b8a4cb..1bfbb633a 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -24,7 +24,6 @@ type Client interface { SetResponseCallback(Callback) Error() error - FlushAsync() *ReqRes EchoAsync(msg string) *ReqRes InfoAsync(types.RequestInfo) *ReqRes SetOptionAsync(types.RequestSetOption) *ReqRes @@ -36,7 +35,6 @@ type Client interface { BeginBlockAsync(types.RequestBeginBlock) *ReqRes EndBlockAsync(types.RequestEndBlock) *ReqRes - FlushSync() error EchoSync(msg string) (*types.ResponseEcho, error) InfoSync(types.RequestInfo) (*types.ResponseInfo, error) SetOptionSync(types.RequestSetOption) (*types.ResponseSetOption, error) diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index c79278846..f64f3b43b 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -133,15 +133,6 @@ func (cli *grpcClient) EchoAsync(msg string) *ReqRes { return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_Echo{Echo: res}}) } -func (cli *grpcClient) FlushAsync() *ReqRes { - req := types.ToRequestFlush() - res, err := cli.client.Flush(context.Background(), req.GetFlush(), grpc.WaitForReady(true)) - if err != nil { - cli.StopForError(err) - } - return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_Flush{Flush: res}}) -} - func (cli *grpcClient) InfoAsync(params types.RequestInfo) *ReqRes { req := types.ToRequestInfo(params) res, err := cli.client.Info(context.Background(), req.GetInfo(), grpc.WaitForReady(true)) diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 3946bfbc5..2484d908c 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -44,11 +44,6 @@ func (app *localClient) Error() error { return nil } -func (app *localClient) FlushAsync() *ReqRes { - // Do nothing - return newLocalReqRes(types.ToRequestFlush(), nil) -} - func (app *localClient) EchoAsync(msg string) *ReqRes { app.mtx.Lock() defer app.mtx.Unlock() diff --git a/abci/types/application.go b/abci/types/application.go index 9dd77c4ef..880073246 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -88,10 +88,6 @@ func (app *GRPCApplication) Echo(ctx context.Context, req *RequestEcho) (*Respon return &ResponseEcho{Message: req.Message}, nil } -func (app *GRPCApplication) Flush(ctx context.Context, req *RequestFlush) (*ResponseFlush, error) { - return &ResponseFlush{}, nil -} - func (app *GRPCApplication) Info(ctx context.Context, req *RequestInfo) (*ResponseInfo, error) { res := app.app.Info(*req) return &res, nil diff --git a/abci/types/messages.go b/abci/types/messages.go index ad18727a8..117d71d3d 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -75,12 +75,6 @@ func ToRequestEcho(message string) *Request { } } -func ToRequestFlush() *Request { - return &Request{ - Value: &Request_Flush{&RequestFlush{}}, - } -} - func ToRequestInfo(req RequestInfo) *Request { return &Request{ Value: &Request_Info{&req}, @@ -149,12 +143,6 @@ func ToResponseEcho(message string) *Response { } } -func ToResponseFlush() *Response { - return &Response{ - Value: &Response_Flush{&ResponseFlush{}}, - } -} - func ToResponseInfo(res ResponseInfo) *Response { return &Response{ Value: &Response_Info{&res}, diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 51ff4aedd..27f7ce463 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -65,7 +65,6 @@ func (CheckTxType) EnumDescriptor() ([]byte, []int) { type Request struct { // Types that are valid to be assigned to Value: // *Request_Echo - // *Request_Flush // *Request_Info // *Request_SetOption // *Request_InitChain @@ -124,9 +123,6 @@ type isRequest_Value interface { type Request_Echo struct { Echo *RequestEcho `protobuf:"bytes,2,opt,name=echo,proto3,oneof" json:"echo,omitempty"` } -type Request_Flush struct { - Flush *RequestFlush `protobuf:"bytes,3,opt,name=flush,proto3,oneof" json:"flush,omitempty"` -} type Request_Info struct { Info *RequestInfo `protobuf:"bytes,4,opt,name=info,proto3,oneof" json:"info,omitempty"` } @@ -156,7 +152,6 @@ type Request_Commit struct { } func (*Request_Echo) isRequest_Value() {} -func (*Request_Flush) isRequest_Value() {} func (*Request_Info) isRequest_Value() {} func (*Request_SetOption) isRequest_Value() {} func (*Request_InitChain) isRequest_Value() {} @@ -181,13 +176,6 @@ func (m *Request) GetEcho() *RequestEcho { return nil } -func (m *Request) GetFlush() *RequestFlush { - if x, ok := m.GetValue().(*Request_Flush); ok { - return x.Flush - } - return nil -} - func (m *Request) GetInfo() *RequestInfo { if x, ok := m.GetValue().(*Request_Info); ok { return x.Info @@ -255,7 +243,6 @@ func (m *Request) GetCommit() *RequestCommit { func (*Request) XXX_OneofWrappers() []interface{} { return []interface{}{ (*Request_Echo)(nil), - (*Request_Flush)(nil), (*Request_Info)(nil), (*Request_SetOption)(nil), (*Request_InitChain)(nil), @@ -315,45 +302,6 @@ func (m *RequestEcho) GetMessage() string { return "" } -type RequestFlush struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *RequestFlush) Reset() { *m = RequestFlush{} } -func (m *RequestFlush) String() string { return proto.CompactTextString(m) } -func (*RequestFlush) ProtoMessage() {} -func (*RequestFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{2} -} -func (m *RequestFlush) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *RequestFlush) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_RequestFlush.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *RequestFlush) XXX_Merge(src proto.Message) { - xxx_messageInfo_RequestFlush.Merge(m, src) -} -func (m *RequestFlush) XXX_Size() int { - return m.Size() -} -func (m *RequestFlush) XXX_DiscardUnknown() { - xxx_messageInfo_RequestFlush.DiscardUnknown(m) -} - -var xxx_messageInfo_RequestFlush proto.InternalMessageInfo - type RequestInfo struct { Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` BlockVersion uint64 `protobuf:"varint,2,opt,name=block_version,json=blockVersion,proto3" json:"block_version,omitempty"` @@ -367,7 +315,7 @@ func (m *RequestInfo) Reset() { *m = RequestInfo{} } func (m *RequestInfo) String() string { return proto.CompactTextString(m) } func (*RequestInfo) ProtoMessage() {} func (*RequestInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{3} + return fileDescriptor_9f1eaa49c51fa1ac, []int{2} } func (m *RequestInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -430,7 +378,7 @@ func (m *RequestSetOption) Reset() { *m = RequestSetOption{} } func (m *RequestSetOption) String() string { return proto.CompactTextString(m) } func (*RequestSetOption) ProtoMessage() {} func (*RequestSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{4} + return fileDescriptor_9f1eaa49c51fa1ac, []int{3} } func (m *RequestSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -488,7 +436,7 @@ func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{5} + return fileDescriptor_9f1eaa49c51fa1ac, []int{4} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,7 +514,7 @@ func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} func (*RequestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{6} + return fileDescriptor_9f1eaa49c51fa1ac, []int{5} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -637,7 +585,7 @@ func (m *RequestBeginBlock) Reset() { *m = RequestBeginBlock{} } func (m *RequestBeginBlock) String() string { return proto.CompactTextString(m) } func (*RequestBeginBlock) ProtoMessage() {} func (*RequestBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{7} + return fileDescriptor_9f1eaa49c51fa1ac, []int{6} } func (m *RequestBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -706,7 +654,7 @@ func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } func (*RequestCheckTx) ProtoMessage() {} func (*RequestCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{8} + return fileDescriptor_9f1eaa49c51fa1ac, []int{7} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -760,7 +708,7 @@ func (m *RequestDeliverTx) Reset() { *m = RequestDeliverTx{} } func (m *RequestDeliverTx) String() string { return proto.CompactTextString(m) } func (*RequestDeliverTx) ProtoMessage() {} func (*RequestDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{9} + return fileDescriptor_9f1eaa49c51fa1ac, []int{8} } func (m *RequestDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -807,7 +755,7 @@ func (m *RequestEndBlock) Reset() { *m = RequestEndBlock{} } func (m *RequestEndBlock) String() string { return proto.CompactTextString(m) } func (*RequestEndBlock) ProtoMessage() {} func (*RequestEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{10} + return fileDescriptor_9f1eaa49c51fa1ac, []int{9} } func (m *RequestEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -853,7 +801,7 @@ func (m *RequestCommit) Reset() { *m = RequestCommit{} } func (m *RequestCommit) String() string { return proto.CompactTextString(m) } func (*RequestCommit) ProtoMessage() {} func (*RequestCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{11} + return fileDescriptor_9f1eaa49c51fa1ac, []int{10} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -886,7 +834,6 @@ type Response struct { // Types that are valid to be assigned to Value: // *Response_Exception // *Response_Echo - // *Response_Flush // *Response_Info // *Response_SetOption // *Response_InitChain @@ -906,7 +853,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{12} + return fileDescriptor_9f1eaa49c51fa1ac, []int{11} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -948,9 +895,6 @@ type Response_Exception struct { type Response_Echo struct { Echo *ResponseEcho `protobuf:"bytes,2,opt,name=echo,proto3,oneof" json:"echo,omitempty"` } -type Response_Flush struct { - Flush *ResponseFlush `protobuf:"bytes,3,opt,name=flush,proto3,oneof" json:"flush,omitempty"` -} type Response_Info struct { Info *ResponseInfo `protobuf:"bytes,4,opt,name=info,proto3,oneof" json:"info,omitempty"` } @@ -981,7 +925,6 @@ type Response_Commit struct { func (*Response_Exception) isResponse_Value() {} func (*Response_Echo) isResponse_Value() {} -func (*Response_Flush) isResponse_Value() {} func (*Response_Info) isResponse_Value() {} func (*Response_SetOption) isResponse_Value() {} func (*Response_InitChain) isResponse_Value() {} @@ -1013,13 +956,6 @@ func (m *Response) GetEcho() *ResponseEcho { return nil } -func (m *Response) GetFlush() *ResponseFlush { - if x, ok := m.GetValue().(*Response_Flush); ok { - return x.Flush - } - return nil -} - func (m *Response) GetInfo() *ResponseInfo { if x, ok := m.GetValue().(*Response_Info); ok { return x.Info @@ -1088,7 +1024,6 @@ func (*Response) XXX_OneofWrappers() []interface{} { return []interface{}{ (*Response_Exception)(nil), (*Response_Echo)(nil), - (*Response_Flush)(nil), (*Response_Info)(nil), (*Response_SetOption)(nil), (*Response_InitChain)(nil), @@ -1113,7 +1048,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{13} + return fileDescriptor_9f1eaa49c51fa1ac, []int{12} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1160,7 +1095,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{14} + return fileDescriptor_9f1eaa49c51fa1ac, []int{13} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1196,45 +1131,6 @@ func (m *ResponseEcho) GetMessage() string { return "" } -type ResponseFlush struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } -func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } -func (*ResponseFlush) ProtoMessage() {} -func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{15} -} -func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ResponseFlush) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ResponseFlush.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ResponseFlush) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResponseFlush.Merge(m, src) -} -func (m *ResponseFlush) XXX_Size() int { - return m.Size() -} -func (m *ResponseFlush) XXX_DiscardUnknown() { - xxx_messageInfo_ResponseFlush.DiscardUnknown(m) -} - -var xxx_messageInfo_ResponseFlush proto.InternalMessageInfo - type ResponseInfo struct { Data string `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` @@ -1250,7 +1146,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{16} + return fileDescriptor_9f1eaa49c51fa1ac, []int{14} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1329,7 +1225,7 @@ func (m *ResponseSetOption) Reset() { *m = ResponseSetOption{} } func (m *ResponseSetOption) String() string { return proto.CompactTextString(m) } func (*ResponseSetOption) ProtoMessage() {} func (*ResponseSetOption) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{17} + return fileDescriptor_9f1eaa49c51fa1ac, []int{15} } func (m *ResponseSetOption) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1391,7 +1287,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{18} + return fileDescriptor_9f1eaa49c51fa1ac, []int{16} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1454,7 +1350,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{19} + return fileDescriptor_9f1eaa49c51fa1ac, []int{17} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1557,7 +1453,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{20} + return fileDescriptor_9f1eaa49c51fa1ac, []int{18} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1611,7 +1507,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{21} + return fileDescriptor_9f1eaa49c51fa1ac, []int{19} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1714,7 +1610,7 @@ func (m *ResponseDeliverTx) Reset() { *m = ResponseDeliverTx{} } func (m *ResponseDeliverTx) String() string { return proto.CompactTextString(m) } func (*ResponseDeliverTx) ProtoMessage() {} func (*ResponseDeliverTx) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{22} + return fileDescriptor_9f1eaa49c51fa1ac, []int{20} } func (m *ResponseDeliverTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1812,7 +1708,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{23} + return fileDescriptor_9f1eaa49c51fa1ac, []int{21} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1875,7 +1771,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{24} + return fileDescriptor_9f1eaa49c51fa1ac, []int{22} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1933,7 +1829,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{25} + return fileDescriptor_9f1eaa49c51fa1ac, []int{23} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1998,7 +1894,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{26} + return fileDescriptor_9f1eaa49c51fa1ac, []int{24} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2054,7 +1950,7 @@ func (m *EvidenceParams) Reset() { *m = EvidenceParams{} } func (m *EvidenceParams) String() string { return proto.CompactTextString(m) } func (*EvidenceParams) ProtoMessage() {} func (*EvidenceParams) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{27} + return fileDescriptor_9f1eaa49c51fa1ac, []int{25} } func (m *EvidenceParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2109,7 +2005,7 @@ func (m *ValidatorParams) Reset() { *m = ValidatorParams{} } func (m *ValidatorParams) String() string { return proto.CompactTextString(m) } func (*ValidatorParams) ProtoMessage() {} func (*ValidatorParams) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{28} + return fileDescriptor_9f1eaa49c51fa1ac, []int{26} } func (m *ValidatorParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2157,7 +2053,7 @@ func (m *LastCommitInfo) Reset() { *m = LastCommitInfo{} } func (m *LastCommitInfo) String() string { return proto.CompactTextString(m) } func (*LastCommitInfo) ProtoMessage() {} func (*LastCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{29} + return fileDescriptor_9f1eaa49c51fa1ac, []int{27} } func (m *LastCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2212,7 +2108,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{30} + return fileDescriptor_9f1eaa49c51fa1ac, []int{28} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2284,7 +2180,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{31} + return fileDescriptor_9f1eaa49c51fa1ac, []int{29} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2423,7 +2319,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{32} + return fileDescriptor_9f1eaa49c51fa1ac, []int{30} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2478,7 +2374,7 @@ func (m *BlockID) Reset() { *m = BlockID{} } func (m *BlockID) String() string { return proto.CompactTextString(m) } func (*BlockID) ProtoMessage() {} func (*BlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{33} + return fileDescriptor_9f1eaa49c51fa1ac, []int{31} } func (m *BlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2533,7 +2429,7 @@ func (m *PartSetHeader) Reset() { *m = PartSetHeader{} } func (m *PartSetHeader) String() string { return proto.CompactTextString(m) } func (*PartSetHeader) ProtoMessage() {} func (*PartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{34} + return fileDescriptor_9f1eaa49c51fa1ac, []int{32} } func (m *PartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2590,7 +2486,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{35} + return fileDescriptor_9f1eaa49c51fa1ac, []int{33} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2646,7 +2542,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{36} + return fileDescriptor_9f1eaa49c51fa1ac, []int{34} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2702,7 +2598,7 @@ func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{37} + return fileDescriptor_9f1eaa49c51fa1ac, []int{35} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2757,7 +2653,7 @@ func (m *PubKey) Reset() { *m = PubKey{} } func (m *PubKey) String() string { return proto.CompactTextString(m) } func (*PubKey) ProtoMessage() {} func (*PubKey) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{38} + return fileDescriptor_9f1eaa49c51fa1ac, []int{36} } func (m *PubKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2815,7 +2711,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_9f1eaa49c51fa1ac, []int{39} + return fileDescriptor_9f1eaa49c51fa1ac, []int{37} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2886,8 +2782,6 @@ func init() { golang_proto.RegisterType((*Request)(nil), "tendermint.abci.types.Request") proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.types.RequestEcho") golang_proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.types.RequestEcho") - proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.types.RequestFlush") - golang_proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.types.RequestFlush") proto.RegisterType((*RequestInfo)(nil), "tendermint.abci.types.RequestInfo") golang_proto.RegisterType((*RequestInfo)(nil), "tendermint.abci.types.RequestInfo") proto.RegisterType((*RequestSetOption)(nil), "tendermint.abci.types.RequestSetOption") @@ -2912,8 +2806,6 @@ func init() { golang_proto.RegisterType((*ResponseException)(nil), "tendermint.abci.types.ResponseException") proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.types.ResponseEcho") golang_proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.types.ResponseEcho") - proto.RegisterType((*ResponseFlush)(nil), "tendermint.abci.types.ResponseFlush") - golang_proto.RegisterType((*ResponseFlush)(nil), "tendermint.abci.types.ResponseFlush") proto.RegisterType((*ResponseInfo)(nil), "tendermint.abci.types.ResponseInfo") golang_proto.RegisterType((*ResponseInfo)(nil), "tendermint.abci.types.ResponseInfo") proto.RegisterType((*ResponseSetOption)(nil), "tendermint.abci.types.ResponseSetOption") @@ -2968,157 +2860,153 @@ func init() { proto.RegisterFile("abci/types/types.proto", fileDescriptor_9f1eaa func init() { golang_proto.RegisterFile("abci/types/types.proto", fileDescriptor_9f1eaa49c51fa1ac) } var fileDescriptor_9f1eaa49c51fa1ac = []byte{ - // 2386 bytes of a gzipped FileDescriptorProto + // 2332 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x59, 0x4d, 0x90, 0x1b, 0x47, - 0x15, 0xde, 0xd1, 0x6a, 0x57, 0xd2, 0xd3, 0xfe, 0xc8, 0x6d, 0x27, 0x91, 0x85, 0xb3, 0xeb, 0x9a, - 0x8d, 0xed, 0x75, 0x12, 0xb4, 0x61, 0xa9, 0x50, 0x31, 0x76, 0x85, 0x5a, 0xad, 0x1d, 0xa4, 0x8a, - 0xed, 0x6c, 0xc6, 0xf6, 0x62, 0xa0, 0x2a, 0x53, 0x2d, 0x4d, 0x5b, 0x9a, 0x5a, 0x69, 0x66, 0x32, - 0xd3, 0x92, 0x25, 0x8a, 0x3b, 0x45, 0x15, 0x07, 0x2e, 0x54, 0x71, 0xe1, 0xce, 0x91, 0x03, 0x87, - 0x1c, 0x39, 0xe6, 0xc0, 0x81, 0x03, 0x67, 0x03, 0x0b, 0x27, 0x2a, 0x47, 0x8a, 0xe2, 0x48, 0xf5, - 0xeb, 0x9e, 0x3f, 0xad, 0xb4, 0x1a, 0x07, 0xdf, 0xb8, 0x48, 0xd3, 0x3d, 0xef, 0xbd, 0xee, 0x7e, - 0xfd, 0xde, 0xfb, 0xde, 0x7b, 0x03, 0xaf, 0xd3, 0x76, 0xc7, 0xde, 0xe3, 0x13, 0x8f, 0x05, 0xf2, - 0xb7, 0xee, 0xf9, 0x2e, 0x77, 0xc9, 0x6b, 0x9c, 0x39, 0x16, 0xf3, 0x07, 0xb6, 0xc3, 0xeb, 0x82, - 0xa4, 0x8e, 0x2f, 0x6b, 0xd7, 0x79, 0xcf, 0xf6, 0x2d, 0xd3, 0xa3, 0x3e, 0x9f, 0xec, 0x21, 0xe5, - 0x5e, 0xd7, 0xed, 0xba, 0xf1, 0x93, 0x64, 0xaf, 0xd5, 0x3a, 0xfe, 0xc4, 0xe3, 0xee, 0xde, 0x80, - 0xf9, 0x27, 0x7d, 0xa6, 0xfe, 0xd4, 0xbb, 0x8b, 0x7d, 0xbb, 0x1d, 0xec, 0x9d, 0x8c, 0x92, 0xeb, - 0xd5, 0xb6, 0xbb, 0xae, 0xdb, 0xed, 0x33, 0x29, 0xb3, 0x3d, 0x7c, 0xb6, 0xc7, 0xed, 0x01, 0x0b, - 0x38, 0x1d, 0x78, 0x8a, 0x60, 0x6b, 0x9a, 0xc0, 0x1a, 0xfa, 0x94, 0xdb, 0xae, 0x23, 0xdf, 0xeb, - 0xff, 0x5e, 0x81, 0x82, 0xc1, 0x3e, 0x1f, 0xb2, 0x80, 0x93, 0x0f, 0x20, 0xcf, 0x3a, 0x3d, 0xb7, - 0x9a, 0xbb, 0xaa, 0xed, 0x96, 0xf7, 0xf5, 0xfa, 0xcc, 0xb3, 0xd4, 0x15, 0xf5, 0xbd, 0x4e, 0xcf, - 0x6d, 0x2e, 0x19, 0xc8, 0x41, 0x6e, 0xc3, 0xca, 0xb3, 0xfe, 0x30, 0xe8, 0x55, 0x97, 0x91, 0x75, - 0xe7, 0x7c, 0xd6, 0x8f, 0x04, 0x69, 0x73, 0xc9, 0x90, 0x3c, 0x62, 0x59, 0xdb, 0x79, 0xe6, 0x56, - 0xf3, 0x59, 0x96, 0x6d, 0x39, 0xcf, 0x70, 0x59, 0xc1, 0x41, 0x9a, 0x00, 0x01, 0xe3, 0xa6, 0xeb, - 0x89, 0x03, 0x55, 0x57, 0x90, 0xff, 0xc6, 0xf9, 0xfc, 0x8f, 0x18, 0xff, 0x04, 0xc9, 0x9b, 0x4b, - 0x46, 0x29, 0x08, 0x07, 0x42, 0x92, 0xed, 0xd8, 0xdc, 0xec, 0xf4, 0xa8, 0xed, 0x54, 0x57, 0xb3, - 0x48, 0x6a, 0x39, 0x36, 0x3f, 0x14, 0xe4, 0x42, 0x92, 0x1d, 0x0e, 0x84, 0x2a, 0x3e, 0x1f, 0x32, - 0x7f, 0x52, 0x2d, 0x64, 0x51, 0xc5, 0xa7, 0x82, 0x54, 0xa8, 0x02, 0x79, 0xc8, 0xc7, 0x50, 0x6e, - 0xb3, 0xae, 0xed, 0x98, 0xed, 0xbe, 0xdb, 0x39, 0xa9, 0x16, 0x51, 0xc4, 0xee, 0xf9, 0x22, 0x1a, - 0x82, 0xa1, 0x21, 0xe8, 0x9b, 0x4b, 0x06, 0xb4, 0xa3, 0x11, 0x69, 0x40, 0xb1, 0xd3, 0x63, 0x9d, - 0x13, 0x93, 0x8f, 0xab, 0x25, 0x94, 0x74, 0xed, 0x7c, 0x49, 0x87, 0x82, 0xfa, 0xf1, 0xb8, 0xb9, - 0x64, 0x14, 0x3a, 0xf2, 0x51, 0xe8, 0xc5, 0x62, 0x7d, 0x7b, 0xc4, 0x7c, 0x21, 0xe5, 0x62, 0x16, - 0xbd, 0xdc, 0x95, 0xf4, 0x28, 0xa7, 0x64, 0x85, 0x03, 0x72, 0x0f, 0x4a, 0xcc, 0xb1, 0xd4, 0xc1, - 0xca, 0x28, 0xe8, 0xfa, 0x02, 0x0b, 0x73, 0xac, 0xf0, 0x58, 0x45, 0xa6, 0x9e, 0xc9, 0x87, 0xb0, - 0xda, 0x71, 0x07, 0x03, 0x9b, 0x57, 0xd7, 0x50, 0xc6, 0x5b, 0x0b, 0x8e, 0x84, 0xb4, 0xcd, 0x25, - 0x43, 0x71, 0x35, 0x0a, 0xb0, 0x32, 0xa2, 0xfd, 0x21, 0xd3, 0x6f, 0x40, 0x39, 0x61, 0xc9, 0xa4, - 0x0a, 0x85, 0x01, 0x0b, 0x02, 0xda, 0x65, 0x55, 0xed, 0xaa, 0xb6, 0x5b, 0x32, 0xc2, 0xa1, 0xbe, - 0x01, 0x6b, 0x49, 0xbb, 0xd5, 0x07, 0x11, 0xa3, 0xb0, 0x45, 0xc1, 0x38, 0x62, 0x7e, 0x20, 0x0c, - 0x50, 0x31, 0xaa, 0x21, 0xd9, 0x81, 0x75, 0x3c, 0xad, 0x19, 0xbe, 0x17, 0x7e, 0x95, 0x37, 0xd6, - 0x70, 0xf2, 0x58, 0x11, 0x6d, 0x43, 0xd9, 0xdb, 0xf7, 0x22, 0x92, 0x65, 0x24, 0x01, 0x6f, 0xdf, - 0x53, 0x04, 0xfa, 0x77, 0xa1, 0x32, 0x6d, 0xba, 0xa4, 0x02, 0xcb, 0x27, 0x6c, 0xa2, 0xd6, 0x13, - 0x8f, 0xe4, 0x92, 0x3a, 0x16, 0xae, 0x51, 0x32, 0xd4, 0x19, 0x7f, 0x97, 0x8b, 0x98, 0x23, 0x6b, - 0x15, 0xee, 0x26, 0x82, 0x04, 0x72, 0x97, 0xf7, 0x6b, 0x75, 0x19, 0x20, 0xea, 0x61, 0x80, 0xa8, - 0x3f, 0x0e, 0x23, 0x48, 0xa3, 0xf8, 0xe5, 0x8b, 0xed, 0xa5, 0x5f, 0xfe, 0x65, 0x5b, 0x33, 0x90, - 0x83, 0x5c, 0x16, 0x06, 0x45, 0x6d, 0xc7, 0xb4, 0x2d, 0xb5, 0x4e, 0x01, 0xc7, 0x2d, 0x8b, 0x7c, - 0x0a, 0x95, 0x8e, 0xeb, 0x04, 0xcc, 0x09, 0x86, 0x81, 0x08, 0x73, 0x74, 0x10, 0xa8, 0x58, 0x30, - 0xef, 0x92, 0x0f, 0x43, 0xf2, 0x23, 0xa4, 0x36, 0x36, 0x3b, 0xe9, 0x09, 0x72, 0x1f, 0x60, 0x44, - 0xfb, 0xb6, 0x45, 0xb9, 0xeb, 0x07, 0xd5, 0xfc, 0xd5, 0xe5, 0x73, 0x84, 0x1d, 0x87, 0x84, 0x4f, - 0x3c, 0x8b, 0x72, 0xd6, 0xc8, 0x8b, 0x9d, 0x1b, 0x09, 0x7e, 0x72, 0x1d, 0x36, 0xa9, 0xe7, 0x99, - 0x01, 0xa7, 0x9c, 0x99, 0xed, 0x09, 0x67, 0x01, 0xc6, 0x8b, 0x35, 0x63, 0x9d, 0x7a, 0xde, 0x23, - 0x31, 0xdb, 0x10, 0x93, 0xba, 0x15, 0xdd, 0x36, 0xba, 0x26, 0x21, 0x90, 0xb7, 0x28, 0xa7, 0xa8, - 0xad, 0x35, 0x03, 0x9f, 0xc5, 0x9c, 0x47, 0x79, 0x4f, 0xe9, 0x00, 0x9f, 0xc9, 0xeb, 0xb0, 0xda, - 0x63, 0x76, 0xb7, 0xc7, 0xf1, 0xd8, 0xcb, 0x86, 0x1a, 0x89, 0x8b, 0xf1, 0x7c, 0x77, 0xc4, 0x30, - 0xba, 0x15, 0x0d, 0x39, 0xd0, 0x7f, 0x95, 0x83, 0x0b, 0x67, 0xdc, 0x57, 0xc8, 0xed, 0xd1, 0xa0, - 0x17, 0xae, 0x25, 0x9e, 0xc9, 0x6d, 0x21, 0x97, 0x5a, 0xcc, 0x57, 0x51, 0xf9, 0xcd, 0x39, 0x1a, - 0x68, 0x22, 0x91, 0x3a, 0xb8, 0x62, 0x21, 0x4f, 0xa0, 0xd2, 0xa7, 0x01, 0x37, 0xa5, 0xed, 0x9b, - 0x18, 0x65, 0x97, 0xcf, 0x8d, 0x04, 0xf7, 0x69, 0xe8, 0x33, 0xc2, 0xb8, 0x95, 0xb8, 0x8d, 0x7e, - 0x6a, 0x96, 0x3c, 0x85, 0x4b, 0xed, 0xc9, 0x4f, 0xa8, 0xc3, 0x6d, 0x87, 0x99, 0x67, 0xee, 0x68, - 0x7b, 0x8e, 0xe8, 0x7b, 0x23, 0xdb, 0x62, 0x4e, 0x27, 0xbc, 0x9c, 0x8b, 0x91, 0x88, 0xe8, 0xf2, - 0x02, 0xfd, 0x29, 0x6c, 0xa4, 0x63, 0x11, 0xd9, 0x80, 0x1c, 0x1f, 0x2b, 0x8d, 0xe4, 0xf8, 0x98, - 0x7c, 0x07, 0xf2, 0x42, 0x1c, 0x6a, 0x63, 0x63, 0x2e, 0x58, 0x28, 0xee, 0xc7, 0x13, 0x8f, 0x19, - 0x48, 0xaf, 0xeb, 0x91, 0x27, 0x44, 0xf1, 0x69, 0x5a, 0xb6, 0x7e, 0x13, 0x36, 0xa7, 0x42, 0x4f, - 0xe2, 0x5a, 0xb5, 0xe4, 0xb5, 0xea, 0x9b, 0xb0, 0x9e, 0x8a, 0x30, 0xfa, 0x1f, 0x57, 0xa1, 0x68, - 0xb0, 0xc0, 0x13, 0x46, 0x4c, 0x9a, 0x50, 0x62, 0xe3, 0x0e, 0x93, 0xb0, 0xa4, 0x2d, 0x08, 0xe2, - 0x92, 0xe7, 0x5e, 0x48, 0x2f, 0xa2, 0x66, 0xc4, 0x4c, 0x6e, 0xa5, 0x20, 0x79, 0x67, 0x91, 0x90, - 0x24, 0x26, 0xdf, 0x49, 0x63, 0xf2, 0x5b, 0x0b, 0x78, 0xa7, 0x40, 0xf9, 0x56, 0x0a, 0x94, 0x17, - 0x2d, 0x9c, 0x42, 0xe5, 0xd6, 0x0c, 0x54, 0x5e, 0x74, 0xfc, 0x39, 0xb0, 0xdc, 0x9a, 0x01, 0xcb, - 0xbb, 0x0b, 0xf7, 0x32, 0x13, 0x97, 0xef, 0xa4, 0x71, 0x79, 0x91, 0x3a, 0xa6, 0x80, 0xf9, 0xfe, - 0x2c, 0x60, 0xbe, 0xb9, 0x40, 0xc6, 0x5c, 0x64, 0x3e, 0x3c, 0x83, 0xcc, 0xd7, 0x17, 0x88, 0x9a, - 0x01, 0xcd, 0xad, 0x14, 0x34, 0x43, 0x26, 0xdd, 0xcc, 0xc1, 0xe6, 0x8f, 0xce, 0x62, 0xf3, 0x8d, - 0x45, 0xa6, 0x36, 0x0b, 0x9c, 0xbf, 0x37, 0x05, 0xce, 0xd7, 0x16, 0x9d, 0x6a, 0x2e, 0x3a, 0xdf, - 0x14, 0xf1, 0x71, 0xca, 0x33, 0x44, 0x2c, 0x65, 0xbe, 0xef, 0xfa, 0x0a, 0xf8, 0xe4, 0x40, 0xdf, - 0x15, 0x11, 0x3b, 0xb6, 0xff, 0x73, 0x90, 0x1c, 0x9d, 0x36, 0x61, 0xed, 0xfa, 0x17, 0x5a, 0xcc, - 0x8b, 0x91, 0x2d, 0x19, 0xed, 0x4b, 0x2a, 0xda, 0x27, 0x00, 0x3e, 0x97, 0x06, 0xf8, 0x6d, 0x28, - 0x0b, 0x4c, 0x99, 0xc2, 0x6e, 0xea, 0x85, 0xd8, 0x4d, 0xde, 0x86, 0x0b, 0x18, 0x7f, 0x65, 0x1a, - 0xa0, 0x02, 0x49, 0x1e, 0x03, 0xc9, 0xa6, 0x78, 0x21, 0x35, 0x28, 0x81, 0xe2, 0x9b, 0x70, 0x31, - 0x41, 0x2b, 0xe4, 0x22, 0x16, 0x48, 0x90, 0xaa, 0x44, 0xd4, 0x07, 0x9e, 0xd7, 0xa4, 0x41, 0x4f, - 0x7f, 0x10, 0x2b, 0x28, 0xce, 0x0b, 0x08, 0xe4, 0x3b, 0xae, 0x25, 0xcf, 0xbd, 0x6e, 0xe0, 0xb3, - 0xc8, 0x15, 0xfa, 0x6e, 0x17, 0x37, 0x57, 0x32, 0xc4, 0xa3, 0xa0, 0x8a, 0x5c, 0xbb, 0x24, 0x7d, - 0x56, 0xff, 0xbd, 0x16, 0xcb, 0x8b, 0x53, 0x85, 0x59, 0xa8, 0xae, 0xbd, 0x4a, 0x54, 0xcf, 0xfd, - 0x6f, 0xa8, 0xae, 0xff, 0x4b, 0x8b, 0xaf, 0x34, 0xc2, 0xeb, 0xaf, 0xa7, 0x02, 0x61, 0x5d, 0xb6, - 0x63, 0xb1, 0x31, 0xaa, 0x7c, 0xd9, 0x90, 0x83, 0x30, 0xd5, 0x5a, 0xc5, 0x6b, 0x48, 0xa7, 0x5a, - 0x05, 0x9c, 0x93, 0x03, 0xf2, 0x3e, 0xe2, 0xbc, 0xfb, 0x4c, 0x85, 0x86, 0x14, 0x08, 0xca, 0xa2, - 0xae, 0xae, 0xaa, 0xb9, 0x23, 0x41, 0x66, 0x48, 0xea, 0x04, 0xbe, 0x94, 0x52, 0x69, 0xc3, 0x15, - 0x28, 0x89, 0xad, 0x07, 0x1e, 0xed, 0x30, 0xf4, 0xed, 0x92, 0x11, 0x4f, 0xe8, 0x16, 0x90, 0xb3, - 0x31, 0x86, 0x3c, 0x84, 0x55, 0x36, 0x62, 0x0e, 0x17, 0x77, 0x24, 0xd4, 0x7a, 0x65, 0x2e, 0x10, - 0x33, 0x87, 0x37, 0xaa, 0x42, 0x99, 0xff, 0x7c, 0xb1, 0x5d, 0x91, 0x3c, 0xef, 0xba, 0x03, 0x9b, - 0xb3, 0x81, 0xc7, 0x27, 0x86, 0x92, 0xa2, 0xff, 0x2c, 0x27, 0xf0, 0x30, 0x15, 0x7f, 0x66, 0xaa, - 0x37, 0x74, 0x9a, 0x5c, 0x22, 0x45, 0xca, 0xa6, 0xf2, 0x37, 0x01, 0xba, 0x34, 0x30, 0x9f, 0x53, - 0x87, 0x33, 0x4b, 0xe9, 0xbd, 0xd4, 0xa5, 0xc1, 0x0f, 0x70, 0x42, 0xe4, 0x9b, 0xe2, 0xf5, 0x30, - 0x60, 0x16, 0x5e, 0xc0, 0xb2, 0x51, 0xe8, 0xd2, 0xe0, 0x49, 0xc0, 0xac, 0xc4, 0x59, 0x0b, 0xaf, - 0xe2, 0xac, 0x69, 0x7d, 0x17, 0xa7, 0xf5, 0xfd, 0xf3, 0x5c, 0xec, 0x1d, 0x71, 0xfa, 0xf0, 0xff, - 0xa9, 0x8b, 0xdf, 0x60, 0x4d, 0x91, 0x06, 0x01, 0xf2, 0x43, 0xb8, 0x10, 0x79, 0xa5, 0x39, 0x44, - 0x6f, 0x0d, 0xad, 0xf0, 0xe5, 0x9c, 0xbb, 0x32, 0x4a, 0x4f, 0x07, 0xe4, 0x33, 0x78, 0x63, 0x2a, - 0x06, 0x45, 0x0b, 0xe4, 0x5e, 0x2a, 0x14, 0xbd, 0x96, 0x0e, 0x45, 0xa1, 0xfc, 0x58, 0x7b, 0xcb, - 0xaf, 0xc4, 0x6b, 0x5a, 0x22, 0x85, 0x4d, 0xc2, 0xdb, 0x4c, 0x9b, 0xd8, 0x81, 0x75, 0x9f, 0x71, - 0x51, 0x4b, 0xa5, 0xaa, 0x86, 0x35, 0x39, 0x29, 0x21, 0x41, 0xff, 0xb3, 0x06, 0x9b, 0x53, 0xa7, - 0x20, 0x1f, 0xc0, 0x8a, 0x84, 0x69, 0xed, 0xdc, 0x6e, 0x09, 0x5e, 0x8b, 0x3a, 0xb8, 0x64, 0x20, - 0x07, 0x50, 0x64, 0x2a, 0x05, 0x57, 0x9a, 0xbb, 0xb6, 0x20, 0x53, 0x57, 0xfc, 0x11, 0x1b, 0xb9, - 0x0b, 0xa5, 0xe8, 0x7e, 0x16, 0x94, 0x77, 0xd1, 0xf5, 0x2a, 0x21, 0x31, 0xa3, 0x7e, 0x08, 0xe5, - 0xc4, 0xf6, 0xc8, 0x37, 0xa0, 0x34, 0xa0, 0x63, 0x55, 0x93, 0xc9, 0x2c, 0xbb, 0x38, 0xa0, 0x63, - 0x2c, 0xc7, 0xc8, 0x1b, 0x50, 0x10, 0x2f, 0xbb, 0x54, 0xde, 0xf6, 0xb2, 0xb1, 0x3a, 0xa0, 0xe3, - 0xef, 0xd3, 0x40, 0xff, 0x85, 0x06, 0x1b, 0xe9, 0x7d, 0x92, 0x77, 0x80, 0x08, 0x5a, 0xda, 0x65, - 0xa6, 0x33, 0x1c, 0x48, 0x20, 0x0d, 0x25, 0x6e, 0x0e, 0xe8, 0xf8, 0xa0, 0xcb, 0x1e, 0x0e, 0x07, - 0xb8, 0x74, 0x40, 0x1e, 0x40, 0x25, 0x24, 0x0e, 0x3b, 0x62, 0x4a, 0x2b, 0x97, 0xcf, 0x54, 0xc4, - 0x77, 0x15, 0x81, 0x2c, 0x88, 0x7f, 0x2d, 0x0a, 0xe2, 0x0d, 0x29, 0x2f, 0x7c, 0xa3, 0xbf, 0x0f, - 0x9b, 0x53, 0x27, 0x26, 0x3a, 0xac, 0x7b, 0xc3, 0xb6, 0x79, 0xc2, 0x26, 0x26, 0xaa, 0x04, 0xfd, - 0xa1, 0x64, 0x94, 0xbd, 0x61, 0xfb, 0x63, 0x36, 0x11, 0xa5, 0x49, 0xa0, 0x77, 0x60, 0x23, 0x5d, - 0x71, 0x09, 0x74, 0xf1, 0xdd, 0xa1, 0x63, 0xe1, 0xbe, 0x57, 0x0c, 0x39, 0x20, 0xb7, 0x61, 0x65, - 0xe4, 0x4a, 0x93, 0x3f, 0xaf, 0xc4, 0x3a, 0x76, 0x39, 0x4b, 0xd4, 0x6d, 0x92, 0x47, 0x0f, 0x60, - 0x05, 0x8d, 0x57, 0x18, 0x22, 0xd6, 0x4e, 0x2a, 0xbb, 0x11, 0xcf, 0xe4, 0x18, 0x80, 0x72, 0xee, - 0xdb, 0xed, 0x61, 0x2c, 0xbe, 0x9a, 0x14, 0xdf, 0xb7, 0xdb, 0x41, 0xfd, 0x64, 0x54, 0x3f, 0xa2, - 0xb6, 0xdf, 0xb8, 0xa2, 0xcc, 0xff, 0x52, 0xcc, 0x93, 0x70, 0x81, 0x84, 0x24, 0xfd, 0xab, 0x3c, - 0xac, 0xca, 0x9a, 0x94, 0x7c, 0x98, 0xee, 0x90, 0x94, 0xf7, 0xb7, 0xe6, 0x6d, 0x5f, 0x52, 0xa9, - 0xdd, 0x47, 0x69, 0xd6, 0xf5, 0xe9, 0xb6, 0x43, 0xa3, 0x7c, 0xfa, 0x62, 0xbb, 0x80, 0x29, 0x4a, - 0xeb, 0x6e, 0xdc, 0x83, 0x98, 0x57, 0x82, 0x87, 0x0d, 0x8f, 0xfc, 0x4b, 0x37, 0x3c, 0x9a, 0xb0, - 0x9e, 0xc8, 0xc9, 0x6c, 0x4b, 0x15, 0x33, 0x5b, 0xe7, 0x39, 0x5d, 0xeb, 0xae, 0xda, 0x7f, 0x39, - 0xca, 0xd9, 0x5a, 0x16, 0xd9, 0x4d, 0x57, 0xe2, 0x98, 0xda, 0xc9, 0x9c, 0x22, 0x51, 0x5c, 0x8b, - 0xc4, 0x4e, 0xb8, 0x83, 0x88, 0x10, 0x92, 0x44, 0xa6, 0x18, 0x45, 0x31, 0x81, 0x2f, 0x6f, 0xc0, - 0x66, 0x9c, 0xfd, 0x48, 0x92, 0xa2, 0x94, 0x12, 0x4f, 0x23, 0xe1, 0x7b, 0x70, 0xc9, 0x61, 0x63, - 0x6e, 0x4e, 0x53, 0x97, 0x90, 0x9a, 0x88, 0x77, 0xc7, 0x69, 0x8e, 0x6b, 0xb0, 0x11, 0xc7, 0x59, - 0xa4, 0x05, 0xd9, 0x1f, 0x89, 0x66, 0x91, 0xec, 0x32, 0x14, 0xa3, 0xdc, 0xb4, 0x8c, 0x04, 0x05, - 0x2a, 0x53, 0xd2, 0x28, 0xdb, 0xf5, 0x59, 0x30, 0xec, 0x73, 0x25, 0x64, 0x0d, 0x69, 0x30, 0xdb, - 0x35, 0xe4, 0x3c, 0xd2, 0xee, 0xc0, 0x7a, 0x18, 0x55, 0x24, 0xdd, 0x3a, 0xd2, 0xad, 0x85, 0x93, - 0x48, 0x74, 0x13, 0x2a, 0x9e, 0xef, 0x7a, 0x6e, 0xc0, 0x7c, 0x93, 0x5a, 0x96, 0xcf, 0x82, 0xa0, - 0xba, 0x21, 0xe5, 0x85, 0xf3, 0x07, 0x72, 0x5a, 0xff, 0x16, 0x14, 0xc2, 0xa4, 0xfb, 0x12, 0xac, - 0x34, 0xa2, 0x08, 0x99, 0x37, 0xe4, 0x40, 0x80, 0xf0, 0x81, 0xe7, 0xa9, 0x16, 0x9c, 0x78, 0xd4, - 0xfb, 0x50, 0x50, 0x17, 0x36, 0xb3, 0xf1, 0xf2, 0x00, 0xd6, 0x3c, 0xea, 0x8b, 0x63, 0x24, 0xdb, - 0x2f, 0xf3, 0xca, 0xc6, 0x23, 0xea, 0xf3, 0x47, 0x8c, 0xa7, 0xba, 0x30, 0x65, 0xe4, 0x97, 0x53, - 0xfa, 0x2d, 0x58, 0x4f, 0xd1, 0x88, 0x6d, 0x72, 0x97, 0xd3, 0x7e, 0xe8, 0xe8, 0x38, 0x88, 0x76, - 0x92, 0x8b, 0x77, 0xa2, 0xdf, 0x86, 0x52, 0x74, 0x57, 0xa2, 0x1a, 0x09, 0x55, 0xa1, 0x29, 0xf5, - 0xcb, 0x21, 0x76, 0x9a, 0xdc, 0xe7, 0xcc, 0x57, 0xd6, 0x2f, 0x07, 0x3a, 0x4b, 0x04, 0x26, 0x09, - 0x79, 0xe4, 0x0e, 0x14, 0x54, 0x60, 0x52, 0xfe, 0x38, 0xaf, 0xa7, 0x74, 0x84, 0x91, 0x2a, 0xec, - 0x29, 0xc9, 0xb8, 0x15, 0x2f, 0x93, 0x4b, 0x2e, 0xf3, 0x53, 0x28, 0x86, 0xc1, 0x27, 0x8d, 0x12, - 0x72, 0x85, 0xab, 0x8b, 0x50, 0x42, 0x2d, 0x12, 0x33, 0x0a, 0x6b, 0x0a, 0xec, 0xae, 0xc3, 0x2c, - 0x33, 0x76, 0x41, 0x5c, 0xb3, 0x68, 0x6c, 0xca, 0x17, 0xf7, 0x43, 0xff, 0xd2, 0xdf, 0x83, 0x55, - 0xb9, 0xd7, 0x99, 0x21, 0x6e, 0x06, 0xfe, 0xea, 0xff, 0xd0, 0xa0, 0x18, 0xc2, 0xc7, 0x4c, 0xa6, - 0xd4, 0x21, 0x72, 0x5f, 0xf7, 0x10, 0xaf, 0x3e, 0x24, 0xbd, 0x0b, 0x04, 0x2d, 0xc5, 0x1c, 0xb9, - 0xdc, 0x76, 0xba, 0xa6, 0xbc, 0x0b, 0x99, 0x2e, 0x56, 0xf0, 0xcd, 0x31, 0xbe, 0x38, 0x12, 0xf3, - 0x6f, 0xef, 0x40, 0x39, 0xd1, 0x0a, 0x23, 0x05, 0x58, 0x7e, 0xc8, 0x9e, 0x57, 0x96, 0x48, 0x19, - 0x0a, 0x06, 0xc3, 0x46, 0x42, 0x45, 0xdb, 0xff, 0xaa, 0x00, 0x9b, 0x07, 0x8d, 0xc3, 0xd6, 0x81, - 0xe7, 0xf5, 0xed, 0x0e, 0xe2, 0x19, 0xf9, 0x04, 0xf2, 0x58, 0x4c, 0x67, 0xf8, 0x08, 0x54, 0xcb, - 0xd2, 0x95, 0x22, 0x06, 0xac, 0x60, 0xcd, 0x4d, 0xb2, 0x7c, 0x1b, 0xaa, 0x65, 0x6a, 0x56, 0x89, - 0x4d, 0xa2, 0xc1, 0x65, 0xf8, 0x64, 0x54, 0xcb, 0xd2, 0xc1, 0x22, 0x9f, 0x41, 0x29, 0x2e, 0xa6, - 0xb3, 0x7e, 0x48, 0xaa, 0x65, 0xee, 0x6d, 0x09, 0xf9, 0x71, 0xf9, 0x90, 0xf5, 0x33, 0x4a, 0x2d, - 0x73, 0x53, 0x87, 0x3c, 0x85, 0x42, 0x58, 0xa8, 0x65, 0xfb, 0xd4, 0x53, 0xcb, 0xd8, 0x77, 0x12, - 0xd7, 0x27, 0xeb, 0xeb, 0x2c, 0xdf, 0xb3, 0x6a, 0x99, 0x9a, 0x6b, 0xe4, 0x09, 0xac, 0xaa, 0x0c, - 0x39, 0xd3, 0x47, 0x9c, 0x5a, 0xb6, 0x6e, 0x92, 0x50, 0x72, 0xdc, 0xc1, 0xc8, 0xfa, 0x0d, 0xaf, - 0x96, 0xb9, 0xab, 0x48, 0x28, 0x40, 0xa2, 0xe8, 0xce, 0xfc, 0x71, 0xae, 0x96, 0xbd, 0x5b, 0x48, - 0x7e, 0x0c, 0xc5, 0xa8, 0xb4, 0xca, 0xf8, 0x91, 0xac, 0x96, 0xb5, 0x61, 0xd7, 0x68, 0xfd, 0xe7, - 0x6f, 0x5b, 0xda, 0x6f, 0x4f, 0xb7, 0xb4, 0x2f, 0x4e, 0xb7, 0xb4, 0x2f, 0x4f, 0xb7, 0xb4, 0x3f, - 0x9d, 0x6e, 0x69, 0x7f, 0x3d, 0xdd, 0xd2, 0xfe, 0xf0, 0xf7, 0x2d, 0xed, 0x47, 0xef, 0x74, 0x6d, - 0xde, 0x1b, 0xb6, 0xeb, 0x1d, 0x77, 0xb0, 0x17, 0x0b, 0x4c, 0x3e, 0xc6, 0x5f, 0xbe, 0xdb, 0xab, - 0x18, 0xb0, 0xbe, 0xfd, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x66, 0x8a, 0xe9, 0x0e, 0x1f, - 0x00, 0x00, + 0xf5, 0xdf, 0xd1, 0xea, 0x6b, 0x9e, 0x56, 0x2b, 0xb9, 0xed, 0x24, 0xb2, 0xfe, 0x8e, 0xd6, 0x35, + 0x1b, 0xdb, 0xeb, 0x24, 0x7f, 0x6d, 0x58, 0x2a, 0x54, 0x8c, 0x53, 0xa1, 0x56, 0xbb, 0x06, 0xa9, + 0x62, 0x3b, 0x9b, 0xb1, 0xbd, 0x18, 0xa8, 0xca, 0x54, 0x4b, 0xd3, 0x96, 0xa6, 0x56, 0x9a, 0x99, + 0xcc, 0xb4, 0x64, 0x89, 0xe2, 0x4e, 0x51, 0x45, 0x51, 0x5c, 0xa8, 0xca, 0x85, 0x3b, 0x47, 0x0e, + 0x1c, 0xc2, 0x8d, 0x63, 0x8e, 0x1c, 0x38, 0x1b, 0x58, 0x38, 0x51, 0x1c, 0x39, 0x70, 0xa4, 0xfa, + 0x63, 0xbe, 0xb4, 0xfa, 0x18, 0x07, 0xdf, 0xb8, 0x48, 0xd3, 0xdd, 0xef, 0xbd, 0xe9, 0x7e, 0xfd, + 0xde, 0xfb, 0xbd, 0xf7, 0x06, 0x5e, 0xc7, 0xdd, 0x9e, 0xb5, 0x4f, 0x67, 0x2e, 0xf1, 0xc5, 0x6f, + 0xd3, 0xf5, 0x1c, 0xea, 0xa0, 0xd7, 0x28, 0xb1, 0x4d, 0xe2, 0x8d, 0x2c, 0x9b, 0x36, 0x19, 0x49, + 0x93, 0x2f, 0xd6, 0x6f, 0xd2, 0x81, 0xe5, 0x99, 0x86, 0x8b, 0x3d, 0x3a, 0xdb, 0xe7, 0x94, 0xfb, + 0x7d, 0xa7, 0xef, 0x44, 0x4f, 0x82, 0xbd, 0x5e, 0xef, 0x79, 0x33, 0x97, 0x3a, 0xfb, 0x23, 0xe2, + 0x9d, 0x0d, 0x89, 0xfc, 0x93, 0x6b, 0x97, 0x87, 0x56, 0xd7, 0xdf, 0x3f, 0x9b, 0xc4, 0xdf, 0x57, + 0xdf, 0xe9, 0x3b, 0x4e, 0x7f, 0x48, 0x84, 0xcc, 0xee, 0xf8, 0xd9, 0x3e, 0xb5, 0x46, 0xc4, 0xa7, + 0x78, 0xe4, 0x4a, 0x82, 0xc6, 0x3c, 0x81, 0x39, 0xf6, 0x30, 0xb5, 0x1c, 0x5b, 0xac, 0x6b, 0xbf, + 0xcf, 0x41, 0x41, 0x27, 0x9f, 0x8f, 0x89, 0x4f, 0xd1, 0x07, 0x90, 0x25, 0xbd, 0x81, 0x53, 0xcb, + 0x5c, 0x57, 0xf6, 0x4a, 0x07, 0x5a, 0x73, 0xe1, 0x59, 0x9a, 0x92, 0xfa, 0x5e, 0x6f, 0xe0, 0xb4, + 0x37, 0x74, 0xce, 0xc1, 0x38, 0x2d, 0xfb, 0x99, 0x53, 0xcb, 0xa6, 0xe1, 0xec, 0xd8, 0xcf, 0x38, + 0x27, 0xe3, 0x40, 0x6d, 0x00, 0x9f, 0x50, 0xc3, 0x71, 0xd9, 0x9e, 0x6a, 0x39, 0xce, 0x7f, 0x6b, + 0x35, 0xff, 0x23, 0x42, 0x3f, 0xe1, 0xe4, 0xed, 0x0d, 0x5d, 0xf5, 0x83, 0x01, 0x93, 0x64, 0xd9, + 0x16, 0x35, 0x7a, 0x03, 0x6c, 0xd9, 0xb5, 0x7c, 0x1a, 0x49, 0x1d, 0xdb, 0xa2, 0x47, 0x8c, 0x9c, + 0x49, 0xb2, 0x82, 0x01, 0xba, 0x0b, 0xb9, 0xcf, 0xc7, 0xc4, 0x9b, 0xd5, 0x0a, 0x5c, 0xc8, 0xee, + 0x6a, 0x21, 0x9f, 0x32, 0xd2, 0xf6, 0x86, 0x2e, 0x78, 0xd0, 0xc7, 0x50, 0xea, 0x92, 0xbe, 0x65, + 0x1b, 0xdd, 0xa1, 0xd3, 0x3b, 0xab, 0x15, 0xb9, 0x88, 0xbd, 0xd5, 0x22, 0x5a, 0x8c, 0xa1, 0xc5, + 0xe8, 0xdb, 0x1b, 0x3a, 0x74, 0xc3, 0x11, 0x6a, 0x41, 0xb1, 0x37, 0x20, 0xbd, 0x33, 0x83, 0x4e, + 0x6b, 0x2a, 0x97, 0x74, 0x63, 0xb5, 0xa4, 0x23, 0x46, 0xfd, 0x78, 0xda, 0xde, 0xd0, 0x0b, 0x3d, + 0xf1, 0xc8, 0xf4, 0x62, 0x92, 0xa1, 0x35, 0x21, 0x1e, 0x93, 0x72, 0x39, 0x8d, 0x5e, 0x8e, 0x05, + 0x3d, 0x97, 0xa3, 0x9a, 0xc1, 0x00, 0xdd, 0x03, 0x95, 0xd8, 0xa6, 0x3c, 0x58, 0x89, 0x0b, 0xba, + 0xb9, 0xc6, 0x48, 0x6c, 0x33, 0x38, 0x56, 0x91, 0xc8, 0x67, 0xf4, 0x11, 0xe4, 0x7b, 0xce, 0x68, + 0x64, 0xd1, 0xda, 0x16, 0x97, 0xf1, 0xd6, 0x9a, 0x23, 0x71, 0xda, 0xf6, 0x86, 0x2e, 0xb9, 0x5a, + 0x05, 0xc8, 0x4d, 0xf0, 0x70, 0x4c, 0xb4, 0x5b, 0x50, 0x8a, 0x19, 0x23, 0xaa, 0x41, 0x61, 0x44, + 0x7c, 0x1f, 0xf7, 0x49, 0x4d, 0xb9, 0xae, 0xec, 0xa9, 0x7a, 0x30, 0xd4, 0x46, 0x21, 0x21, 0xb3, + 0x3d, 0x46, 0x38, 0x21, 0x9e, 0xcf, 0x0c, 0x4e, 0x12, 0xca, 0x21, 0xda, 0x85, 0x32, 0x3f, 0x9d, + 0x11, 0xac, 0x33, 0x57, 0xc8, 0xea, 0x5b, 0x7c, 0xf2, 0x54, 0x12, 0xed, 0x40, 0xc9, 0x3d, 0x70, + 0x43, 0x92, 0x4d, 0x4e, 0x02, 0xee, 0x81, 0x2b, 0x09, 0xb4, 0x6f, 0x43, 0x75, 0xde, 0x54, 0x51, + 0x15, 0x36, 0xcf, 0xc8, 0x4c, 0xbe, 0x8f, 0x3d, 0xa2, 0x2b, 0xf2, 0x18, 0xfc, 0x1d, 0xaa, 0x2e, + 0xcf, 0xf4, 0xdb, 0x4c, 0xc8, 0x1c, 0x5a, 0x27, 0x73, 0x2f, 0xe6, 0xd7, 0x9c, 0xbb, 0x74, 0x50, + 0x6f, 0x0a, 0x9f, 0x6e, 0x06, 0x3e, 0xdd, 0x7c, 0x1c, 0x38, 0x7d, 0xab, 0xf8, 0xd5, 0x8b, 0x9d, + 0x8d, 0x5f, 0xfe, 0x79, 0x47, 0xd1, 0x39, 0x07, 0xba, 0xca, 0x0c, 0x08, 0x5b, 0xb6, 0x61, 0x99, + 0xf2, 0x3d, 0x05, 0x3e, 0xee, 0x98, 0xe8, 0x53, 0xa8, 0xf6, 0x1c, 0xdb, 0x27, 0xb6, 0x3f, 0xf6, + 0x59, 0x64, 0xc2, 0x23, 0x9f, 0x9f, 0x65, 0xf9, 0xa5, 0x1e, 0x05, 0xe4, 0x27, 0x9c, 0x5a, 0xaf, + 0xf4, 0x92, 0x13, 0xe8, 0x3e, 0xc0, 0x04, 0x0f, 0x2d, 0x13, 0x53, 0xc7, 0xf3, 0x6b, 0xd9, 0xeb, + 0x9b, 0x2b, 0x84, 0x9d, 0x06, 0x84, 0x4f, 0x5c, 0x13, 0x53, 0xd2, 0xca, 0xb2, 0x9d, 0xeb, 0x31, + 0x7e, 0x74, 0x13, 0x2a, 0xd8, 0x75, 0x0d, 0x9f, 0x62, 0x4a, 0x8c, 0xee, 0x8c, 0x12, 0x9f, 0xc7, + 0x87, 0x2d, 0xbd, 0x8c, 0x5d, 0xf7, 0x11, 0x9b, 0x6d, 0xb1, 0x49, 0xcd, 0x84, 0xad, 0xb8, 0x2b, + 0x22, 0x04, 0x59, 0x13, 0x53, 0xcc, 0xb5, 0xb5, 0xa5, 0xf3, 0x67, 0x36, 0xe7, 0x62, 0x3a, 0x90, + 0x3a, 0xe0, 0xcf, 0xe8, 0x75, 0xc8, 0x0f, 0x88, 0xd5, 0x1f, 0x50, 0x7e, 0xec, 0x4d, 0x5d, 0x8e, + 0xd8, 0xc5, 0xb8, 0x9e, 0x33, 0x21, 0x3c, 0x9a, 0x15, 0x75, 0x31, 0xd0, 0x7e, 0x95, 0x81, 0x4b, + 0x17, 0xdc, 0x95, 0xc9, 0x1d, 0x60, 0x7f, 0x10, 0xbc, 0x8b, 0x3d, 0xa3, 0xbb, 0x4c, 0x2e, 0x36, + 0x89, 0x27, 0x03, 0xe9, 0x9b, 0x4b, 0x34, 0xd0, 0xe6, 0x44, 0xf2, 0xe0, 0x92, 0x05, 0x3d, 0x81, + 0xea, 0x10, 0xfb, 0xd4, 0x10, 0xb6, 0x6e, 0xf0, 0xa8, 0xba, 0xb9, 0xd2, 0xf3, 0xef, 0xe3, 0xc0, + 0x47, 0x98, 0x71, 0x4b, 0x71, 0xdb, 0xc3, 0xc4, 0x2c, 0x7a, 0x0a, 0x57, 0xba, 0xb3, 0x1f, 0x63, + 0x9b, 0x5a, 0x36, 0x31, 0x2e, 0xdc, 0xd1, 0xce, 0x12, 0xd1, 0xf7, 0x26, 0x96, 0x49, 0xec, 0x5e, + 0x70, 0x39, 0x97, 0x43, 0x11, 0xe1, 0xe5, 0xf9, 0xda, 0x53, 0xd8, 0x4e, 0xc6, 0x1e, 0xb4, 0x0d, + 0x19, 0x3a, 0x95, 0x1a, 0xc9, 0xd0, 0x29, 0xfa, 0x16, 0x64, 0x99, 0x38, 0xae, 0x8d, 0xed, 0xa5, + 0xe0, 0x20, 0xb9, 0x1f, 0xcf, 0x5c, 0xa2, 0x73, 0x7a, 0x4d, 0x0b, 0x3d, 0x21, 0x8c, 0x47, 0xf3, + 0xb2, 0xb5, 0xdb, 0x50, 0x99, 0x0b, 0x35, 0xb1, 0x6b, 0x55, 0xe2, 0xd7, 0xaa, 0x55, 0xa0, 0x9c, + 0x88, 0x28, 0xda, 0x2f, 0xf2, 0x50, 0xd4, 0x89, 0xef, 0x32, 0x23, 0x46, 0x6d, 0x50, 0xc9, 0xb4, + 0x47, 0x04, 0x0c, 0x29, 0x6b, 0x82, 0xb6, 0xe0, 0xb9, 0x17, 0xd0, 0xb3, 0x28, 0x19, 0x32, 0xa3, + 0x3b, 0x09, 0x14, 0xdd, 0x5d, 0x27, 0x24, 0x0e, 0xa3, 0x77, 0x12, 0x30, 0xba, 0x8e, 0x35, 0x81, + 0xa3, 0x9d, 0x05, 0x38, 0xba, 0xee, 0x00, 0x4b, 0x80, 0xb4, 0xb3, 0x00, 0x48, 0xf7, 0xd6, 0xee, + 0x65, 0x21, 0x92, 0x7e, 0x98, 0x44, 0xd2, 0xb7, 0xd6, 0x48, 0x99, 0x83, 0xd2, 0xfb, 0x8b, 0xa0, + 0xf4, 0xf6, 0x1a, 0x19, 0x4b, 0xb1, 0xf4, 0xe8, 0x02, 0x96, 0xde, 0x5c, 0x23, 0x6a, 0x01, 0x98, + 0x76, 0x12, 0x60, 0x0a, 0xa9, 0x74, 0xb3, 0x04, 0x4d, 0xbf, 0x7b, 0x11, 0x4d, 0x6f, 0xad, 0x33, + 0x96, 0x45, 0x70, 0xfa, 0x9d, 0x39, 0x38, 0xbd, 0xb1, 0xee, 0x54, 0x4b, 0xf1, 0xf4, 0x36, 0x8b, + 0x70, 0x73, 0xb6, 0xcd, 0xa2, 0x21, 0xf1, 0x3c, 0xc7, 0x93, 0xd0, 0x25, 0x06, 0xda, 0x1e, 0x8b, + 0xb9, 0x91, 0x05, 0xaf, 0xc0, 0xde, 0x2f, 0x95, 0x88, 0x94, 0x87, 0xa2, 0x78, 0x78, 0x56, 0x65, + 0x78, 0x8e, 0x21, 0x72, 0x26, 0x89, 0xc8, 0x3b, 0x50, 0x62, 0x20, 0x30, 0x07, 0xb6, 0xd8, 0x0d, + 0xc0, 0x16, 0xbd, 0x0d, 0x97, 0x78, 0xc0, 0x14, 0xb8, 0x2d, 0x3d, 0x3f, 0xcb, 0x3d, 0xbf, 0xc2, + 0x16, 0x84, 0xc2, 0x44, 0x64, 0xff, 0x7f, 0xb8, 0x1c, 0xa3, 0x65, 0x72, 0x79, 0xf0, 0x16, 0xa8, + 0x52, 0x0d, 0xa9, 0x0f, 0x5d, 0xb7, 0x8d, 0xfd, 0x81, 0xf6, 0x20, 0xd2, 0x47, 0x04, 0xe4, 0x08, + 0xb2, 0x3d, 0xc7, 0x14, 0xc7, 0x2c, 0xeb, 0xfc, 0x99, 0x81, 0xfb, 0xd0, 0xe9, 0xf3, 0xcd, 0xa9, + 0x3a, 0x7b, 0x64, 0x54, 0xa1, 0x27, 0xab, 0xc2, 0x45, 0xb5, 0xdf, 0x29, 0x91, 0xbc, 0x08, 0xdb, + 0x17, 0xc1, 0xb0, 0xf2, 0x2a, 0x61, 0x38, 0xf3, 0xdf, 0xc1, 0xb0, 0xf6, 0x2f, 0x85, 0x05, 0xce, + 0x98, 0x83, 0x7e, 0x7d, 0x15, 0x30, 0x63, 0xb2, 0x6c, 0x93, 0x4c, 0xb9, 0xca, 0x37, 0x75, 0x31, + 0x08, 0x72, 0xa3, 0x3c, 0xbf, 0x86, 0x64, 0x6e, 0x54, 0xe0, 0x73, 0x62, 0x80, 0xde, 0xe7, 0xc0, + 0xec, 0x3c, 0x93, 0x91, 0x20, 0x81, 0x5a, 0xa2, 0x70, 0x6a, 0xca, 0x8a, 0xe9, 0x84, 0x91, 0xe9, + 0x82, 0x3a, 0x06, 0x08, 0x6a, 0x02, 0xe7, 0xaf, 0x81, 0xca, 0xb6, 0xee, 0xbb, 0xb8, 0x47, 0xb8, + 0x2b, 0xab, 0x7a, 0x34, 0xa1, 0x99, 0x80, 0x2e, 0x86, 0x14, 0xf4, 0x10, 0xf2, 0x64, 0x42, 0x6c, + 0xca, 0xee, 0x88, 0xa9, 0xf5, 0xda, 0x52, 0xe4, 0x24, 0x36, 0x6d, 0xd5, 0x98, 0x32, 0xff, 0xf1, + 0x62, 0xa7, 0x2a, 0x78, 0xde, 0x75, 0x46, 0x16, 0x25, 0x23, 0x97, 0xce, 0x74, 0x29, 0x45, 0xfb, + 0x69, 0x86, 0x01, 0x58, 0x22, 0xdc, 0x2c, 0x54, 0x6f, 0xe0, 0x34, 0x99, 0x58, 0x4e, 0x93, 0x4e, + 0xe5, 0x6f, 0x02, 0xf4, 0xb1, 0x6f, 0x3c, 0xc7, 0x36, 0x25, 0xa6, 0xd4, 0xbb, 0xda, 0xc7, 0xfe, + 0xf7, 0xf9, 0x04, 0x4b, 0x10, 0xd9, 0xf2, 0xd8, 0x27, 0x26, 0xbf, 0x80, 0x4d, 0xbd, 0xd0, 0xc7, + 0xfe, 0x13, 0x9f, 0x98, 0xb1, 0xb3, 0x16, 0x5e, 0xc5, 0x59, 0x93, 0xfa, 0x2e, 0xce, 0xeb, 0xfb, + 0x67, 0x99, 0xc8, 0x3b, 0x22, 0xbc, 0xff, 0xdf, 0xd4, 0xc5, 0xaf, 0x79, 0x11, 0x90, 0x8c, 0xf9, + 0xe8, 0x07, 0x70, 0x29, 0xf4, 0x4a, 0x63, 0xcc, 0xbd, 0x35, 0xb0, 0xc2, 0x97, 0x73, 0xee, 0xea, + 0x24, 0x39, 0xed, 0xa3, 0xcf, 0xe0, 0x8d, 0xb9, 0x18, 0x14, 0xbe, 0x20, 0xf3, 0x52, 0xa1, 0xe8, + 0xb5, 0x64, 0x28, 0x0a, 0xe4, 0x47, 0xda, 0xdb, 0x7c, 0x25, 0x5e, 0xd3, 0x61, 0x39, 0x67, 0x1c, + 0xcd, 0x16, 0xda, 0xc4, 0x2e, 0x94, 0x3d, 0x42, 0x59, 0xf1, 0x93, 0x48, 0xf3, 0xb7, 0xc4, 0xa4, + 0x80, 0x04, 0xed, 0x4f, 0x0a, 0x54, 0xe6, 0x4e, 0x81, 0x3e, 0x80, 0x9c, 0x40, 0x65, 0x65, 0x65, + 0x3b, 0x83, 0x5f, 0x8b, 0x3c, 0xb8, 0x60, 0x40, 0x87, 0x50, 0x24, 0x32, 0x67, 0x96, 0x9a, 0xbb, + 0xb1, 0x26, 0xb5, 0x96, 0xfc, 0x21, 0x1b, 0x3a, 0x06, 0x35, 0xbc, 0x9f, 0x35, 0xf5, 0x58, 0x78, + 0xbd, 0x52, 0x48, 0xc4, 0xa8, 0x1d, 0x41, 0x29, 0xb6, 0x3d, 0xf4, 0x7f, 0xa0, 0x8e, 0xf0, 0x54, + 0x16, 0x51, 0x22, 0x2d, 0x2e, 0x8e, 0xf0, 0x94, 0xd7, 0x4f, 0xe8, 0x0d, 0x28, 0xb0, 0xc5, 0x3e, + 0x16, 0xb7, 0xbd, 0xa9, 0xe7, 0x47, 0x78, 0xfa, 0x3d, 0xec, 0x6b, 0x3f, 0x57, 0x60, 0x3b, 0xb9, + 0x4f, 0xf4, 0x0e, 0x20, 0x46, 0x8b, 0xfb, 0xc4, 0xb0, 0xc7, 0x23, 0x01, 0xa4, 0x81, 0xc4, 0xca, + 0x08, 0x4f, 0x0f, 0xfb, 0xe4, 0xe1, 0x78, 0xc4, 0x5f, 0xed, 0xa3, 0x07, 0x50, 0x0d, 0x88, 0x83, + 0xae, 0x93, 0xd4, 0xca, 0xd5, 0x0b, 0x25, 0xec, 0xb1, 0x24, 0x10, 0x15, 0xec, 0x17, 0xac, 0x82, + 0xdd, 0x16, 0xf2, 0x82, 0x15, 0xed, 0x7d, 0xa8, 0xcc, 0x9d, 0x18, 0x69, 0x50, 0x76, 0xc7, 0x5d, + 0xe3, 0x8c, 0xcc, 0x0c, 0xae, 0x12, 0xee, 0x0f, 0xaa, 0x5e, 0x72, 0xc7, 0xdd, 0x8f, 0xc9, 0x8c, + 0xd5, 0x12, 0xbe, 0xd6, 0x83, 0xed, 0x64, 0x89, 0xc4, 0xd0, 0xc5, 0x73, 0xc6, 0xb6, 0xc9, 0xf7, + 0x9d, 0xd3, 0xc5, 0x00, 0xdd, 0x85, 0xdc, 0xc4, 0x11, 0x26, 0xbf, 0xaa, 0x26, 0x3a, 0x75, 0x28, + 0x89, 0x15, 0x5a, 0x82, 0x47, 0xf3, 0x21, 0xc7, 0x8d, 0x97, 0x19, 0x22, 0x2f, 0x76, 0x64, 0x76, + 0xc3, 0x9e, 0xd1, 0x29, 0x00, 0xa6, 0xd4, 0xb3, 0xba, 0xe3, 0x48, 0x7c, 0x2d, 0x2e, 0x7e, 0x68, + 0x75, 0xfd, 0xe6, 0xd9, 0xa4, 0x79, 0x82, 0x2d, 0xaf, 0x75, 0x4d, 0x9a, 0xff, 0x95, 0x88, 0x27, + 0xe6, 0x02, 0x31, 0x49, 0xda, 0x3f, 0xb3, 0x90, 0x17, 0x45, 0x24, 0xfa, 0x28, 0xd9, 0xd2, 0x28, + 0x1d, 0x34, 0x96, 0x6d, 0x5f, 0x50, 0xc9, 0xdd, 0x87, 0x69, 0xd6, 0xcd, 0xf9, 0x3e, 0x41, 0xab, + 0x74, 0xfe, 0x62, 0xa7, 0xc0, 0x53, 0x94, 0xce, 0x71, 0xd4, 0x34, 0x58, 0x56, 0x33, 0x07, 0x1d, + 0x8a, 0xec, 0x4b, 0x77, 0x28, 0xda, 0x50, 0x8e, 0xe5, 0x64, 0x96, 0x29, 0x6b, 0x97, 0xc6, 0x2a, + 0xa7, 0xeb, 0x1c, 0xcb, 0xfd, 0x97, 0xc2, 0x9c, 0xad, 0x63, 0xa2, 0xbd, 0x64, 0xe9, 0xcc, 0x53, + 0x3b, 0x91, 0x53, 0xc4, 0xaa, 0x61, 0x96, 0xd8, 0x31, 0x77, 0x60, 0x11, 0x42, 0x90, 0x88, 0x14, + 0xa3, 0xc8, 0x26, 0xf8, 0xe2, 0x2d, 0xa8, 0x44, 0xd9, 0x8f, 0x20, 0x29, 0x0a, 0x29, 0xd1, 0x34, + 0x27, 0x7c, 0x0f, 0xae, 0xd8, 0x64, 0x4a, 0x8d, 0x79, 0x6a, 0x95, 0x53, 0x23, 0xb6, 0x76, 0x9a, + 0xe4, 0xb8, 0x01, 0xdb, 0x51, 0x9c, 0xe5, 0xb4, 0x20, 0x1a, 0x1a, 0xe1, 0x2c, 0x27, 0xbb, 0x0a, + 0xc5, 0x30, 0x37, 0x2d, 0x71, 0x82, 0x02, 0x16, 0x29, 0x69, 0x98, 0xed, 0x7a, 0xc4, 0x1f, 0x0f, + 0xa9, 0x14, 0xb2, 0xc5, 0x69, 0x78, 0xb6, 0xab, 0x8b, 0x79, 0x4e, 0xbb, 0x0b, 0xe5, 0x20, 0xaa, + 0x08, 0xba, 0x32, 0xa7, 0xdb, 0x0a, 0x26, 0x39, 0xd1, 0x6d, 0xa8, 0xba, 0x9e, 0xe3, 0x3a, 0x3e, + 0xf1, 0x0c, 0x6c, 0x9a, 0x1e, 0xf1, 0xfd, 0xda, 0xb6, 0x90, 0x17, 0xcc, 0x1f, 0x8a, 0x69, 0xed, + 0x1b, 0x50, 0x08, 0x92, 0xee, 0x2b, 0x90, 0x6b, 0x85, 0x11, 0x32, 0xab, 0x8b, 0x01, 0x03, 0xe1, + 0x43, 0xd7, 0x95, 0x3d, 0x33, 0xf6, 0xa8, 0x0d, 0xa1, 0x20, 0x2f, 0x6c, 0x61, 0xa7, 0xe4, 0x01, + 0x6c, 0xb9, 0xd8, 0x63, 0xc7, 0x88, 0xf7, 0x4b, 0x96, 0x55, 0x89, 0x27, 0xd8, 0xa3, 0x8f, 0x08, + 0x4d, 0xb4, 0x4d, 0x4a, 0x9c, 0x5f, 0x4c, 0x69, 0x77, 0xa0, 0x9c, 0xa0, 0x61, 0xdb, 0xa4, 0x0e, + 0xc5, 0xc3, 0xc0, 0xd1, 0xf9, 0x20, 0xdc, 0x49, 0x26, 0xda, 0x89, 0x76, 0x17, 0xd4, 0xf0, 0xae, + 0x58, 0x35, 0x12, 0xa8, 0x42, 0x91, 0xea, 0x17, 0x43, 0xde, 0x1a, 0x72, 0x9e, 0x13, 0x4f, 0x5a, + 0xbf, 0x18, 0x68, 0x24, 0x16, 0x98, 0x04, 0xe4, 0xa1, 0x0f, 0xa1, 0x20, 0x03, 0x93, 0xf4, 0xc7, + 0x65, 0x4d, 0xa0, 0x13, 0x1e, 0xa9, 0x82, 0x26, 0x90, 0x88, 0x5b, 0xd1, 0x6b, 0x32, 0xf1, 0xd7, + 0xfc, 0x04, 0x8a, 0x41, 0xf0, 0x49, 0xa2, 0x84, 0x78, 0xc3, 0xf5, 0x75, 0x28, 0x21, 0x5f, 0x12, + 0x31, 0x32, 0x6b, 0xf2, 0xad, 0xbe, 0x4d, 0x4c, 0x23, 0x72, 0x41, 0xfe, 0xce, 0xa2, 0x5e, 0x11, + 0x0b, 0xf7, 0x03, 0xff, 0xd2, 0xde, 0x83, 0xbc, 0xd8, 0xeb, 0xc2, 0x10, 0xb7, 0x00, 0x7f, 0xb5, + 0xbf, 0x2b, 0x50, 0x0c, 0xe0, 0x63, 0x21, 0x53, 0xe2, 0x10, 0x99, 0xaf, 0x7b, 0x88, 0x57, 0x1f, + 0x92, 0xde, 0x05, 0xc4, 0x2d, 0xc5, 0x98, 0x38, 0xd4, 0xb2, 0xfb, 0x86, 0xb8, 0x0b, 0x91, 0x2e, + 0x56, 0xf9, 0xca, 0x29, 0x5f, 0x38, 0x61, 0xf3, 0x6f, 0xef, 0x42, 0x29, 0xd6, 0xbb, 0x42, 0x05, + 0xd8, 0x7c, 0x48, 0x9e, 0x57, 0x37, 0x50, 0x09, 0x0a, 0x3a, 0xe1, 0x7d, 0x83, 0xaa, 0x72, 0xf0, + 0x45, 0x01, 0x2a, 0x87, 0xad, 0xa3, 0xce, 0xa1, 0xeb, 0x0e, 0xad, 0x1e, 0xc7, 0x33, 0xf4, 0x09, + 0x64, 0x79, 0xed, 0x9c, 0xe2, 0x43, 0x4b, 0x3d, 0x4d, 0x1b, 0x89, 0x09, 0xe4, 0xc6, 0x91, 0xe2, + 0xfb, 0x4b, 0x3d, 0x4d, 0x73, 0x09, 0x7d, 0x06, 0x6a, 0x54, 0xf8, 0xa6, 0xfd, 0x2a, 0x53, 0x4f, + 0xdd, 0x76, 0x62, 0xf2, 0xa3, 0x54, 0x3f, 0xed, 0x37, 0x89, 0x7a, 0xea, 0x7e, 0x0b, 0x7a, 0x0a, + 0x85, 0xa0, 0xa8, 0x4a, 0xf7, 0xdd, 0xa4, 0x9e, 0xb2, 0x25, 0x84, 0x74, 0xc8, 0x89, 0x5a, 0x38, + 0xcd, 0xc7, 0xa1, 0x7a, 0xaa, 0xbe, 0x17, 0x7a, 0x02, 0x79, 0x99, 0xcd, 0xa6, 0xfa, 0x22, 0x52, + 0x4f, 0xd7, 0xe8, 0x61, 0x4a, 0x8e, 0xba, 0x0d, 0x69, 0x3f, 0x88, 0xd5, 0x53, 0x37, 0xfc, 0x10, + 0x06, 0x88, 0x15, 0xc8, 0xa9, 0xbf, 0x74, 0xd5, 0xd3, 0x37, 0xf2, 0xd0, 0x8f, 0xa0, 0x18, 0x96, + 0x41, 0x29, 0xbf, 0x38, 0xd5, 0xd3, 0xf6, 0xd2, 0x5a, 0x9d, 0x7f, 0xff, 0xb5, 0xa1, 0xfc, 0xe6, + 0xbc, 0xa1, 0x7c, 0x79, 0xde, 0x50, 0xbe, 0x3a, 0x6f, 0x28, 0x7f, 0x3c, 0x6f, 0x28, 0x7f, 0x39, + 0x6f, 0x28, 0x7f, 0xf8, 0x5b, 0x43, 0xf9, 0xe1, 0x3b, 0x7d, 0x8b, 0x0e, 0xc6, 0xdd, 0x66, 0xcf, + 0x19, 0xed, 0x47, 0x02, 0xe3, 0x8f, 0xd1, 0x97, 0xe0, 0x6e, 0x9e, 0x07, 0x97, 0x6f, 0xfe, 0x27, + 0x00, 0x00, 0xff, 0xff, 0xaa, 0xd9, 0xc9, 0x98, 0x1e, 0x1e, 0x00, 0x00, } func (this *Request) Equal(that interface{}) bool { @@ -3178,30 +3066,6 @@ func (this *Request_Echo) Equal(that interface{}) bool { } return true } -func (this *Request_Flush) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Request_Flush) - if !ok { - that2, ok := that.(Request_Flush) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Flush.Equal(that1.Flush) { - return false - } - return true -} func (this *Request_Info) Equal(that interface{}) bool { if that == nil { return this == nil @@ -3445,30 +3309,6 @@ func (this *RequestEcho) Equal(that interface{}) bool { } return true } -func (this *RequestFlush) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*RequestFlush) - if !ok { - that2, ok := that.(RequestFlush) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { - return false - } - return true -} func (this *RequestInfo) Equal(that interface{}) bool { if that == nil { return this == nil @@ -3842,30 +3682,6 @@ func (this *Response_Echo) Equal(that interface{}) bool { } return true } -func (this *Response_Flush) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Response_Flush) - if !ok { - that2, ok := that.(Response_Flush) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !this.Flush.Equal(that1.Flush) { - return false - } - return true -} func (this *Response_Info) Equal(that interface{}) bool { if that == nil { return this == nil @@ -4136,30 +3952,6 @@ func (this *ResponseEcho) Equal(that interface{}) bool { } return true } -func (this *ResponseFlush) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*ResponseFlush) - if !ok { - that2, ok := that.(ResponseFlush) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { - return false - } - return true -} func (this *ResponseInfo) Equal(that interface{}) bool { if that == nil { return this == nil @@ -5053,7 +4845,6 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type ABCIApplicationClient interface { Echo(ctx context.Context, in *RequestEcho, opts ...grpc.CallOption) (*ResponseEcho, error) - Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) SetOption(ctx context.Context, in *RequestSetOption, opts ...grpc.CallOption) (*ResponseSetOption, error) DeliverTx(ctx context.Context, in *RequestDeliverTx, opts ...grpc.CallOption) (*ResponseDeliverTx, error) @@ -5082,15 +4873,6 @@ func (c *aBCIApplicationClient) Echo(ctx context.Context, in *RequestEcho, opts return out, nil } -func (c *aBCIApplicationClient) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) { - out := new(ResponseFlush) - err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/Flush", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *aBCIApplicationClient) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) { out := new(ResponseInfo) err := c.cc.Invoke(ctx, "/tendermint.abci.types.ABCIApplication/Info", in, out, opts...) @@ -5175,7 +4957,6 @@ func (c *aBCIApplicationClient) EndBlock(ctx context.Context, in *RequestEndBloc // ABCIApplicationServer is the server API for ABCIApplication service. type ABCIApplicationServer interface { Echo(context.Context, *RequestEcho) (*ResponseEcho, error) - Flush(context.Context, *RequestFlush) (*ResponseFlush, error) Info(context.Context, *RequestInfo) (*ResponseInfo, error) SetOption(context.Context, *RequestSetOption) (*ResponseSetOption, error) DeliverTx(context.Context, *RequestDeliverTx) (*ResponseDeliverTx, error) @@ -5194,9 +4975,6 @@ type UnimplementedABCIApplicationServer struct { func (*UnimplementedABCIApplicationServer) Echo(ctx context.Context, req *RequestEcho) (*ResponseEcho, error) { return nil, status.Errorf(codes.Unimplemented, "method Echo not implemented") } -func (*UnimplementedABCIApplicationServer) Flush(ctx context.Context, req *RequestFlush) (*ResponseFlush, error) { - return nil, status.Errorf(codes.Unimplemented, "method Flush not implemented") -} func (*UnimplementedABCIApplicationServer) Info(ctx context.Context, req *RequestInfo) (*ResponseInfo, error) { return nil, status.Errorf(codes.Unimplemented, "method Info not implemented") } @@ -5247,24 +5025,6 @@ func _ABCIApplication_Echo_Handler(srv interface{}, ctx context.Context, dec fun return interceptor(ctx, in, info, handler) } -func _ABCIApplication_Flush_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(RequestFlush) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ABCIApplicationServer).Flush(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/tendermint.abci.types.ABCIApplication/Flush", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ABCIApplicationServer).Flush(ctx, req.(*RequestFlush)) - } - return interceptor(ctx, in, info, handler) -} - func _ABCIApplication_Info_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(RequestInfo) if err := dec(in); err != nil { @@ -5435,10 +5195,6 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ MethodName: "Echo", Handler: _ABCIApplication_Echo_Handler, }, - { - MethodName: "Flush", - Handler: _ABCIApplication_Flush_Handler, - }, { MethodName: "Info", Handler: _ABCIApplication_Info_Handler, @@ -5537,27 +5293,6 @@ func (m *Request_Echo) MarshalToSizedBuffer(dAtA []byte) (int, error) { } return len(dAtA) - i, nil } -func (m *Request_Flush) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Request_Flush) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Flush != nil { - { - size, err := m.Flush.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - } - return len(dAtA) - i, nil -} func (m *Request_Info) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) @@ -5783,33 +5518,6 @@ func (m *RequestEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *RequestFlush) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *RequestFlush) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *RequestFlush) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - return len(dAtA) - i, nil -} - func (m *RequestInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5959,12 +5667,12 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n13, err13 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err13 != nil { - return 0, err13 + n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err12 != nil { + return 0, err12 } - i -= n13 - i = encodeVarintTypes(dAtA, i, uint64(n13)) + i -= n12 + i = encodeVarintTypes(dAtA, i, uint64(n12)) i-- dAtA[i] = 0xa return len(dAtA) - i, nil @@ -6300,28 +6008,7 @@ func (m *Response_Echo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 - } - return len(dAtA) - i, nil -} -func (m *Response_Flush) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Response_Flush) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.Flush != nil { - { - size, err := m.Flush.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTypes(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 } return len(dAtA) - i, nil } @@ -6582,33 +6269,6 @@ func (m *ResponseEcho) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ResponseFlush) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ResponseFlush) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ResponseFlush) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - return len(dAtA) - i, nil -} - func (m *ResponseInfo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -7294,12 +6954,12 @@ func (m *EvidenceParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - n34, err34 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration):]) - if err34 != nil { - return 0, err34 + n32, err32 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration):]) + if err32 != nil { + return 0, err32 } - i -= n34 - i = encodeVarintTypes(dAtA, i, uint64(n34)) + i -= n32 + i = encodeVarintTypes(dAtA, i, uint64(n32)) i-- dAtA[i] = 0x12 if m.MaxAgeNumBlocks != 0 { @@ -7537,12 +7197,12 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x2a - n36, err36 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err36 != nil { - return 0, err36 + n34, err34 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err34 != nil { + return 0, err34 } - i -= n36 - i = encodeVarintTypes(dAtA, i, uint64(n36)) + i -= n34 + i = encodeVarintTypes(dAtA, i, uint64(n34)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7888,12 +7548,12 @@ func (m *Evidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n41, err41 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) - if err41 != nil { - return 0, err41 + n39, err39 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) + if err39 != nil { + return 0, err39 } - i -= n41 - i = encodeVarintTypes(dAtA, i, uint64(n41)) + i -= n39 + i = encodeVarintTypes(dAtA, i, uint64(n39)) i-- dAtA[i] = 0x22 if m.Height != 0 { @@ -7934,12 +7594,10 @@ func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { } func NewPopulatedRequest(r randyTypes, easy bool) *Request { this := &Request{} - oneofNumber_Value := []int32{2, 3, 4, 5, 6, 7, 8, 9, 11, 12, 19}[r.Intn(11)] + oneofNumber_Value := []int32{2, 4, 5, 6, 7, 8, 9, 11, 12, 19}[r.Intn(10)] switch oneofNumber_Value { case 2: this.Value = NewPopulatedRequest_Echo(r, easy) - case 3: - this.Value = NewPopulatedRequest_Flush(r, easy) case 4: this.Value = NewPopulatedRequest_Info(r, easy) case 5: @@ -7970,11 +7628,6 @@ func NewPopulatedRequest_Echo(r randyTypes, easy bool) *Request_Echo { this.Echo = NewPopulatedRequestEcho(r, easy) return this } -func NewPopulatedRequest_Flush(r randyTypes, easy bool) *Request_Flush { - this := &Request_Flush{} - this.Flush = NewPopulatedRequestFlush(r, easy) - return this -} func NewPopulatedRequest_Info(r randyTypes, easy bool) *Request_Info { this := &Request_Info{} this.Info = NewPopulatedRequestInfo(r, easy) @@ -8029,14 +7682,6 @@ func NewPopulatedRequestEcho(r randyTypes, easy bool) *RequestEcho { return this } -func NewPopulatedRequestFlush(r randyTypes, easy bool) *RequestFlush { - this := &RequestFlush{} - if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 1) - } - return this -} - func NewPopulatedRequestInfo(r randyTypes, easy bool) *RequestInfo { this := &RequestInfo{} this.Version = string(randStringTypes(r)) @@ -8178,14 +7823,12 @@ func NewPopulatedRequestCommit(r randyTypes, easy bool) *RequestCommit { func NewPopulatedResponse(r randyTypes, easy bool) *Response { this := &Response{} - oneofNumber_Value := []int32{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12}[r.Intn(12)] + oneofNumber_Value := []int32{1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12}[r.Intn(11)] switch oneofNumber_Value { case 1: this.Value = NewPopulatedResponse_Exception(r, easy) case 2: this.Value = NewPopulatedResponse_Echo(r, easy) - case 3: - this.Value = NewPopulatedResponse_Flush(r, easy) case 4: this.Value = NewPopulatedResponse_Info(r, easy) case 5: @@ -8221,11 +7864,6 @@ func NewPopulatedResponse_Echo(r randyTypes, easy bool) *Response_Echo { this.Echo = NewPopulatedResponseEcho(r, easy) return this } -func NewPopulatedResponse_Flush(r randyTypes, easy bool) *Response_Flush { - this := &Response_Flush{} - this.Flush = NewPopulatedResponseFlush(r, easy) - return this -} func NewPopulatedResponse_Info(r randyTypes, easy bool) *Response_Info { this := &Response_Info{} this.Info = NewPopulatedResponseInfo(r, easy) @@ -8289,14 +7927,6 @@ func NewPopulatedResponseEcho(r randyTypes, easy bool) *ResponseEcho { return this } -func NewPopulatedResponseFlush(r randyTypes, easy bool) *ResponseFlush { - this := &ResponseFlush{} - if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 1) - } - return this -} - func NewPopulatedResponseInfo(r randyTypes, easy bool) *ResponseInfo { this := &ResponseInfo{} this.Data = string(randStringTypes(r)) @@ -8885,18 +8515,6 @@ func (m *Request_Echo) Size() (n int) { } return n } -func (m *Request_Flush) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Flush != nil { - l = m.Flush.Size() - n += 1 + l + sovTypes(uint64(l)) - } - return n -} func (m *Request_Info) Size() (n int) { if m == nil { return 0 @@ -9021,18 +8639,6 @@ func (m *RequestEcho) Size() (n int) { return n } -func (m *RequestFlush) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *RequestInfo) Size() (n int) { if m == nil { return 0 @@ -9260,18 +8866,6 @@ func (m *Response_Echo) Size() (n int) { } return n } -func (m *Response_Flush) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Flush != nil { - l = m.Flush.Size() - n += 1 + l + sovTypes(uint64(l)) - } - return n -} func (m *Response_Info) Size() (n int) { if m == nil { return 0 @@ -9412,18 +9006,6 @@ func (m *ResponseEcho) Size() (n int) { return n } -func (m *ResponseFlush) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *ResponseInfo) Size() (n int) { if m == nil { return 0 @@ -10100,41 +9682,6 @@ func (m *Request) Unmarshal(dAtA []byte) error { } m.Value = &Request_Echo{v} iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Flush", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &RequestFlush{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.Value = &Request_Flush{v} - iNdEx = postIndex case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Info", wireType) @@ -10561,60 +10108,6 @@ func (m *RequestEcho) Unmarshal(dAtA []byte) error { } return nil } -func (m *RequestFlush) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: RequestFlush: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: RequestFlush: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *RequestInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -11848,41 +11341,6 @@ func (m *Response) Unmarshal(dAtA []byte) error { } m.Value = &Response_Echo{v} iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Flush", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTypes - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTypes - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &ResponseFlush{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.Value = &Response_Flush{v} - iNdEx = postIndex case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Info", wireType) @@ -12395,60 +11853,6 @@ func (m *ResponseEcho) Unmarshal(dAtA []byte) error { } return nil } -func (m *ResponseFlush) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTypes - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ResponseFlush: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ResponseFlush: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipTypes(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthTypes - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ResponseInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/abci/types/types.proto b/abci/types/types.proto index 351329de1..148ddccfc 100644 --- a/abci/types/types.proto +++ b/abci/types/types.proto @@ -29,7 +29,6 @@ option (gogoproto.testgen_all) = true; message Request { oneof value { RequestEcho echo = 2; - RequestFlush flush = 3; RequestInfo info = 4; RequestSetOption set_option = 5; RequestInitChain init_chain = 6; @@ -46,8 +45,6 @@ message RequestEcho { string message = 1; } -message RequestFlush {} - message RequestInfo { string version = 1; uint64 block_version = 2; @@ -109,7 +106,6 @@ message Response { oneof value { ResponseException exception = 1; ResponseEcho echo = 2; - ResponseFlush flush = 3; ResponseInfo info = 4; ResponseSetOption set_option = 5; ResponseInitChain init_chain = 6; @@ -131,8 +127,6 @@ message ResponseEcho { string message = 1; } -message ResponseFlush {} - message ResponseInfo { string data = 1; @@ -334,7 +328,6 @@ message Evidence { service ABCIApplication { rpc Echo(RequestEcho) returns (ResponseEcho); - rpc Flush(RequestFlush) returns (ResponseFlush); rpc Info(RequestInfo) returns (ResponseInfo); rpc SetOption(RequestSetOption) returns (ResponseSetOption); rpc DeliverTx(RequestDeliverTx) returns (ResponseDeliverTx); diff --git a/abci/types/typespb_test.go b/abci/types/typespb_test.go index eaa550054..f294697b9 100644 --- a/abci/types/typespb_test.go +++ b/abci/types/typespb_test.go @@ -138,62 +138,6 @@ func TestRequestEchoMarshalTo(t *testing.T) { } } -func TestRequestFlushProto(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedRequestFlush(popr, false) - dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - msg := &RequestFlush{} - if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - littlefuzz := make([]byte, len(dAtA)) - copy(littlefuzz, dAtA) - for i := range dAtA { - dAtA[i] = byte(popr.Intn(256)) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } - if len(littlefuzz) > 0 { - fuzzamount := 100 - for i := 0; i < fuzzamount; i++ { - littlefuzz[popr.Intn(len(littlefuzz))] = byte(popr.Intn(256)) - littlefuzz = append(littlefuzz, byte(popr.Intn(256))) - } - // shouldn't panic - _ = github_com_gogo_protobuf_proto.Unmarshal(littlefuzz, msg) - } -} - -func TestRequestFlushMarshalTo(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedRequestFlush(popr, false) - size := p.Size() - dAtA := make([]byte, size) - for i := range dAtA { - dAtA[i] = byte(popr.Intn(256)) - } - _, err := p.MarshalTo(dAtA) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - msg := &RequestFlush{} - if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - for i := range dAtA { - dAtA[i] = byte(popr.Intn(256)) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } -} - func TestRequestInfoProto(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) @@ -866,62 +810,6 @@ func TestResponseEchoMarshalTo(t *testing.T) { } } -func TestResponseFlushProto(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedResponseFlush(popr, false) - dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - msg := &ResponseFlush{} - if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - littlefuzz := make([]byte, len(dAtA)) - copy(littlefuzz, dAtA) - for i := range dAtA { - dAtA[i] = byte(popr.Intn(256)) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } - if len(littlefuzz) > 0 { - fuzzamount := 100 - for i := 0; i < fuzzamount; i++ { - littlefuzz[popr.Intn(len(littlefuzz))] = byte(popr.Intn(256)) - littlefuzz = append(littlefuzz, byte(popr.Intn(256))) - } - // shouldn't panic - _ = github_com_gogo_protobuf_proto.Unmarshal(littlefuzz, msg) - } -} - -func TestResponseFlushMarshalTo(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedResponseFlush(popr, false) - size := p.Size() - dAtA := make([]byte, size) - for i := range dAtA { - dAtA[i] = byte(popr.Intn(256)) - } - _, err := p.MarshalTo(dAtA) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - msg := &ResponseFlush{} - if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - for i := range dAtA { - dAtA[i] = byte(popr.Intn(256)) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } -} - func TestResponseInfoProto(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) @@ -2302,24 +2190,6 @@ func TestRequestEchoJSON(t *testing.T) { t.Fatalf("seed = %d, %#v !Json Equal %#v", seed, msg, p) } } -func TestRequestFlushJSON(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedRequestFlush(popr, true) - marshaler := github_com_gogo_protobuf_jsonpb.Marshaler{} - jsondata, err := marshaler.MarshalToString(p) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - msg := &RequestFlush{} - err = github_com_gogo_protobuf_jsonpb.UnmarshalString(jsondata, msg) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Json Equal %#v", seed, msg, p) - } -} func TestRequestInfoJSON(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) @@ -2536,24 +2406,6 @@ func TestResponseEchoJSON(t *testing.T) { t.Fatalf("seed = %d, %#v !Json Equal %#v", seed, msg, p) } } -func TestResponseFlushJSON(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedResponseFlush(popr, true) - marshaler := github_com_gogo_protobuf_jsonpb.Marshaler{} - jsondata, err := marshaler.MarshalToString(p) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - msg := &ResponseFlush{} - err = github_com_gogo_protobuf_jsonpb.UnmarshalString(jsondata, msg) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Json Equal %#v", seed, msg, p) - } -} func TestResponseInfoJSON(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) @@ -3042,34 +2894,6 @@ func TestRequestEchoProtoCompactText(t *testing.T) { } } -func TestRequestFlushProtoText(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedRequestFlush(popr, true) - dAtA := github_com_gogo_protobuf_proto.MarshalTextString(p) - msg := &RequestFlush{} - if err := github_com_gogo_protobuf_proto.UnmarshalText(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } -} - -func TestRequestFlushProtoCompactText(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedRequestFlush(popr, true) - dAtA := github_com_gogo_protobuf_proto.CompactTextString(p) - msg := &RequestFlush{} - if err := github_com_gogo_protobuf_proto.UnmarshalText(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } -} - func TestRequestInfoProtoText(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) @@ -3406,34 +3230,6 @@ func TestResponseEchoProtoCompactText(t *testing.T) { } } -func TestResponseFlushProtoText(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedResponseFlush(popr, true) - dAtA := github_com_gogo_protobuf_proto.MarshalTextString(p) - msg := &ResponseFlush{} - if err := github_com_gogo_protobuf_proto.UnmarshalText(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } -} - -func TestResponseFlushProtoCompactText(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedResponseFlush(popr, true) - dAtA := github_com_gogo_protobuf_proto.CompactTextString(p) - msg := &ResponseFlush{} - if err := github_com_gogo_protobuf_proto.UnmarshalText(dAtA, msg); err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - if !p.Equal(msg) { - t.Fatalf("seed = %d, %#v !Proto %#v", seed, msg, p) - } -} - func TestResponseInfoProtoText(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) @@ -4150,28 +3946,6 @@ func TestRequestEchoSize(t *testing.T) { } } -func TestRequestFlushSize(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedRequestFlush(popr, true) - size2 := github_com_gogo_protobuf_proto.Size(p) - dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - size := p.Size() - if len(dAtA) != size { - t.Errorf("seed = %d, size %v != marshalled size %v", seed, size, len(dAtA)) - } - if size2 != size { - t.Errorf("seed = %d, size %v != before marshal proto.Size %v", seed, size, size2) - } - size3 := github_com_gogo_protobuf_proto.Size(p) - if size3 != size { - t.Errorf("seed = %d, size %v != after marshal proto.Size %v", seed, size, size3) - } -} - func TestRequestInfoSize(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) @@ -4436,28 +4210,6 @@ func TestResponseEchoSize(t *testing.T) { } } -func TestResponseFlushSize(t *testing.T) { - seed := time.Now().UnixNano() - popr := math_rand.New(math_rand.NewSource(seed)) - p := NewPopulatedResponseFlush(popr, true) - size2 := github_com_gogo_protobuf_proto.Size(p) - dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) - if err != nil { - t.Fatalf("seed = %d, err = %v", seed, err) - } - size := p.Size() - if len(dAtA) != size { - t.Errorf("seed = %d, size %v != marshalled size %v", seed, size, len(dAtA)) - } - if size2 != size { - t.Errorf("seed = %d, size %v != before marshal proto.Size %v", seed, size, size2) - } - size3 := github_com_gogo_protobuf_proto.Size(p) - if size3 != size { - t.Errorf("seed = %d, size %v != after marshal proto.Size %v", seed, size, size3) - } -} - func TestResponseInfoSize(t *testing.T) { seed := time.Now().UnixNano() popr := math_rand.New(math_rand.NewSource(seed)) diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go index 55e3a2327..e394ad5fd 100644 --- a/mempool/clist_mempool.go +++ b/mempool/clist_mempool.go @@ -176,11 +176,6 @@ func (mem *CListMempool) TxsBytes() int64 { return atomic.LoadInt64(&mem.txsBytes) } -// Lock() must be help by the caller during execution. -func (mem *CListMempool) FlushAppConn() error { - return mem.proxyAppConn.FlushSync() -} - // XXX: Unsafe! Calling Flush may leave mempool in inconsistent state. func (mem *CListMempool) Flush() { mem.updateMtx.RLock() @@ -640,8 +635,6 @@ func (mem *CListMempool) recheckTxs() { Type: abci.CheckTxType_Recheck, }) } - - mem.proxyAppConn.FlushAsync() } //-------------------------------------------------------------------------------- diff --git a/mempool/mempool.go b/mempool/mempool.go index 68eec8674..128b23c70 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -46,11 +46,6 @@ type Mempool interface { newPostFn PostCheckFunc, ) error - // FlushAppConn flushes the mempool connection to ensure async reqResCb calls are - // done. E.g. from CheckTx. - // NOTE: Lock/Unlock must be managed by caller - FlushAppConn() error - // Flush removes all transactions from the mempool and cache Flush() diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 066d17295..0ae24d002 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -25,9 +25,6 @@ type AppConnMempool interface { Error() error CheckTxAsync(types.RequestCheckTx) *abcicli.ReqRes - - FlushAsync() *abcicli.ReqRes - FlushSync() error } type AppConnQuery interface { @@ -102,14 +99,6 @@ func (app *appConnMempool) Error() error { return app.appConn.Error() } -func (app *appConnMempool) FlushAsync() *abcicli.ReqRes { - return app.appConn.FlushAsync() -} - -func (app *appConnMempool) FlushSync() error { - return app.appConn.FlushSync() -} - func (app *appConnMempool) CheckTxAsync(req types.RequestCheckTx) *abcicli.ReqRes { return app.appConn.CheckTxAsync(req) } diff --git a/state/execution.go b/state/execution.go index 50a7afd89..ecd13afb7 100644 --- a/state/execution.go +++ b/state/execution.go @@ -214,14 +214,6 @@ func (blockExec *BlockExecutor) Commit( blockExec.mempool.Lock() defer blockExec.mempool.Unlock() - // while mempool is Locked, flush to ensure all async requests have completed - // in the ABCI app before Commit. - err := blockExec.mempool.FlushAppConn() - if err != nil { - blockExec.logger.Error("Client error during mempool.FlushAppConn", "err", err) - return nil, 0, err - } - // Commit block, get hash back appCommitStartTime := time.Now().UnixNano() res, err := blockExec.proxyApp.CommitSync() From 0c29039e6dd1cc0e29629911fa1f78dd5f790937 Mon Sep 17 00:00:00 2001 From: "Kim, JinSan" Date: Mon, 28 Dec 2020 19:52:34 +0900 Subject: [PATCH 2/3] fix: broken tests --- abci/client/grpc_client_test.go | 1 - abci/tests/benchmarks/simple/simple.go | 13 ++----------- mempool/clist_mempool_test.go | 2 -- proxy/app_conn_test.go | 11 ----------- 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/abci/client/grpc_client_test.go b/abci/client/grpc_client_test.go index aba6662ec..7f97e9e03 100644 --- a/abci/client/grpc_client_test.go +++ b/abci/client/grpc_client_test.go @@ -50,7 +50,6 @@ func TestProperSyncCalls(t *testing.T) { go func() { // This is BeginBlockSync unrolled.... reqres := c.BeginBlockAsync(types.RequestBeginBlock{}) - c.FlushSync() res := reqres.Response.GetBeginBlock() require.NotNil(t, res) resp <- c.Error() diff --git a/abci/tests/benchmarks/simple/simple.go b/abci/tests/benchmarks/simple/simple.go index b18eaa580..d47089e78 100644 --- a/abci/tests/benchmarks/simple/simple.go +++ b/abci/tests/benchmarks/simple/simple.go @@ -3,12 +3,10 @@ package main import ( "bufio" "fmt" - "io" - "log" - "reflect" - "github.com/tendermint/tendermint/abci/types" tmnet "github.com/tendermint/tendermint/libs/net" + "io" + "log" ) func main() { @@ -41,10 +39,6 @@ func makeRequest(conn io.ReadWriter, req *types.Request) (*types.Response, error if err != nil { return nil, err } - err = types.WriteMessage(types.ToRequestFlush(), bufWriter) - if err != nil { - return nil, err - } err = bufWriter.Flush() if err != nil { return nil, err @@ -61,9 +55,6 @@ func makeRequest(conn io.ReadWriter, req *types.Request) (*types.Response, error if err != nil { return nil, err } - if _, ok := resFlush.Value.(*types.Response_Flush); !ok { - return nil, fmt.Errorf("expected flush response but got something else: %v", reflect.TypeOf(resFlush)) - } return res, nil } diff --git a/mempool/clist_mempool_test.go b/mempool/clist_mempool_test.go index e23bb64d3..e74d26685 100644 --- a/mempool/clist_mempool_test.go +++ b/mempool/clist_mempool_test.go @@ -570,8 +570,6 @@ func TestMempoolRemoteAppConcurrency(t *testing.T) { // this will err with ErrTxInCache many times ... mempool.CheckTx(tx, nil, TxInfo{SenderID: uint16(peerID)}) } - err := mempool.FlushAppConn() - require.NoError(t, err) } // caller must close server diff --git a/proxy/app_conn_test.go b/proxy/app_conn_test.go index cc952485f..b9ed71055 100644 --- a/proxy/app_conn_test.go +++ b/proxy/app_conn_test.go @@ -17,7 +17,6 @@ import ( type AppConnTest interface { EchoAsync(string) *abcicli.ReqRes - FlushSync() error InfoSync(types.RequestInfo) (*types.ResponseInfo, error) } @@ -33,10 +32,6 @@ func (app *appConnTest) EchoAsync(msg string) *abcicli.ReqRes { return app.appConn.EchoAsync(msg) } -func (app *appConnTest) FlushSync() error { - return app.appConn.FlushSync() -} - func (app *appConnTest) InfoSync(req types.RequestInfo) (*types.ResponseInfo, error) { return app.appConn.InfoSync(req) } @@ -73,9 +68,6 @@ func TestEcho(t *testing.T) { for i := 0; i < 1000; i++ { proxy.EchoAsync(fmt.Sprintf("echo-%v", i)) } - if err := proxy.FlushSync(); err != nil { - t.Error(err) - } } func BenchmarkEcho(b *testing.B) { @@ -109,9 +101,6 @@ func BenchmarkEcho(b *testing.B) { for i := 0; i < b.N; i++ { proxy.EchoAsync(echoString) } - if err := proxy.FlushSync(); err != nil { - b.Error(err) - } b.StopTimer() // info := proxy.InfoSync(types.RequestInfo{""}) From 5c0b951331e11f4144eb95d7ecd8772ad252a26e Mon Sep 17 00:00:00 2001 From: "Kim, JinSan" Date: Tue, 29 Dec 2020 18:40:14 +0900 Subject: [PATCH 3/3] chore: recover import order --- abci/tests/benchmarks/simple/simple.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/abci/tests/benchmarks/simple/simple.go b/abci/tests/benchmarks/simple/simple.go index d47089e78..c1aabc6f5 100644 --- a/abci/tests/benchmarks/simple/simple.go +++ b/abci/tests/benchmarks/simple/simple.go @@ -3,10 +3,11 @@ package main import ( "bufio" "fmt" - "github.com/tendermint/tendermint/abci/types" - tmnet "github.com/tendermint/tendermint/libs/net" "io" "log" + + "github.com/tendermint/tendermint/abci/types" + tmnet "github.com/tendermint/tendermint/libs/net" ) func main() {