benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consensus: remove log payload

Browse Source
This commit is contained in:
Sergey Cherepanov 2023-07-05 18:50:14 +02:00
parent 0c1d752acf
commit cd3c6c736a
No known key found for this signature in database
GPG Key ID: 87F8EDE8FBDF637C
4 changed files with 61 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
consensus/consensusclient/client.go
View File

@ -36,9 +36,9 @@ type Watcher interface {
type Service interface { type Service interface {
// AddLog adds new log to consensus servers // AddLog adds new log to consensus servers
AddLog(ctx context.Context, clog *consensusproto.Log) (err error) AddLog(ctx context.Context, rec *consensusproto.RawRecordWithId) (err error)
// AddRecord adds new record to consensus servers // AddRecord adds new record to consensus servers
AddRecord(ctx context.Context, logId string, clog *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error) AddRecord(ctx context.Context, logId string, rec *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error)
// Watch starts watching to given logId and calls watcher when any relative event received // Watch starts watching to given logId and calls watcher when any relative event received
Watch(logId string, w Watcher) (err error) Watch(logId string, w Watcher) (err error)
// UnWatch stops watching given logId and removes watcher // UnWatch stops watching given logId and removes watcher
@ -86,10 +86,10 @@ func (s *service) doClient(ctx context.Context, fn func(cl consensusproto.DRPCCo
return fn(consensusproto.NewDRPCConsensusClient(dc)) return fn(consensusproto.NewDRPCConsensusClient(dc))
} }
func (s *service) AddLog(ctx context.Context, clog *consensusproto.Log) (err error) { func (s *service) AddLog(ctx context.Context, rec *consensusproto.RawRecordWithId) (err error) {
return s.doClient(ctx, func(cl consensusproto.DRPCConsensusClient) error { return s.doClient(ctx, func(cl consensusproto.DRPCConsensusClient) error {
if _, err = cl.LogAdd(ctx, &consensusproto.LogAddRequest{ if _, err = cl.LogAdd(ctx, &consensusproto.LogAddRequest{
Log: clog, Record: rec,
}); err != nil { }); err != nil {
return rpcerr.Unwrap(err) return rpcerr.Unwrap(err)
} }
@ -97,11 +97,11 @@ func (s *service) AddLog(ctx context.Context, clog *consensusproto.Log) (err err
}) })
} }
func (s *service) AddRecord(ctx context.Context, logId string, clog *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error) { func (s *service) AddRecord(ctx context.Context, logId string, rec *consensusproto.RawRecord) (record *consensusproto.RawRecordWithId, err error) {
err = s.doClient(ctx, func(cl consensusproto.DRPCConsensusClient) error { err = s.doClient(ctx, func(cl consensusproto.DRPCConsensusClient) error {
if record, err = cl.RecordAdd(ctx, &consensusproto.RecordAddRequest{ if record, err = cl.RecordAdd(ctx, &consensusproto.RecordAddRequest{
LogId: logId, LogId: logId,
Record: clog, Record: rec,
}); err != nil { }); err != nil {
return rpcerr.Unwrap(err) return rpcerr.Unwrap(err)
} }

2
consensus/consensusclient/client_test.go
View File

@ -113,7 +113,7 @@ func TestService_Init(t *testing.T) {
func TestService_AddLog(t *testing.T) { func TestService_AddLog(t *testing.T) {
fx := newFixture(t).run(t) fx := newFixture(t).run(t)
defer fx.Finish() defer fx.Finish()
assert.NoError(t, fx.AddLog(ctx, &consensusproto.Log{})) assert.NoError(t, fx.AddLog(ctx, &consensusproto.RawRecordWithId{}))
} }
func TestService_AddRecord(t *testing.T) { func TestService_AddRecord(t *testing.T) {

157
consensus/consensusproto/consensus.pb.go
View File

@ -61,7 +61,6 @@ func (ErrCodes) EnumDescriptor() ([]byte, []int) {
type Log struct { type Log struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Payload []byte `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
Records []*RawRecordWithId `protobuf:"bytes,3,rep,name=records,proto3" json:"records,omitempty"` Records []*RawRecordWithId `protobuf:"bytes,3,rep,name=records,proto3" json:"records,omitempty"`
} }
@ -105,13 +104,6 @@ func (m *Log) GetId() string {
return "" return ""
} }
func (m *Log) GetPayload() []byte {
if m != nil {
return m.Payload
}
return nil
}
func (m *Log) GetRecords() []*RawRecordWithId { func (m *Log) GetRecords() []*RawRecordWithId {
if m != nil { if m != nil {
return m.Records return m.Records
@ -347,7 +339,8 @@ func (m *Ok) XXX_DiscardUnknown() {
var xxx_messageInfo_Ok proto.InternalMessageInfo var xxx_messageInfo_Ok proto.InternalMessageInfo
type LogAddRequest struct { type LogAddRequest struct {
Log *Log `protobuf:"bytes,1,opt,name=log,proto3" json:"log,omitempty"` // first record in the log, consensus node not sign it
Record *RawRecordWithId `protobuf:"bytes,1,opt,name=record,proto3" json:"record,omitempty"`
} }
func (m *LogAddRequest) Reset() { *m = LogAddRequest{} } func (m *LogAddRequest) Reset() { *m = LogAddRequest{} }
@ -383,9 +376,9 @@ func (m *LogAddRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_LogAddRequest proto.InternalMessageInfo var xxx_messageInfo_LogAddRequest proto.InternalMessageInfo
func (m *LogAddRequest) GetLog() *Log { func (m *LogAddRequest) GetRecord() *RawRecordWithId {
if m != nil { if m != nil {
return m.Log return m.Record
} }
return nil return nil
} }
@ -617,47 +610,46 @@ func init() {
} }
var fileDescriptor_b8d7f1c16b400059 = []byte{ var fileDescriptor_b8d7f1c16b400059 = []byte{
// 626 bytes of a gzipped FileDescriptorProto // 612 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcb, 0x6e, 0xd3, 0x4c,
0x10, 0xce, 0xda, 0x69, 0x1a, 0x4f, 0x68, 0x6a, 0x06, 0x84, 0x4c, 0x44, 0xdd, 0xc8, 0x12, 0x52, 0x14, 0xce, 0xd8, 0x69, 0x1a, 0x9f, 0xfc, 0x4d, 0xfd, 0x1f, 0x10, 0x32, 0x11, 0x75, 0x23, 0xaf,
0xa8, 0x50, 0x0a, 0x41, 0x20, 0xa1, 0x9e, 0xa0, 0x4a, 0xa5, 0x48, 0xa1, 0x45, 0x46, 0xa8, 0x12, 0x42, 0x85, 0x52, 0x08, 0x42, 0x08, 0x75, 0x05, 0x55, 0x2a, 0x22, 0x85, 0xb6, 0x32, 0x42, 0x95,
0x9c, 0x5c, 0xef, 0xd6, 0x35, 0x4d, 0xbd, 0x61, 0xbd, 0xe9, 0xcf, 0x33, 0x70, 0xe1, 0x05, 0x78, 0x60, 0xe5, 0x7a, 0xa6, 0xae, 0xd5, 0xd6, 0x63, 0x66, 0x26, 0xbd, 0x3c, 0x03, 0x1b, 0x5e, 0x80,
0x1f, 0x8e, 0x3d, 0x72, 0x44, 0xed, 0x85, 0x07, 0xe0, 0x01, 0x90, 0xd7, 0xb1, 0xe3, 0xe6, 0x07, 0xf7, 0x61, 0xd9, 0x25, 0x4b, 0xd4, 0x6e, 0x78, 0x00, 0x1e, 0x00, 0x79, 0x1c, 0xbb, 0x69, 0xda,
0xc4, 0x25, 0xd9, 0xf9, 0x66, 0x66, 0xe7, 0xdb, 0x6f, 0x3e, 0x19, 0x36, 0x7d, 0x1e, 0xc5, 0x2c, 0x70, 0xd9, 0x24, 0x73, 0xbe, 0x73, 0xfb, 0xce, 0x39, 0x9f, 0x0c, 0xab, 0x21, 0x4f, 0x24, 0x4b,
0x8a, 0x47, 0xf1, 0xe4, 0x34, 0x14, 0x5c, 0xf2, 0x4d, 0xf5, 0x5b, 0x40, 0xdb, 0x0a, 0xc0, 0x7a, 0xe4, 0x48, 0x5e, 0xbd, 0x52, 0xc1, 0x15, 0x5f, 0xd5, 0xbf, 0x13, 0x68, 0x57, 0x03, 0xd8, 0x2c,
0x0e, 0xbc, 0x4d, 0x62, 0xe7, 0x13, 0xe8, 0x7d, 0x1e, 0x60, 0x1d, 0xb4, 0x90, 0x5a, 0xa4, 0x49, 0x81, 0xed, 0xcc, 0xf6, 0xb6, 0xc1, 0x1c, 0xf2, 0x08, 0x9b, 0x60, 0xc4, 0xd4, 0x21, 0x6d, 0xd2,
0x5a, 0x86, 0xab, 0x85, 0x14, 0x2d, 0x58, 0x1e, 0x7a, 0x17, 0x03, 0xee, 0x51, 0x4b, 0x6b, 0x92, 0xb1, 0x7c, 0x23, 0xa6, 0xf8, 0x02, 0xe6, 0x05, 0x0b, 0xb9, 0xa0, 0xd2, 0x31, 0xdb, 0x66, 0xa7,
0xd6, 0x2d, 0x37, 0x0b, 0xf1, 0x25, 0x2c, 0x0b, 0xe6, 0x73, 0x41, 0x63, 0x4b, 0x6f, 0xea, 0xad, 0xd1, 0x5b, 0xee, 0x5e, 0x4f, 0xec, 0xfa, 0xc1, 0x89, 0xaf, 0x23, 0x76, 0x62, 0xb5, 0x3f, 0xa0,
0x5a, 0x67, 0xbd, 0x7d, 0xf3, 0xca, 0xb6, 0xeb, 0x9d, 0xb9, 0xaa, 0x62, 0x3f, 0x94, 0x47, 0x3d, 0x7e, 0x11, 0xef, 0x7d, 0x21, 0x60, 0x95, 0x4e, 0x74, 0x60, 0x3e, 0x0d, 0xce, 0x0e, 0x79, 0x90,
0xea, 0x66, 0xf5, 0xce, 0x37, 0x02, 0x46, 0x9e, 0x2c, 0x8e, 0x20, 0x37, 0x47, 0x3c, 0x00, 0x23, 0x57, 0xff, 0xcf, 0x2f, 0x4c, 0x7c, 0x00, 0x96, 0x8c, 0xa3, 0x24, 0x50, 0x23, 0xc1, 0x1c, 0x43,
0x0e, 0x83, 0xc8, 0x93, 0x23, 0xc1, 0xc6, 0xe3, 0x27, 0x00, 0x6e, 0x80, 0xe9, 0xf9, 0x3e, 0x1b, 0xfb, 0xae, 0x00, 0x5c, 0x01, 0x3b, 0x08, 0x43, 0x96, 0x2a, 0x2e, 0x06, 0x94, 0x25, 0x2a, 0x56,
0x4a, 0x2e, 0x7a, 0x94, 0x45, 0x32, 0x94, 0x17, 0x96, 0xae, 0x8a, 0x66, 0x70, 0x7c, 0x0c, 0xb7, 0x67, 0x8e, 0xa9, 0x83, 0x6e, 0xe0, 0xf8, 0x08, 0xfe, 0x2f, 0xb0, 0xb7, 0x65, 0xc5, 0xaa, 0x0e,
0x33, 0xec, 0x5d, 0x7e, 0x63, 0x59, 0x15, 0xcf, 0x26, 0x9c, 0x2d, 0x58, 0x9d, 0xe2, 0xfe, 0x17, 0xbe, 0xe9, 0xf0, 0xd6, 0x60, 0x71, 0x8a, 0xfb, 0x6f, 0x48, 0xe6, 0x7b, 0x31, 0x8a, 0xbd, 0x78,
0x92, 0xa9, 0x62, 0x5a, 0xa6, 0x98, 0x13, 0x41, 0x65, 0xfc, 0xb0, 0x7b, 0x50, 0x19, 0x0a, 0x76, 0x09, 0xd4, 0xc6, 0x83, 0xdd, 0x83, 0x5a, 0x2a, 0xd8, 0xf1, 0xa0, 0xd8, 0xda, 0xd8, 0xc2, 0x16,
0xda, 0xcb, 0xf4, 0x1c, 0x47, 0xd8, 0x80, 0x6a, 0x98, 0x11, 0x4e, 0x5f, 0x95, 0xc7, 0x88, 0x50, 0xd4, 0xe3, 0x82, 0x70, 0x3e, 0x55, 0x69, 0x23, 0x42, 0x95, 0x06, 0x2a, 0x18, 0x0f, 0xa2, 0xdf,
0xa6, 0x9e, 0xf4, 0xc6, 0x0f, 0x51, 0xe7, 0x44, 0x06, 0x19, 0x9e, 0xb0, 0x58, 0x7a, 0x27, 0x43, 0xd9, 0x1a, 0x54, 0x7c, 0xc4, 0xa4, 0x0a, 0x8e, 0x52, 0x4d, 0xda, 0xf4, 0xaf, 0x00, 0xaf, 0x0a,
0x45, 0x5a, 0x77, 0x27, 0x80, 0x53, 0x06, 0x6d, 0xef, 0xd8, 0x79, 0x01, 0x2b, 0x7d, 0x1e, 0xbc, 0xc6, 0xd6, 0x81, 0xf7, 0x1a, 0x16, 0x86, 0x3c, 0x7a, 0x49, 0xa9, 0xcf, 0x3e, 0x8e, 0x98, 0x54,
0xa2, 0xd4, 0x65, 0x9f, 0x47, 0x2c, 0x96, 0xf8, 0x10, 0xf4, 0x01, 0x0f, 0xd4, 0xe4, 0x5a, 0xe7, 0xf8, 0x1c, 0x6a, 0xf9, 0xba, 0x75, 0xf3, 0xbf, 0xb8, 0xce, 0x38, 0xdc, 0xfb, 0x00, 0x76, 0x8e,
0xce, 0xf4, 0x6a, 0xfa, 0x3c, 0x70, 0x93, 0xbc, 0xf3, 0x11, 0xcc, 0x94, 0x6d, 0xa1, 0xf5, 0x2e, 0x4f, 0x14, 0xbb, 0x0b, 0x73, 0x87, 0x3c, 0x2a, 0x07, 0xc9, 0x0d, 0x7c, 0x52, 0xb6, 0x30, 0x74,
0x2c, 0x0d, 0x78, 0x90, 0xd3, 0x4e, 0x03, 0x7c, 0x0a, 0x95, 0x74, 0x7f, 0x8a, 0x73, 0xad, 0x73, 0x8b, 0xfb, 0x33, 0x5b, 0x94, 0xc5, 0xdf, 0xc0, 0xe2, 0x90, 0x47, 0x3b, 0x81, 0x0a, 0xf7, 0x8b,
0x7f, 0xe1, 0xba, 0xdd, 0x71, 0xa1, 0xf3, 0x06, 0x56, 0xfb, 0x3c, 0xd8, 0xf7, 0xa4, 0x7f, 0x94, 0xda, 0x2d, 0xa8, 0x9f, 0x64, 0xf6, 0x80, 0x4a, 0x87, 0xb4, 0xcd, 0x8e, 0xe5, 0x97, 0x36, 0xba,
0xdd, 0xdd, 0x80, 0xea, 0x59, 0x12, 0xf7, 0x68, 0x6c, 0x91, 0xa6, 0xde, 0x32, 0xdc, 0x3c, 0x46, 0x00, 0xa3, 0xa4, 0xf4, 0x1a, 0xda, 0x3b, 0x81, 0x78, 0x9f, 0x88, 0x1e, 0x5b, 0xd7, 0xeb, 0x1f,
0x1b, 0x60, 0x14, 0xe5, 0x59, 0x4d, 0x65, 0x0b, 0x88, 0xf3, 0x85, 0xa8, 0x47, 0xaa, 0xfb, 0xba, 0xb3, 0x64, 0x16, 0xd3, 0x09, 0xad, 0x1a, 0xff, 0xa6, 0x55, 0x7c, 0x08, 0x73, 0x4c, 0x08, 0x2e,
0xa7, 0x2c, 0x5a, 0xc4, 0xb4, 0xe0, 0x4c, 0xed, 0xff, 0x9c, 0x89, 0x8f, 0x60, 0x89, 0x09, 0xc1, 0xf4, 0x45, 0x1a, 0xbd, 0x3b, 0xd3, 0x89, 0x7d, 0x21, 0xfc, 0x3c, 0xc2, 0x7b, 0x06, 0x66, 0x5f,
0x85, 0xd2, 0x7f, 0x8e, 0x6e, 0x5d, 0x21, 0xdc, 0xb4, 0xc2, 0x79, 0x0e, 0x7a, 0x57, 0x08, 0x6c, 0x08, 0xec, 0x16, 0x19, 0x19, 0x85, 0x66, 0xcf, 0xb9, 0x25, 0x63, 0x9d, 0x53, 0x26, 0xc7, 0x69,
0x67, 0x1d, 0x09, 0x85, 0x7a, 0xc7, 0x9a, 0xd3, 0xb1, 0xcd, 0x29, 0x8b, 0xc7, 0x6d, 0x1b, 0x1c, 0x2b, 0x1c, 0xea, 0x05, 0x84, 0x4d, 0x80, 0x77, 0x09, 0x3b, 0x4d, 0x59, 0xa8, 0x18, 0xb5, 0x2b,
0xaa, 0x19, 0x84, 0x75, 0x80, 0xf7, 0x11, 0x3b, 0x1f, 0x32, 0x5f, 0x32, 0x6a, 0x96, 0x70, 0x05, 0xb8, 0x00, 0xd6, 0x90, 0x47, 0xfd, 0xd3, 0x58, 0x2a, 0x69, 0x13, 0x5c, 0x84, 0xc6, 0x90, 0x47,
0x8c, 0x3e, 0x0f, 0xba, 0xe7, 0x61, 0x2c, 0x63, 0x93, 0xe0, 0x2a, 0xd4, 0xfa, 0x3c, 0xd8, 0xe5, 0x9b, 0x5c, 0x6d, 0xf0, 0x51, 0x42, 0x6d, 0x03, 0x11, 0x9a, 0x39, 0xed, 0x75, 0x9e, 0xec, 0x1d,
0x72, 0x87, 0x8f, 0x22, 0x6a, 0x6a, 0x88, 0x50, 0x4f, 0x69, 0x6f, 0xf3, 0xe8, 0x70, 0x10, 0xfa, 0xc6, 0xa1, 0xb2, 0xcd, 0x2c, 0x67, 0x83, 0x8b, 0xdd, 0x98, 0x52, 0x96, 0xd8, 0x55, 0xb4, 0xa1,
0xd2, 0xd4, 0x93, 0x9e, 0x1d, 0x2e, 0x0e, 0x42, 0x4a, 0x59, 0x64, 0x96, 0xd1, 0x84, 0x5a, 0x37, 0xd1, 0xcf, 0xfa, 0x6c, 0xed, 0xed, 0x49, 0xa6, 0xec, 0x9f, 0x66, 0xef, 0x07, 0x01, 0x6b, 0xbd,
0x99, 0xb3, 0x77, 0x78, 0x18, 0x33, 0x69, 0xfe, 0xd6, 0x3b, 0xbf, 0x08, 0x18, 0xdb, 0x19, 0x27, 0xe0, 0x84, 0x6b, 0x50, 0xcb, 0x95, 0x83, 0x4b, 0xd3, 0x4c, 0xaf, 0x29, 0xaa, 0x85, 0xd3, 0xee,
0xdc, 0x82, 0x4a, 0xea, 0x13, 0x5c, 0x9b, 0xe3, 0x89, 0x89, 0x09, 0x1a, 0x38, 0x9d, 0xde, 0x3b, 0xad, 0x03, 0xdc, 0x04, 0xab, 0x14, 0x0b, 0xb6, 0x6f, 0x2c, 0x75, 0x4a, 0x47, 0xad, 0x3f, 0xad,
0xc6, 0x5d, 0x30, 0x72, 0xb3, 0x60, 0x73, 0x46, 0xd4, 0x29, 0x1f, 0x35, 0xfe, 0x25, 0x3b, 0xee, 0x1d, 0x37, 0xa1, 0x5e, 0xdc, 0x13, 0x97, 0x6f, 0xa1, 0x33, 0xa9, 0x9c, 0xd6, 0xd2, 0xac, 0x00,
0x42, 0x35, 0xdb, 0x27, 0xae, 0xcf, 0xa1, 0x53, 0x74, 0x4e, 0x63, 0x6d, 0x51, 0x81, 0xb2, 0x42, 0x2d, 0x85, 0x0e, 0x79, 0x4c, 0x5e, 0xf5, 0xbe, 0x5e, 0xb8, 0xe4, 0xfc, 0xc2, 0x25, 0xdf, 0x2f,
0x8b, 0x3c, 0x21, 0xaf, 0x3b, 0xdf, 0xaf, 0x6c, 0x72, 0x79, 0x65, 0x93, 0x9f, 0x57, 0x36, 0xf9, 0x5c, 0xf2, 0xf9, 0xd2, 0xad, 0x9c, 0x5f, 0xba, 0x95, 0x6f, 0x97, 0x6e, 0xe5, 0xbd, 0x33, 0xeb,
0x7a, 0x6d, 0x97, 0x2e, 0xaf, 0xed, 0xd2, 0x8f, 0x6b, 0xbb, 0xf4, 0xc1, 0x5a, 0xf4, 0x79, 0x3c, 0xb3, 0xb8, 0x5b, 0xd3, 0x7f, 0x4f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x62, 0x07, 0x7c, 0x8d,
0xa8, 0xa8, 0xbf, 0x67, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x21, 0x21, 0x57, 0x7a, 0x41, 0x05, 0x39, 0x05, 0x00, 0x00,
0x00, 0x00,
} }
func (m *Log) Marshal() (dAtA []byte, err error) { func (m *Log) Marshal() (dAtA []byte, err error) {
@ -694,13 +686,6 @@ func (m *Log) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x1a dAtA[i] = 0x1a
} }
} }
if len(m.Payload) > 0 {
i -= len(m.Payload)
copy(dAtA[i:], m.Payload)
i = encodeVarintConsensus(dAtA, i, uint64(len(m.Payload)))
i--
dAtA[i] = 0x12
}
if len(m.Id) > 0 { if len(m.Id) > 0 {
i -= len(m.Id) i -= len(m.Id)
copy(dAtA[i:], m.Id) copy(dAtA[i:], m.Id)
@ -891,9 +876,9 @@ func (m *LogAddRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i _ = i
var l int var l int
_ = l _ = l
if m.Log != nil { if m.Record != nil {
{ {
size, err := m.Log.MarshalToSizedBuffer(dAtA[:i]) size, err := m.Record.MarshalToSizedBuffer(dAtA[:i])
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -1094,10 +1079,6 @@ func (m *Log) Size() (n int) {
if l > 0 { if l > 0 {
n += 1 + l + sovConsensus(uint64(l)) n += 1 + l + sovConsensus(uint64(l))
} }
l = len(m.Payload)
if l > 0 {
n += 1 + l + sovConsensus(uint64(l))
}
if len(m.Records) > 0 { if len(m.Records) > 0 {
for _, e := range m.Records { for _, e := range m.Records {
l = e.Size() l = e.Size()
@ -1188,8 +1169,8 @@ func (m *LogAddRequest) Size() (n int) {
} }
var l int var l int
_ = l _ = l
if m.Log != nil { if m.Record != nil {
l = m.Log.Size() l = m.Record.Size()
n += 1 + l + sovConsensus(uint64(l)) n += 1 + l + sovConsensus(uint64(l))
} }
return n return n
@ -1335,40 +1316,6 @@ func (m *Log) Unmarshal(dAtA []byte) error {
} }
m.Id = string(dAtA[iNdEx:postIndex]) m.Id = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex iNdEx = postIndex
case 2:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Payload", wireType)
}
var byteLen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowConsensus
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
byteLen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if byteLen < 0 {
return ErrInvalidLengthConsensus
}
postIndex := iNdEx + byteLen
if postIndex < 0 {
return ErrInvalidLengthConsensus
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.Payload = append(m.Payload[:0], dAtA[iNdEx:postIndex]...)
if m.Payload == nil {
m.Payload = []byte{}
}
iNdEx = postIndex
case 3: case 3:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Records", wireType) return fmt.Errorf("proto: wrong wireType = %d for field Records", wireType)
@ -1976,7 +1923,7 @@ func (m *LogAddRequest) Unmarshal(dAtA []byte) error {
switch fieldNum { switch fieldNum {
case 1: case 1:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Log", wireType) return fmt.Errorf("proto: wrong wireType = %d for field Record", wireType)
} }
var msglen int var msglen int
for shift := uint(0); ; shift += 7 { for shift := uint(0); ; shift += 7 {
@ -2003,10 +1950,10 @@ func (m *LogAddRequest) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if m.Log == nil { if m.Record == nil {
m.Log = &Log{} m.Record = &RawRecordWithId{}
} }
if err := m.Log.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Record.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex

4
consensus/consensusproto/protos/consensus.proto
View File

@ -15,7 +15,6 @@ enum ErrCodes {
message Log { message Log {
string id = 1; string id = 1;
bytes payload = 2;
repeated RawRecordWithId records = 3; repeated RawRecordWithId records = 3;
} }
@ -54,7 +53,8 @@ service Consensus {
message Ok {} message Ok {}
message LogAddRequest { message LogAddRequest {
Log log = 1; // first record in the log, consensus node not sign it
RawRecordWithId record = 1;
} }
message RecordAddRequest { message RecordAddRequest {