Skip to content

M
mybee
Commit d0f578de authored by Petar Radovic's avatar Petar Radovic
Browse files
Options

rename SynPlusAck -> SynAck

parent 0a053f9e
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
pkg/p2p/libp2p/internal/handshake/handshake.go
View file @ d0f578de
...@@ -36,7 +36,7 @@ func New(overlay swarm.Address, networkID int32, logger logging.Logger) *Service ...@@ -36,7 +36,7 @@ func New(overlay swarm.Address, networkID int32, logger logging.Logger) *Service
func (s *Service) Handshake(stream p2p.Stream) (i *Info, err error) { func (s *Service) Handshake(stream p2p.Stream) (i *Info, err error) {
w, r := protobuf.NewWriterAndReader(stream) w, r := protobuf.NewWriterAndReader(stream)
var resp pb.SynPlusAck var resp pb.SynAck
if err := w.WriteMsg(&pb.Syn{ if err := w.WriteMsg(&pb.Syn{
Address: s.overlay.Bytes(), Address: s.overlay.Bytes(),
NetworkID: s.networkID, NetworkID: s.networkID,
...@@ -72,7 +72,7 @@ func (s *Service) Handle(stream p2p.Stream) (i *Info, err error) { ...@@ -72,7 +72,7 @@ func (s *Service) Handle(stream p2p.Stream) (i *Info, err error) {
return nil, fmt.Errorf("read message: %w", err) return nil, fmt.Errorf("read message: %w", err)
} }
if err := w.WriteMsg(&pb.SynPlusAck{ if err := w.WriteMsg(&pb.SynAck{
Syn: &pb.Syn{ Syn: &pb.Syn{
Address: s.overlay.Bytes(), Address: s.overlay.Bytes(),
NetworkID: s.networkID, NetworkID: s.networkID,
......
pkg/p2p/libp2p/internal/handshake/handshake_test.go
View file @ d0f578de
...@@ -41,7 +41,7 @@ func TestHandshake(t *testing.T) { ...@@ -41,7 +41,7 @@ func TestHandshake(t *testing.T) {
stream2 := mock.NewStream(&buffer2, &buffer1) stream2 := mock.NewStream(&buffer2, &buffer1)
w, r := protobuf.NewWriterAndReader(stream2) w, r := protobuf.NewWriterAndReader(stream2)
if err := w.WriteMsg(&pb.SynPlusAck{ if err := w.WriteMsg(&pb.SynAck{
Syn: &pb.Syn{ Syn: &pb.Syn{
Address: expectedInfo.Address.Bytes(), Address: expectedInfo.Address.Bytes(),
NetworkID: expectedInfo.NetworkID, NetworkID: expectedInfo.NetworkID,
...@@ -110,7 +110,7 @@ func TestHandshake(t *testing.T) { ...@@ -110,7 +110,7 @@ func TestHandshake(t *testing.T) {
stream2 := mock.NewStream(&buffer2, &buffer1) stream2 := mock.NewStream(&buffer2, &buffer1)
w, _ := protobuf.NewWriterAndReader(stream2) w, _ := protobuf.NewWriterAndReader(stream2)
if err := w.WriteMsg(&pb.SynPlusAck{ if err := w.WriteMsg(&pb.SynAck{
Syn: &pb.Syn{ Syn: &pb.Syn{
Address: expectedInfo.Address.Bytes(), Address: expectedInfo.Address.Bytes(),
NetworkID: expectedInfo.NetworkID, NetworkID: expectedInfo.NetworkID,
...@@ -177,7 +177,7 @@ func TestHandle(t *testing.T) { ...@@ -177,7 +177,7 @@ func TestHandle(t *testing.T) {
testInfo(t, *res, node2Info) testInfo(t, *res, node2Info)
_, r := protobuf.NewWriterAndReader(stream2) _, r := protobuf.NewWriterAndReader(stream2)
var got pb.SynPlusAck var got pb.SynAck
if err := r.ReadMsg(&got); err != nil { if err := r.ReadMsg(&got); err != nil {
t.Fatal(err) t.Fatal(err)
} }
......
pkg/p2p/libp2p/internal/handshake/pb/handshake.pb.go
View file @ d0f578de
...@@ -82,23 +82,23 @@ func (m *Syn) GetLight() bool { ...@@ -82,23 +82,23 @@ func (m *Syn) GetLight() bool {
return false return false
} }
type SynPlusAck struct { type SynAck struct {
Syn *Syn `protobuf:"bytes,1,opt,name=Syn,proto3" json:"Syn,omitempty"` Syn *Syn `protobuf:"bytes,1,opt,name=Syn,proto3" json:"Syn,omitempty"`
Ack *Ack `protobuf:"bytes,2,opt,name=Ack,proto3" json:"Ack,omitempty"` Ack *Ack `protobuf:"bytes,2,opt,name=Ack,proto3" json:"Ack,omitempty"`
} }
func (m *SynPlusAck) Reset() { *m = SynPlusAck{} } func (m *SynAck) Reset() { *m = SynAck{} }
func (m *SynPlusAck) String() string { return proto.CompactTextString(m) } func (m *SynAck) String() string { return proto.CompactTextString(m) }
func (*SynPlusAck) ProtoMessage() {} func (*SynAck) ProtoMessage() {}
func (*SynPlusAck) Descriptor() ([]byte, []int) { func (*SynAck) Descriptor() ([]byte, []int) {
return fileDescriptor_a77305914d5d202f, []int{1} return fileDescriptor_a77305914d5d202f, []int{1}
} }
func (m *SynPlusAck) XXX_Unmarshal(b []byte) error { func (m *SynAck) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
} }
func (m *SynPlusAck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { func (m *SynAck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic { if deterministic {
return xxx_messageInfo_SynPlusAck.Marshal(b, m, deterministic) return xxx_messageInfo_SynAck.Marshal(b, m, deterministic)
} else { } else {
b = b[:cap(b)] b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b) n, err := m.MarshalToSizedBuffer(b)
...@@ -108,26 +108,26 @@ func (m *SynPlusAck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { ...@@ -108,26 +108,26 @@ func (m *SynPlusAck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
return b[:n], nil return b[:n], nil
} }
} }
func (m *SynPlusAck) XXX_Merge(src proto.Message) { func (m *SynAck) XXX_Merge(src proto.Message) {
xxx_messageInfo_SynPlusAck.Merge(m, src) xxx_messageInfo_SynAck.Merge(m, src)
} }
func (m *SynPlusAck) XXX_Size() int { func (m *SynAck) XXX_Size() int {
return m.Size() return m.Size()
} }
func (m *SynPlusAck) XXX_DiscardUnknown() { func (m *SynAck) XXX_DiscardUnknown() {
xxx_messageInfo_SynPlusAck.DiscardUnknown(m) xxx_messageInfo_SynAck.DiscardUnknown(m)
} }
var xxx_messageInfo_SynPlusAck proto.InternalMessageInfo var xxx_messageInfo_SynAck proto.InternalMessageInfo
func (m *SynPlusAck) GetSyn() *Syn { func (m *SynAck) GetSyn() *Syn {
if m != nil { if m != nil {
return m.Syn return m.Syn
} }
return nil return nil
} }
func (m *SynPlusAck) GetAck() *Ack { func (m *SynAck) GetAck() *Ack {
if m != nil { if m != nil {
return m.Ack return m.Ack
} }
...@@ -180,27 +180,27 @@ func (m *Ack) GetAddress() []byte { ...@@ -180,27 +180,27 @@ func (m *Ack) GetAddress() []byte {
func init() { func init() {
proto.RegisterType((*Syn)(nil), "pb.Syn") proto.RegisterType((*Syn)(nil), "pb.Syn")
proto.RegisterType((*SynPlusAck)(nil), "pb.SynPlusAck") proto.RegisterType((*SynAck)(nil), "pb.SynAck")
proto.RegisterType((*Ack)(nil), "pb.Ack") proto.RegisterType((*Ack)(nil), "pb.Ack")
} }
func init() { proto.RegisterFile("handshake.proto", fileDescriptor_a77305914d5d202f) } func init() { proto.RegisterFile("handshake.proto", fileDescriptor_a77305914d5d202f) }
var fileDescriptor_a77305914d5d202f = []byte{ var fileDescriptor_a77305914d5d202f = []byte{
// 200 bytes of a gzipped FileDescriptorProto // 196 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcf, 0x48, 0xcc, 0x4b, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcf, 0x48, 0xcc, 0x4b,
0x29, 0xce, 0x48, 0xcc, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0x29, 0xce, 0x48, 0xcc, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52,
0x0a, 0xe6, 0x62, 0x0e, 0xae, 0xcc, 0x13, 0x92, 0xe0, 0x62, 0x77, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x0a, 0xe6, 0x62, 0x0e, 0xae, 0xcc, 0x13, 0x92, 0xe0, 0x62, 0x77, 0x4c, 0x49, 0x29, 0x4a, 0x2d,
0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x82, 0x71, 0x85, 0x64, 0xb8, 0x38, 0xfd, 0x52, 0x2e, 0x96, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x82, 0x71, 0x85, 0x64, 0xb8, 0x38, 0xfd, 0x52,
0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0x3d, 0x5d, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x83, 0x10, 0x02, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0x3d, 0x5d, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x83, 0x10, 0x02,
0x42, 0x22, 0x5c, 0xac, 0x3e, 0x99, 0xe9, 0x19, 0x25, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0x1c, 0x41, 0x42, 0x22, 0x5c, 0xac, 0x3e, 0x99, 0xe9, 0x19, 0x25, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0x1c, 0x41,
0x10, 0x8e, 0x92, 0x13, 0x17, 0x57, 0x70, 0x65, 0x5e, 0x40, 0x4e, 0x69, 0xb1, 0x63, 0x72, 0xb6, 0x10, 0x8e, 0x92, 0x1d, 0x17, 0x5b, 0x70, 0x65, 0x9e, 0x63, 0x72, 0xb6, 0x90, 0x24, 0xd8, 0x78,
0x90, 0x24, 0xd8, 0x0a, 0xb0, 0xb9, 0xdc, 0x46, 0xec, 0x7a, 0x05, 0x49, 0x7a, 0xc1, 0x95, 0x79, 0xb0, 0x99, 0xdc, 0x46, 0xec, 0x7a, 0x05, 0x49, 0x7a, 0xc1, 0x95, 0x79, 0x41, 0x60, 0x2b, 0x25,
0x41, 0x60, 0x6b, 0x25, 0xb9, 0x98, 0x1d, 0x93, 0xb3, 0xc1, 0xc6, 0x42, 0xa5, 0x1c, 0x93, 0xb3, 0xb9, 0x98, 0x1d, 0x93, 0xb3, 0xc1, 0x46, 0x42, 0xa5, 0x1c, 0x93, 0xb3, 0x83, 0x40, 0x62, 0x4a,
0x83, 0x40, 0x62, 0x4a, 0xf2, 0x60, 0x29, 0xdc, 0x0e, 0x73, 0x92, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xf2, 0x60, 0x29, 0xdc, 0x8e, 0x72, 0x92, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6,
0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39,
0xe1, 0xc6, 0x63, 0x39, 0x86, 0x24, 0x36, 0xb0, 0xf7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x86, 0x24, 0x36, 0xb0, 0xd7, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xac, 0x8b, 0xa0, 0x7f,
0x1b, 0xbc, 0x78, 0x5e, 0xf1, 0x00, 0x00, 0x00, 0xed, 0x00, 0x00, 0x00,
} }
func (m *Syn) Marshal() (dAtA []byte, err error) { func (m *Syn) Marshal() (dAtA []byte, err error) {
...@@ -248,7 +248,7 @@ func (m *Syn) MarshalToSizedBuffer(dAtA []byte) (int, error) { ...@@ -248,7 +248,7 @@ func (m *Syn) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil return len(dAtA) - i, nil
} }
func (m *SynPlusAck) Marshal() (dAtA []byte, err error) { func (m *SynAck) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size]) n, err := m.MarshalToSizedBuffer(dAtA[:size])
...@@ -258,12 +258,12 @@ func (m *SynPlusAck) Marshal() (dAtA []byte, err error) { ...@@ -258,12 +258,12 @@ func (m *SynPlusAck) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil return dAtA[:n], nil
} }
func (m *SynPlusAck) MarshalTo(dAtA []byte) (int, error) { func (m *SynAck) MarshalTo(dAtA []byte) (int, error) {
size := m.Size() size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size]) return m.MarshalToSizedBuffer(dAtA[:size])
} }
func (m *SynPlusAck) MarshalToSizedBuffer(dAtA []byte) (int, error) { func (m *SynAck) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA) i := len(dAtA)
_ = i _ = i
var l int var l int
...@@ -355,7 +355,7 @@ func (m *Syn) Size() (n int) { ...@@ -355,7 +355,7 @@ func (m *Syn) Size() (n int) {
return n return n
} }
func (m *SynPlusAck) Size() (n int) { func (m *SynAck) Size() (n int) {
if m == nil { if m == nil {
return 0 return 0
} }
...@@ -517,7 +517,7 @@ func (m *Syn) Unmarshal(dAtA []byte) error { ...@@ -517,7 +517,7 @@ func (m *Syn) Unmarshal(dAtA []byte) error {
} }
return nil return nil
} }
func (m *SynPlusAck) Unmarshal(dAtA []byte) error { func (m *SynAck) Unmarshal(dAtA []byte) error {
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
for iNdEx < l { for iNdEx < l {
...@@ -540,10 +540,10 @@ func (m *SynPlusAck) Unmarshal(dAtA []byte) error { ...@@ -540,10 +540,10 @@ func (m *SynPlusAck) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3) fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7) wireType := int(wire & 0x7)
if wireType == 4 { if wireType == 4 {
return fmt.Errorf("proto: SynPlusAck: wiretype end group for non-group") return fmt.Errorf("proto: SynAck: wiretype end group for non-group")
} }
if fieldNum <= 0 { if fieldNum <= 0 {
return fmt.Errorf("proto: SynPlusAck: illegal tag %d (wire type %d)", fieldNum, wire) return fmt.Errorf("proto: SynAck: illegal tag %d (wire type %d)", fieldNum, wire)
} }
switch fieldNum { switch fieldNum {
case 1: case 1:
......
pkg/p2p/libp2p/internal/handshake/pb/handshake.proto
View file @ d0f578de
...@@ -11,7 +11,7 @@ message Syn { ...@@ -11,7 +11,7 @@ message Syn {
bool Light = 3; bool Light = 3;
} }
message SynPlusAck { message SynAck {
Syn Syn = 1; Syn Syn = 1;
Ack Ack = 2; Ack Ack = 2;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment