mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2024-12-23 11:57:18 +00:00
Remove Error Message Type (#3533)
* proto change * fix test * fix error resp
This commit is contained in:
Nishant Das
Raul Jordan
parent
4bc2d628b1
commit
44e5e5de65
@ -6,7 +6,6 @@ import (
|
||||
"io"
|
||||
|
||||
"github.com/prysmaticlabs/prysm/beacon-chain/p2p/encoder"
|
||||
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
|
||||
)
|
||||
|
||||
const genericError = "internal service error"
|
||||
@ -19,7 +18,7 @@ var responseCodeServerError = byte(0x02)
|
||||
|
||||
func (r *RegularSync) generateErrorResponse(code byte, reason string) ([]byte, error) {
|
||||
buf := bytes.NewBuffer([]byte{code})
|
||||
if _, err := r.p2p.Encoding().EncodeWithLength(buf, &pb.ErrorMessage{ErrorMessage: reason}); err != nil {
|
||||
if _, err := r.p2p.Encoding().EncodeWithLength(buf, []byte(reason)); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@ import (
|
||||
"testing"
|
||||
|
||||
p2ptest "github.com/prysmaticlabs/prysm/beacon-chain/p2p/testing"
|
||||
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
|
||||
)
|
||||
|
||||
func TestRegularSync_generateErrorResponse(t *testing.T) {
|
||||
@ -25,11 +24,11 @@ func TestRegularSync_generateErrorResponse(t *testing.T) {
|
||||
if b[0] != responseCodeServerError {
|
||||
t.Errorf("The first byte was not the status code. Got %#x wanted %#x", b, responseCodeServerError)
|
||||
}
|
||||
msg := &pb.ErrorMessage{}
|
||||
if err := r.p2p.Encoding().DecodeWithLength(buf, msg); err != nil {
|
||||
msg := make([]byte, 0)
|
||||
if err := r.p2p.Encoding().DecodeWithLength(buf, &msg); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if msg.ErrorMessage != "something bad happened" {
|
||||
if string(msg) != "something bad happened" {
|
||||
t.Errorf("Received the wrong message: %v", msg)
|
||||
}
|
||||
}
|
||||
|
||||
227
proto/beacon/p2p/v1/messages.pb.go
generated
227
proto/beacon/p2p/v1/messages.pb.go
generated
@ -173,88 +173,38 @@ func (m *BeaconBlocksByRangeRequest) GetStep() uint64 {
|
||||
return 0
|
||||
}
|
||||
|
||||
type ErrorMessage struct {
|
||||
ErrorMessage string `protobuf:"bytes,1,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
}
|
||||
|
||||
func (m *ErrorMessage) Reset() { *m = ErrorMessage{} }
|
||||
func (m *ErrorMessage) String() string { return proto.CompactTextString(m) }
|
||||
func (*ErrorMessage) ProtoMessage() {}
|
||||
func (*ErrorMessage) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_a1d590cda035b632, []int{2}
|
||||
}
|
||||
func (m *ErrorMessage) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
}
|
||||
func (m *ErrorMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||
if deterministic {
|
||||
return xxx_messageInfo_ErrorMessage.Marshal(b, m, deterministic)
|
||||
} else {
|
||||
b = b[:cap(b)]
|
||||
n, err := m.MarshalTo(b)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return b[:n], nil
|
||||
}
|
||||
}
|
||||
func (m *ErrorMessage) XXX_Merge(src proto.Message) {
|
||||
xxx_messageInfo_ErrorMessage.Merge(m, src)
|
||||
}
|
||||
func (m *ErrorMessage) XXX_Size() int {
|
||||
return m.Size()
|
||||
}
|
||||
func (m *ErrorMessage) XXX_DiscardUnknown() {
|
||||
xxx_messageInfo_ErrorMessage.DiscardUnknown(m)
|
||||
}
|
||||
|
||||
var xxx_messageInfo_ErrorMessage proto.InternalMessageInfo
|
||||
|
||||
func (m *ErrorMessage) GetErrorMessage() string {
|
||||
if m != nil {
|
||||
return m.ErrorMessage
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func init() {
|
||||
proto.RegisterType((*Status)(nil), "ethereum.beacon.p2p.v1.Status")
|
||||
proto.RegisterType((*BeaconBlocksByRangeRequest)(nil), "ethereum.beacon.p2p.v1.BeaconBlocksByRangeRequest")
|
||||
proto.RegisterType((*ErrorMessage)(nil), "ethereum.beacon.p2p.v1.ErrorMessage")
|
||||
}
|
||||
|
||||
func init() { proto.RegisterFile("proto/beacon/p2p/v1/messages.proto", fileDescriptor_a1d590cda035b632) }
|
||||
|
||||
var fileDescriptor_a1d590cda035b632 = []byte{
|
||||
// 395 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xb1, 0x8e, 0xd3, 0x40,
|
||||
0x10, 0x86, 0xb5, 0x87, 0xef, 0x44, 0x56, 0x0e, 0xc7, 0xad, 0x10, 0xb2, 0x0e, 0x91, 0x3b, 0x99,
|
||||
0x82, 0x6b, 0xce, 0x56, 0x12, 0x0a, 0x40, 0x54, 0x96, 0x42, 0x47, 0xb3, 0x91, 0x68, 0x2d, 0xdb,
|
||||
0x99, 0xd8, 0x56, 0x1c, 0x8f, 0xd9, 0x5d, 0x47, 0x22, 0x4f, 0xc3, 0xe3, 0x50, 0xf2, 0x04, 0x11,
|
||||
0xca, 0x23, 0xa4, 0xa0, 0x46, 0x3b, 0x1b, 0x11, 0x9a, 0x74, 0x3b, 0x3b, 0xdf, 0xfc, 0xff, 0xfe,
|
||||
0x1e, 0xf3, 0xb0, 0x53, 0x68, 0x30, 0xce, 0x21, 0x2b, 0xb0, 0x8d, 0xbb, 0x49, 0x17, 0x6f, 0xc6,
|
||||
0xf1, 0x1a, 0xb4, 0xce, 0x4a, 0xd0, 0x11, 0x35, 0xc5, 0x4b, 0x30, 0x15, 0x28, 0xe8, 0xd7, 0x91,
|
||||
0xc3, 0xa2, 0x6e, 0xd2, 0x45, 0x9b, 0xf1, 0xed, 0x63, 0x59, 0x9b, 0xaa, 0xcf, 0xa3, 0x02, 0xd7,
|
||||
0x71, 0x89, 0x25, 0xc6, 0x84, 0xe7, 0xfd, 0x92, 0x2a, 0x27, 0x6c, 0x4f, 0x4e, 0x26, 0xfc, 0xc3,
|
||||
0xf8, 0xd5, 0xdc, 0x64, 0xa6, 0xd7, 0xe2, 0x13, 0xbf, 0xa9, 0x20, 0x5b, 0xa4, 0x4b, 0x54, 0xab,
|
||||
0x74, 0x03, 0x4a, 0xd7, 0xd8, 0x06, 0xec, 0x9e, 0x3d, 0xf8, 0xc9, 0xf3, 0xc3, 0xee, 0xce, 0xd7,
|
||||
0x7a, 0xfb, 0xa8, 0xeb, 0x2d, 0x7c, 0x0c, 0xdf, 0x85, 0xf2, 0xda, 0xa2, 0x9f, 0x51, 0xad, 0xbe,
|
||||
0x3a, 0x50, 0xbc, 0xe7, 0xcf, 0x96, 0x75, 0x9b, 0x35, 0xf5, 0x16, 0x16, 0xa9, 0x42, 0x34, 0xc1,
|
||||
0x05, 0x8d, 0xde, 0x1c, 0x76, 0x77, 0xc3, 0xd3, 0xe8, 0x74, 0x12, 0xca, 0xe1, 0x3f, 0x50, 0x22,
|
||||
0x1a, 0xf1, 0x96, 0x5f, 0x9f, 0x26, 0xa1, 0xc3, 0xa2, 0x0a, 0x9e, 0xdc, 0xb3, 0x07, 0x4f, 0x9e,
|
||||
0x04, 0x67, 0xf6, 0x56, 0x44, 0x7c, 0x40, 0x0f, 0x24, 0x75, 0xef, 0x9c, 0xfa, 0x53, 0xcb, 0x90,
|
||||
0xf0, 0xab, 0x23, 0xaf, 0x1b, 0x34, 0xc1, 0x25, 0x49, 0x52, 0x73, 0xde, 0xa0, 0x09, 0x7f, 0x30,
|
||||
0x7e, 0x9b, 0xd0, 0x97, 0x4b, 0x1a, 0x2c, 0x56, 0x3a, 0xf9, 0x2e, 0xb3, 0xb6, 0x04, 0x09, 0xdf,
|
||||
0x7a, 0xd0, 0x46, 0x7c, 0xe0, 0x94, 0x30, 0xcd, 0x6d, 0xd3, 0x39, 0xb2, 0xb3, 0x79, 0x2c, 0x49,
|
||||
0x2a, 0x64, 0xfb, 0x9a, 0x73, 0x6d, 0x32, 0x65, 0x9c, 0xef, 0x05, 0xf9, 0x0e, 0xe8, 0xc6, 0x1a,
|
||||
0x8b, 0x17, 0xfc, 0xb2, 0xc0, 0xbe, 0x35, 0xc7, 0x90, 0xae, 0x10, 0x82, 0x7b, 0xda, 0x40, 0x47,
|
||||
0xb1, 0x3c, 0x49, 0xe7, 0x70, 0xca, 0xfd, 0x99, 0x52, 0xa8, 0xbe, 0xb8, 0xcd, 0x8b, 0x37, 0x7c,
|
||||
0x08, 0xb6, 0x4e, 0x8f, 0xbf, 0x02, 0xbd, 0x68, 0x20, 0x7d, 0xf8, 0x0f, 0x4a, 0xfc, 0x9f, 0xfb,
|
||||
0x11, 0xfb, 0xb5, 0x1f, 0xb1, 0xdf, 0xfb, 0x11, 0xcb, 0xaf, 0x68, 0xcb, 0xd3, 0xbf, 0x01, 0x00,
|
||||
0x00, 0xff, 0xff, 0xf5, 0x90, 0xf5, 0xec, 0x52, 0x02, 0x00, 0x00,
|
||||
// 365 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x6e, 0xb2, 0x40,
|
||||
0x10, 0xc7, 0xb3, 0x7e, 0x68, 0x3e, 0x37, 0xfa, 0xf9, 0xb9, 0x69, 0x1a, 0x62, 0x53, 0x35, 0x5c,
|
||||
0xea, 0x45, 0x88, 0xda, 0x43, 0xdb, 0xf4, 0x44, 0xd2, 0x3e, 0x00, 0x26, 0xbd, 0x12, 0xc0, 0x11,
|
||||
0x88, 0xc8, 0x50, 0x76, 0x31, 0xa9, 0x4f, 0xd3, 0xc7, 0xe9, 0xb1, 0x4f, 0x60, 0x1a, 0x1f, 0xc1,
|
||||
0x43, 0xcf, 0x0d, 0x83, 0xa9, 0x27, 0x6f, 0xbb, 0x33, 0xbf, 0xf9, 0xfd, 0x19, 0x96, 0x1b, 0x59,
|
||||
0x8e, 0x0a, 0x2d, 0x1f, 0xbc, 0x00, 0x53, 0x2b, 0x9b, 0x66, 0xd6, 0x66, 0x62, 0xad, 0x41, 0x4a,
|
||||
0x2f, 0x04, 0x69, 0x52, 0x53, 0x5c, 0x82, 0x8a, 0x20, 0x87, 0x62, 0x6d, 0x56, 0x98, 0x99, 0x4d,
|
||||
0x33, 0x73, 0x33, 0xe9, 0x8d, 0xc3, 0x58, 0x45, 0x85, 0x6f, 0x06, 0xb8, 0xb6, 0x42, 0x0c, 0xd1,
|
||||
0x22, 0xdc, 0x2f, 0x96, 0x74, 0xab, 0xc4, 0xe5, 0xa9, 0xd2, 0x18, 0xdf, 0x8c, 0x37, 0xe6, 0xca,
|
||||
0x53, 0x85, 0x14, 0x8f, 0xbc, 0x1b, 0x81, 0xb7, 0x70, 0x97, 0x98, 0xaf, 0xdc, 0x0d, 0xe4, 0x32,
|
||||
0xc6, 0x54, 0x67, 0x43, 0x36, 0x6a, 0xd9, 0xff, 0x0f, 0xbb, 0x41, 0x4b, 0xca, 0xed, 0x58, 0xc6,
|
||||
0x5b, 0x78, 0x30, 0x6e, 0x0d, 0xa7, 0x53, 0xa2, 0xcf, 0x98, 0xaf, 0x5e, 0x2a, 0x50, 0xdc, 0xf1,
|
||||
0x7f, 0xcb, 0x38, 0xf5, 0x92, 0x78, 0x0b, 0x0b, 0x37, 0x47, 0x54, 0x7a, 0x8d, 0x46, 0xbb, 0x87,
|
||||
0xdd, 0xa0, 0x7d, 0x1a, 0x9d, 0x4d, 0x0d, 0xa7, 0xfd, 0x0b, 0x3a, 0x88, 0x4a, 0xdc, 0xf0, 0xce,
|
||||
0x69, 0x12, 0x32, 0x0c, 0x22, 0xfd, 0xcf, 0x90, 0x8d, 0x34, 0xe7, 0x24, 0x7c, 0x2a, 0xab, 0xc2,
|
||||
0xe4, 0x4d, 0xfa, 0x40, 0xb2, 0x6b, 0xe7, 0xec, 0x7f, 0x4b, 0x86, 0xc4, 0x57, 0x47, 0x5e, 0x26,
|
||||
0xa8, 0xf4, 0x3a, 0x29, 0xa9, 0x39, 0x4f, 0x50, 0x19, 0xef, 0x8c, 0xf7, 0x6c, 0xfa, 0x73, 0x76,
|
||||
0x82, 0xc1, 0x4a, 0xda, 0x6f, 0x8e, 0x97, 0x86, 0xe0, 0xc0, 0x6b, 0x01, 0x52, 0x89, 0x7b, 0x4e,
|
||||
0x1b, 0xba, 0x7e, 0xd9, 0xac, 0x12, 0xd9, 0xd9, 0x7d, 0x4a, 0x92, 0x2c, 0x14, 0x7b, 0xcd, 0xb9,
|
||||
0x54, 0x5e, 0xae, 0xaa, 0xdc, 0x1a, 0xe5, 0x36, 0xa9, 0x52, 0x06, 0x8b, 0x0b, 0x5e, 0x0f, 0xb0,
|
||||
0x48, 0xd5, 0x71, 0xc9, 0xea, 0x22, 0x04, 0xd7, 0xa4, 0x82, 0x8c, 0xd6, 0xd2, 0x1c, 0x3a, 0xdb,
|
||||
0xad, 0x8f, 0x7d, 0x9f, 0x7d, 0xee, 0xfb, 0xec, 0x6b, 0xdf, 0x67, 0x7e, 0x83, 0x1e, 0x6c, 0xf6,
|
||||
0x13, 0x00, 0x00, 0xff, 0xff, 0x12, 0xe0, 0xa8, 0xc9, 0x1d, 0x02, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func (m *Status) Marshal() (dAtA []byte, err error) {
|
||||
@ -348,33 +298,6 @@ func (m *BeaconBlocksByRangeRequest) MarshalTo(dAtA []byte) (int, error) {
|
||||
return i, nil
|
||||
}
|
||||
|
||||
func (m *ErrorMessage) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
n, err := m.MarshalTo(dAtA)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return dAtA[:n], nil
|
||||
}
|
||||
|
||||
func (m *ErrorMessage) MarshalTo(dAtA []byte) (int, error) {
|
||||
var i int
|
||||
_ = i
|
||||
var l int
|
||||
_ = l
|
||||
if len(m.ErrorMessage) > 0 {
|
||||
dAtA[i] = 0xa
|
||||
i++
|
||||
i = encodeVarintMessages(dAtA, i, uint64(len(m.ErrorMessage)))
|
||||
i += copy(dAtA[i:], m.ErrorMessage)
|
||||
}
|
||||
if m.XXX_unrecognized != nil {
|
||||
i += copy(dAtA[i:], m.XXX_unrecognized)
|
||||
}
|
||||
return i, nil
|
||||
}
|
||||
|
||||
func encodeVarintMessages(dAtA []byte, offset int, v uint64) int {
|
||||
for v >= 1<<7 {
|
||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||
@ -439,22 +362,6 @@ func (m *BeaconBlocksByRangeRequest) Size() (n int) {
|
||||
return n
|
||||
}
|
||||
|
||||
func (m *ErrorMessage) Size() (n int) {
|
||||
if m == nil {
|
||||
return 0
|
||||
}
|
||||
var l int
|
||||
_ = l
|
||||
l = len(m.ErrorMessage)
|
||||
if l > 0 {
|
||||
n += 1 + l + sovMessages(uint64(l))
|
||||
}
|
||||
if m.XXX_unrecognized != nil {
|
||||
n += len(m.XXX_unrecognized)
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func sovMessages(x uint64) (n int) {
|
||||
for {
|
||||
n++
|
||||
@ -807,92 +714,6 @@ func (m *BeaconBlocksByRangeRequest) Unmarshal(dAtA []byte) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func (m *ErrorMessage) 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 ErrIntOverflowMessages
|
||||
}
|
||||
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: ErrorMessage: wiretype end group for non-group")
|
||||
}
|
||||
if fieldNum <= 0 {
|
||||
return fmt.Errorf("proto: ErrorMessage: illegal tag %d (wire type %d)", fieldNum, wire)
|
||||
}
|
||||
switch fieldNum {
|
||||
case 1:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field ErrorMessage", wireType)
|
||||
}
|
||||
var stringLen uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowMessages
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
stringLen |= uint64(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
intStringLen := int(stringLen)
|
||||
if intStringLen < 0 {
|
||||
return ErrInvalidLengthMessages
|
||||
}
|
||||
postIndex := iNdEx + intStringLen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthMessages
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.ErrorMessage = string(dAtA[iNdEx:postIndex])
|
||||
iNdEx = postIndex
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipMessages(dAtA[iNdEx:])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if skippy < 0 {
|
||||
return ErrInvalidLengthMessages
|
||||
}
|
||||
if (iNdEx + skippy) < 0 {
|
||||
return ErrInvalidLengthMessages
|
||||
}
|
||||
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 skipMessages(dAtA []byte) (n int, err error) {
|
||||
l := len(dAtA)
|
||||
iNdEx := 0
|
||||
|
||||
@ -18,7 +18,3 @@ message BeaconBlocksByRangeRequest {
|
||||
uint64 count = 3;
|
||||
uint64 step = 4;
|
||||
}
|
||||
|
||||
message ErrorMessage {
|
||||
string error_message = 1;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user