libp2p/go-libp2p-core
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p-core.git synced 2025-04-02 13:50:11 +08:00
Code Issues Projects Releases Wiki Activity

use proto3 for routing records

Browse Source
This commit is contained in:
Yusef Napora 2019-11-15 12:05:59 -05:00
parent 9cc8ee1b44
commit 52cd6ac767
3 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
routing/pb/routing_state.pb.go
View File

@ -5,7 +5,6 @@ package routing_pb
import ( import (
fmt "fmt" fmt "fmt"
github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
proto "github.com/gogo/protobuf/proto" proto "github.com/gogo/protobuf/proto"
io "io" io "io"
math "math" math "math"
@ -23,9 +22,9 @@ var _ = math.Inf
const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
type RoutingStateRecord struct { type RoutingStateRecord struct {
PeerId []byte `protobuf:"bytes,1,req,name=peerId" json:"peerId"` PeerId []byte `protobuf:"bytes,1,opt,name=peer_id,json=peerId,proto3" json:"peer_id,omitempty"`
Seq uint64 `protobuf:"varint,2,req,name=seq" json:"seq"` Seq uint64 `protobuf:"varint,2,opt,name=seq,proto3" json:"seq,omitempty"`
Addresses []*RoutingStateRecord_AddressInfo `protobuf:"bytes,3,rep,name=addresses" json:"addresses,omitempty"` Addresses []*RoutingStateRecord_AddressInfo `protobuf:"bytes,3,rep,name=addresses,proto3" json:"addresses,omitempty"`
} }
func (m *RoutingStateRecord) Reset() { *m = RoutingStateRecord{} } func (m *RoutingStateRecord) Reset() { *m = RoutingStateRecord{} }
@ -83,7 +82,7 @@ func (m *RoutingStateRecord) GetAddresses() []*RoutingStateRecord_AddressInfo {
} }
type RoutingStateRecord_AddressInfo struct { type RoutingStateRecord_AddressInfo struct {
Multiaddr []byte `protobuf:"bytes,1,req,name=multiaddr" json:"multiaddr"` Multiaddr []byte `protobuf:"bytes,1,opt,name=multiaddr,proto3" json:"multiaddr,omitempty"`
} }
func (m *RoutingStateRecord_AddressInfo) Reset() { *m = RoutingStateRecord_AddressInfo{} } func (m *RoutingStateRecord_AddressInfo) Reset() { *m = RoutingStateRecord_AddressInfo{} }
@ -134,20 +133,20 @@ func init() {
func init() { proto.RegisterFile("routing_state.proto", fileDescriptor_2bc7f62bc26d3acc) } func init() { proto.RegisterFile("routing_state.proto", fileDescriptor_2bc7f62bc26d3acc) }
var fileDescriptor_2bc7f62bc26d3acc = []byte{ var fileDescriptor_2bc7f62bc26d3acc = []byte{
// 198 bytes of a gzipped FileDescriptorProto // 200 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0xca, 0x2f, 0x2d, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0xca, 0x2f, 0x2d,
0xc9, 0xcc, 0x4b, 0x8f, 0x2f, 0x2e, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xc9, 0xcc, 0x4b, 0x8f, 0x2f, 0x2e, 0x49, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
0xe2, 0x82, 0x0a, 0xea, 0x15, 0x24, 0x29, 0x1d, 0x67, 0xe4, 0x12, 0x0a, 0x82, 0x70, 0x83, 0x41, 0xe2, 0x82, 0x0a, 0xea, 0x15, 0x24, 0x29, 0x6d, 0x63, 0xe4, 0x12, 0x0a, 0x82, 0x70, 0x83, 0x41,
0x4a, 0x82, 0x52, 0x93, 0xf3, 0x8b, 0x52, 0x84, 0x64, 0xb8, 0xd8, 0x0a, 0x52, 0x53, 0x8b, 0x3c, 0x4a, 0x82, 0x52, 0x93, 0xf3, 0x8b, 0x52, 0x84, 0xc4, 0xb9, 0xd8, 0x0b, 0x52, 0x53, 0x8b, 0xe2,
0x53, 0x24, 0x18, 0x15, 0x98, 0x34, 0x78, 0x9c, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0x8a, 0x33, 0x53, 0x24, 0x18, 0x15, 0x18, 0x35, 0x78, 0x82, 0xd8, 0x40, 0x5c, 0xcf, 0x14, 0x21, 0x01,
0x09, 0x89, 0x71, 0x31, 0x17, 0xa7, 0x16, 0x4a, 0x30, 0x29, 0x30, 0x69, 0xb0, 0x40, 0xa5, 0x40, 0x2e, 0xe6, 0xe2, 0xd4, 0x42, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x96, 0x20, 0x10, 0x53, 0xc8, 0x83,
0x02, 0x42, 0x1e, 0x5c, 0x9c, 0x89, 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0xa9, 0xc5, 0x12, 0xcc, 0x8b, 0x33, 0x31, 0x25, 0xa5, 0x28, 0xb5, 0xb8, 0x38, 0xb5, 0x58, 0x82, 0x59, 0x81, 0x59, 0x83,
0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x5a, 0x7a, 0x08, 0xcb, 0xf4, 0x30, 0x2d, 0xd2, 0x73, 0x84, 0xa8, 0xdb, 0x48, 0x4b, 0x0f, 0x61, 0x83, 0x1e, 0xa6, 0xe9, 0x7a, 0x8e, 0x10, 0xf5, 0x9e, 0x79, 0x69,
0xf7, 0xcc, 0x4b, 0xcb, 0x0f, 0x42, 0x68, 0x96, 0x32, 0xe4, 0xe2, 0x46, 0x92, 0x11, 0x52, 0xe2, 0xf9, 0x41, 0x08, 0xcd, 0x52, 0xda, 0x5c, 0xdc, 0x48, 0x32, 0x42, 0x32, 0x5c, 0x9c, 0xb9, 0xa5,
0xe2, 0xcc, 0x2d, 0xcd, 0x29, 0xc9, 0x04, 0x29, 0x40, 0x71, 0x11, 0x42, 0xd8, 0x49, 0xe2, 0xc4, 0x39, 0x25, 0x99, 0x20, 0x05, 0x50, 0x57, 0x20, 0x04, 0x9c, 0x24, 0x4e, 0x3c, 0x92, 0x63, 0xbc,
0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63,
0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0x00, 0x01, 0x00, 0x00, 0xff, 0xff, 0x13, 0x14, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x89, 0x0d, 0xec, 0x4b, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff,
0xbe, 0xc4, 0x05, 0x01, 0x00, 0x00, 0xdc, 0xd5, 0x32, 0xa1, 0xfc, 0x00, 0x00, 0x00,
} }
func (m *RoutingStateRecord) Marshal() (dAtA []byte, err error) { func (m *RoutingStateRecord) Marshal() (dAtA []byte, err error) {
@ -165,15 +164,17 @@ func (m *RoutingStateRecord) MarshalTo(dAtA []byte) (int, error) {
_ = i _ = i
var l int var l int
_ = l _ = l
if m.PeerId != nil { if len(m.PeerId) > 0 {
dAtA[i] = 0xa dAtA[i] = 0xa
i++ i++
i = encodeVarintRoutingState(dAtA, i, uint64(len(m.PeerId))) i = encodeVarintRoutingState(dAtA, i, uint64(len(m.PeerId)))
i += copy(dAtA[i:], m.PeerId) i += copy(dAtA[i:], m.PeerId)
} }
dAtA[i] = 0x10 if m.Seq != 0 {
i++ dAtA[i] = 0x10
i = encodeVarintRoutingState(dAtA, i, uint64(m.Seq)) i++
i = encodeVarintRoutingState(dAtA, i, uint64(m.Seq))
}
if len(m.Addresses) > 0 { if len(m.Addresses) > 0 {
for _, msg := range m.Addresses { for _, msg := range m.Addresses {
dAtA[i] = 0x1a dAtA[i] = 0x1a
@ -204,7 +205,7 @@ func (m *RoutingStateRecord_AddressInfo) MarshalTo(dAtA []byte) (int, error) {
_ = i _ = i
var l int var l int
_ = l _ = l
if m.Multiaddr != nil { if len(m.Multiaddr) > 0 {
dAtA[i] = 0xa dAtA[i] = 0xa
i++ i++
i = encodeVarintRoutingState(dAtA, i, uint64(len(m.Multiaddr))) i = encodeVarintRoutingState(dAtA, i, uint64(len(m.Multiaddr)))
@ -228,11 +229,13 @@ func (m *RoutingStateRecord) Size() (n int) {
} }
var l int var l int
_ = l _ = l
if m.PeerId != nil { l = len(m.PeerId)
l = len(m.PeerId) if l > 0 {
n += 1 + l + sovRoutingState(uint64(l)) n += 1 + l + sovRoutingState(uint64(l))
} }
n += 1 + sovRoutingState(uint64(m.Seq)) if m.Seq != 0 {
n += 1 + sovRoutingState(uint64(m.Seq))
}
if len(m.Addresses) > 0 { if len(m.Addresses) > 0 {
for _, e := range m.Addresses { for _, e := range m.Addresses {
l = e.Size() l = e.Size()
@ -248,8 +251,8 @@ func (m *RoutingStateRecord_AddressInfo) Size() (n int) {
} }
var l int var l int
_ = l _ = l
if m.Multiaddr != nil { l = len(m.Multiaddr)
l = len(m.Multiaddr) if l > 0 {
n += 1 + l + sovRoutingState(uint64(l)) n += 1 + l + sovRoutingState(uint64(l))
} }
return n return n
@ -269,7 +272,6 @@ func sozRoutingState(x uint64) (n int) {
return sovRoutingState(uint64((x << 1) ^ uint64((int64(x) >> 63)))) return sovRoutingState(uint64((x << 1) ^ uint64((int64(x) >> 63))))
} }
func (m *RoutingStateRecord) Unmarshal(dAtA []byte) error { func (m *RoutingStateRecord) Unmarshal(dAtA []byte) error {
var hasFields [1]uint64
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
for iNdEx < l { for iNdEx < l {
@ -332,7 +334,6 @@ func (m *RoutingStateRecord) Unmarshal(dAtA []byte) error {
m.PeerId = []byte{} m.PeerId = []byte{}
} }
iNdEx = postIndex iNdEx = postIndex
hasFields[0] |= uint64(0x00000001)
case 2: case 2:
if wireType != 0 { if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Seq", wireType) return fmt.Errorf("proto: wrong wireType = %d for field Seq", wireType)
@ -352,7 +353,6 @@ func (m *RoutingStateRecord) Unmarshal(dAtA []byte) error {
break break
} }
} }
hasFields[0] |= uint64(0x00000002)
case 3: case 3:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType) return fmt.Errorf("proto: wrong wireType = %d for field Addresses", wireType)
@ -405,12 +405,6 @@ func (m *RoutingStateRecord) Unmarshal(dAtA []byte) error {
iNdEx += skippy iNdEx += skippy
} }
} }
if hasFields[0]&uint64(0x00000001) == 0 {
return github_com_gogo_protobuf_proto.NewRequiredNotSetError("peerId")
}
if hasFields[0]&uint64(0x00000002) == 0 {
return github_com_gogo_protobuf_proto.NewRequiredNotSetError("seq")
}
if iNdEx > l { if iNdEx > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
@ -418,7 +412,6 @@ func (m *RoutingStateRecord) Unmarshal(dAtA []byte) error {
return nil return nil
} }
func (m *RoutingStateRecord_AddressInfo) Unmarshal(dAtA []byte) error { func (m *RoutingStateRecord_AddressInfo) Unmarshal(dAtA []byte) error {
var hasFields [1]uint64
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
for iNdEx < l { for iNdEx < l {
@ -481,7 +474,6 @@ func (m *RoutingStateRecord_AddressInfo) Unmarshal(dAtA []byte) error {
m.Multiaddr = []byte{} m.Multiaddr = []byte{}
} }
iNdEx = postIndex iNdEx = postIndex
hasFields[0] |= uint64(0x00000001)
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipRoutingState(dAtA[iNdEx:]) skippy, err := skipRoutingState(dAtA[iNdEx:])
@ -500,9 +492,6 @@ func (m *RoutingStateRecord_AddressInfo) Unmarshal(dAtA []byte) error {
iNdEx += skippy iNdEx += skippy
} }
} }
if hasFields[0]&uint64(0x00000001) == 0 {
return github_com_gogo_protobuf_proto.NewRequiredNotSetError("multiaddr")
}
if iNdEx > l { if iNdEx > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF

8
routing/pb/routing_state.proto
View File

@ -1,12 +1,12 @@
syntax = "proto2"; syntax = "proto3";
package routing.pb; package routing.pb;
message RoutingStateRecord { message RoutingStateRecord {
message AddressInfo { message AddressInfo {
required bytes multiaddr = 1; bytes multiaddr = 1;
} }
required bytes peerId = 1; bytes peer_id = 1;
required uint64 seq = 2; uint64 seq = 2;
repeated AddressInfo addresses = 3; repeated AddressInfo addresses = 3;
} }

5
routing/state.go
View File

@ -1,6 +1,7 @@
package routing package routing
import ( import (
"bytes"
"errors" "errors"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/crypto"
@ -15,7 +16,7 @@ const StateEnvelopeDomain = "libp2p-routing-state"
// The type hint used to identify routing state records in a SignedEnvelope. // The type hint used to identify routing state records in a SignedEnvelope.
// TODO: register multicodec // TODO: register multicodec
var StateEnvelopeTypeHint = []byte("/libp2p/routing-state-record") var StateEnvelopePayloadType = []byte("/libp2p/routing-state-record")
// AnnotatedAddr will extend the Multiaddr type with additional metadata, as // AnnotatedAddr will extend the Multiaddr type with additional metadata, as
// extensions are added to the routing state record spec. It's defined now to // extensions are added to the routing state record spec. It's defined now to
@ -96,7 +97,7 @@ func (s *RoutingState) ToSignedEnvelope(key crypto.PrivKey) (*crypto.SignedEnvel
if err != nil { if err != nil {
return nil, err return nil, err
} }
return crypto.MakeEnvelope(key, StateEnvelopeDomain, StateEnvelopeTypeHint, payload) return crypto.MakeEnvelope(key, StateEnvelopeDomain, StateEnvelopePayloadType, payload)
} }
// Marshal serializes a RoutingState record to protobuf and returns its byte representation. // Marshal serializes a RoutingState record to protobuf and returns its byte representation.