From 120d875e06f935acc57648229a8a94ff3731ea9b Mon Sep 17 00:00:00 2001 From: Bryan White Date: Mon, 3 Dec 2018 14:23:12 +0100 Subject: [PATCH] consolidate `NodeRep` and `NodeStats` (#744) * consolidate `NodeRep` and `NodeStats` * regenerate * review fixes * go travis --- go-travis.txt | 1 + pkg/pb/bandwidth.pb.go | 22 ++--- pkg/pb/datarepair.pb.go | 6 +- pkg/pb/inspector.pb.go | 46 +++++----- pkg/pb/meta.pb.go | 10 +- pkg/pb/node.pb.go | 156 ++++++++++---------------------- pkg/pb/node.proto | 10 +- pkg/pb/overlay.pb.go | 166 +++++++++++++++++----------------- pkg/pb/overlay.proto | 2 +- pkg/pb/piecestore.pb.go | 54 ++++++----- pkg/pb/pointerdb.pb.go | 54 ++++++----- pkg/pb/streams.pb.go | 10 +- pkg/statdb/proto/statdb.pb.go | 50 +++++----- 13 files changed, 254 insertions(+), 333 deletions(-) create mode 100644 go-travis.txt diff --git a/go-travis.txt b/go-travis.txt new file mode 100644 index 000000000..5bad255b4 --- /dev/null +++ b/go-travis.txt @@ -0,0 +1 @@ +go travis diff --git a/pkg/pb/bandwidth.pb.go b/pkg/pb/bandwidth.pb.go index e2b144d33..5247ca9c0 100644 --- a/pkg/pb/bandwidth.pb.go +++ b/pkg/pb/bandwidth.pb.go @@ -7,10 +7,8 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc "google.golang.org/grpc" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -43,7 +41,7 @@ func (x AgreementsSummary_Status) String() string { return proto.EnumName(AgreementsSummary_Status_name, int32(x)) } func (AgreementsSummary_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_bandwidth_01db992f91c47bae, []int{0, 0} + return fileDescriptor_bandwidth_acc7ad1b0a6a13c6, []int{0, 0} } type AgreementsSummary struct { @@ -57,7 +55,7 @@ func (m *AgreementsSummary) Reset() { *m = AgreementsSummary{} } func (m *AgreementsSummary) String() string { return proto.CompactTextString(m) } func (*AgreementsSummary) ProtoMessage() {} func (*AgreementsSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_bandwidth_01db992f91c47bae, []int{0} + return fileDescriptor_bandwidth_acc7ad1b0a6a13c6, []int{0} } func (m *AgreementsSummary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AgreementsSummary.Unmarshal(m, b) @@ -97,9 +95,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// BandwidthClient is the client API for Bandwidth service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for Bandwidth service + type BandwidthClient interface { BandwidthAgreements(ctx context.Context, in *RenterBandwidthAllocation, opts ...grpc.CallOption) (*AgreementsSummary, error) } @@ -121,7 +118,8 @@ func (c *bandwidthClient) BandwidthAgreements(ctx context.Context, in *RenterBan return out, nil } -// BandwidthServer is the server API for Bandwidth service. +// Server API for Bandwidth service + type BandwidthServer interface { BandwidthAgreements(context.Context, *RenterBandwidthAllocation) (*AgreementsSummary, error) } @@ -161,9 +159,9 @@ var _Bandwidth_serviceDesc = grpc.ServiceDesc{ Metadata: "bandwidth.proto", } -func init() { proto.RegisterFile("bandwidth.proto", fileDescriptor_bandwidth_01db992f91c47bae) } +func init() { proto.RegisterFile("bandwidth.proto", fileDescriptor_bandwidth_acc7ad1b0a6a13c6) } -var fileDescriptor_bandwidth_01db992f91c47bae = []byte{ +var fileDescriptor_bandwidth_acc7ad1b0a6a13c6 = []byte{ // 196 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4f, 0x4a, 0xcc, 0x4b, 0x29, 0xcf, 0x4c, 0x29, 0xc9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x84, 0x0b, 0x48, diff --git a/pkg/pb/datarepair.pb.go b/pkg/pb/datarepair.pb.go index 475c3b865..b63e26951 100644 --- a/pkg/pb/datarepair.pb.go +++ b/pkg/pb/datarepair.pb.go @@ -31,7 +31,7 @@ func (m *InjuredSegment) Reset() { *m = InjuredSegment{} } func (m *InjuredSegment) String() string { return proto.CompactTextString(m) } func (*InjuredSegment) ProtoMessage() {} func (*InjuredSegment) Descriptor() ([]byte, []int) { - return fileDescriptor_datarepair_13e4beab54f194bd, []int{0} + return fileDescriptor_datarepair_ed86aa1a63e3d6e4, []int{0} } func (m *InjuredSegment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InjuredSegment.Unmarshal(m, b) @@ -69,9 +69,9 @@ func init() { proto.RegisterType((*InjuredSegment)(nil), "repair.InjuredSegment") } -func init() { proto.RegisterFile("datarepair.proto", fileDescriptor_datarepair_13e4beab54f194bd) } +func init() { proto.RegisterFile("datarepair.proto", fileDescriptor_datarepair_ed86aa1a63e3d6e4) } -var fileDescriptor_datarepair_13e4beab54f194bd = []byte{ +var fileDescriptor_datarepair_ed86aa1a63e3d6e4 = []byte{ // 119 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x48, 0x49, 0x2c, 0x49, 0x2c, 0x4a, 0x2d, 0x48, 0xcc, 0x2c, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, diff --git a/pkg/pb/inspector.pb.go b/pkg/pb/inspector.pb.go index e3b055287..b5895a9b8 100644 --- a/pkg/pb/inspector.pb.go +++ b/pkg/pb/inspector.pb.go @@ -8,10 +8,8 @@ import fmt "fmt" import math "math" import _ "github.com/gogo/protobuf/gogoproto" -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc "google.golang.org/grpc" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -36,7 +34,7 @@ func (m *GetStatsRequest) Reset() { *m = GetStatsRequest{} } func (m *GetStatsRequest) String() string { return proto.CompactTextString(m) } func (*GetStatsRequest) ProtoMessage() {} func (*GetStatsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{0} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{0} } func (m *GetStatsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetStatsRequest.Unmarshal(m, b) @@ -69,7 +67,7 @@ func (m *GetStatsResponse) Reset() { *m = GetStatsResponse{} } func (m *GetStatsResponse) String() string { return proto.CompactTextString(m) } func (*GetStatsResponse) ProtoMessage() {} func (*GetStatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{1} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{1} } func (m *GetStatsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetStatsResponse.Unmarshal(m, b) @@ -126,7 +124,7 @@ func (m *CreateStatsRequest) Reset() { *m = CreateStatsRequest{} } func (m *CreateStatsRequest) String() string { return proto.CompactTextString(m) } func (*CreateStatsRequest) ProtoMessage() {} func (*CreateStatsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{2} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{2} } func (m *CreateStatsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateStatsRequest.Unmarshal(m, b) @@ -184,7 +182,7 @@ func (m *CreateStatsResponse) Reset() { *m = CreateStatsResponse{} } func (m *CreateStatsResponse) String() string { return proto.CompactTextString(m) } func (*CreateStatsResponse) ProtoMessage() {} func (*CreateStatsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{3} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{3} } func (m *CreateStatsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateStatsResponse.Unmarshal(m, b) @@ -217,7 +215,7 @@ func (m *CountNodesResponse) Reset() { *m = CountNodesResponse{} } func (m *CountNodesResponse) String() string { return proto.CompactTextString(m) } func (*CountNodesResponse) ProtoMessage() {} func (*CountNodesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{4} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{4} } func (m *CountNodesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CountNodesResponse.Unmarshal(m, b) @@ -261,7 +259,7 @@ func (m *CountNodesRequest) Reset() { *m = CountNodesRequest{} } func (m *CountNodesRequest) String() string { return proto.CompactTextString(m) } func (*CountNodesRequest) ProtoMessage() {} func (*CountNodesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{5} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{5} } func (m *CountNodesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CountNodesRequest.Unmarshal(m, b) @@ -292,7 +290,7 @@ func (m *GetBucketsRequest) Reset() { *m = GetBucketsRequest{} } func (m *GetBucketsRequest) String() string { return proto.CompactTextString(m) } func (*GetBucketsRequest) ProtoMessage() {} func (*GetBucketsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{6} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{6} } func (m *GetBucketsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBucketsRequest.Unmarshal(m, b) @@ -324,7 +322,7 @@ func (m *GetBucketsResponse) Reset() { *m = GetBucketsResponse{} } func (m *GetBucketsResponse) String() string { return proto.CompactTextString(m) } func (*GetBucketsResponse) ProtoMessage() {} func (*GetBucketsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{7} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{7} } func (m *GetBucketsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBucketsResponse.Unmarshal(m, b) @@ -363,7 +361,7 @@ func (m *GetBucketRequest) Reset() { *m = GetBucketRequest{} } func (m *GetBucketRequest) String() string { return proto.CompactTextString(m) } func (*GetBucketRequest) ProtoMessage() {} func (*GetBucketRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{8} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{8} } func (m *GetBucketRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBucketRequest.Unmarshal(m, b) @@ -395,7 +393,7 @@ func (m *GetBucketResponse) Reset() { *m = GetBucketResponse{} } func (m *GetBucketResponse) String() string { return proto.CompactTextString(m) } func (*GetBucketResponse) ProtoMessage() {} func (*GetBucketResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{9} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{9} } func (m *GetBucketResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetBucketResponse.Unmarshal(m, b) @@ -433,7 +431,7 @@ func (m *Bucket) Reset() { *m = Bucket{} } func (m *Bucket) String() string { return proto.CompactTextString(m) } func (*Bucket) ProtoMessage() {} func (*Bucket) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{10} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{10} } func (m *Bucket) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Bucket.Unmarshal(m, b) @@ -471,7 +469,7 @@ func (m *BucketList) Reset() { *m = BucketList{} } func (m *BucketList) String() string { return proto.CompactTextString(m) } func (*BucketList) ProtoMessage() {} func (*BucketList) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{11} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{11} } func (m *BucketList) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BucketList.Unmarshal(m, b) @@ -511,7 +509,7 @@ func (m *PingNodeRequest) Reset() { *m = PingNodeRequest{} } func (m *PingNodeRequest) String() string { return proto.CompactTextString(m) } func (*PingNodeRequest) ProtoMessage() {} func (*PingNodeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{12} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{12} } func (m *PingNodeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PingNodeRequest.Unmarshal(m, b) @@ -549,7 +547,7 @@ func (m *PingNodeResponse) Reset() { *m = PingNodeResponse{} } func (m *PingNodeResponse) String() string { return proto.CompactTextString(m) } func (*PingNodeResponse) ProtoMessage() {} func (*PingNodeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_inspector_4eea8e7f2bc78f51, []int{13} + return fileDescriptor_inspector_9ff12d18f09cf85c, []int{13} } func (m *PingNodeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PingNodeResponse.Unmarshal(m, b) @@ -601,9 +599,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// InspectorClient is the client API for Inspector service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for Inspector service + type InspectorClient interface { // Kad/Overlay commands: // CountNodes returns the number of nodes in the cache and in the routing table @@ -683,7 +680,8 @@ func (c *inspectorClient) CreateStats(ctx context.Context, in *CreateStatsReques return out, nil } -// InspectorServer is the server API for Inspector service. +// Server API for Inspector service + type InspectorServer interface { // Kad/Overlay commands: // CountNodes returns the number of nodes in the cache and in the routing table @@ -846,9 +844,9 @@ var _Inspector_serviceDesc = grpc.ServiceDesc{ Metadata: "inspector.proto", } -func init() { proto.RegisterFile("inspector.proto", fileDescriptor_inspector_4eea8e7f2bc78f51) } +func init() { proto.RegisterFile("inspector.proto", fileDescriptor_inspector_9ff12d18f09cf85c) } -var fileDescriptor_inspector_4eea8e7f2bc78f51 = []byte{ +var fileDescriptor_inspector_9ff12d18f09cf85c = []byte{ // 564 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x6e, 0x1a, 0x3f, 0x14, 0xc5, 0xff, 0x33, 0x13, 0x08, 0x5c, 0x50, 0x48, 0x4c, 0xfe, 0x12, 0x1a, 0x68, 0xa0, 0xde, diff --git a/pkg/pb/meta.pb.go b/pkg/pb/meta.pb.go index 41f9c23d1..e0b0dfc67 100644 --- a/pkg/pb/meta.pb.go +++ b/pkg/pb/meta.pb.go @@ -31,7 +31,7 @@ func (m *SerializableMeta) Reset() { *m = SerializableMeta{} } func (m *SerializableMeta) String() string { return proto.CompactTextString(m) } func (*SerializableMeta) ProtoMessage() {} func (*SerializableMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_meta_12afffbb4ed1a0bb, []int{0} + return fileDescriptor_meta_16703f2dafac4e74, []int{0} } func (m *SerializableMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SerializableMeta.Unmarshal(m, b) @@ -66,13 +66,13 @@ func (m *SerializableMeta) GetUserDefined() map[string]string { } func init() { - proto.RegisterType((*SerializableMeta)(nil), "pb.SerializableMeta") - proto.RegisterMapType((map[string]string)(nil), "pb.SerializableMeta.UserDefinedEntry") + proto.RegisterType((*SerializableMeta)(nil), "objects.SerializableMeta") + proto.RegisterMapType((map[string]string)(nil), "objects.SerializableMeta.UserDefinedEntry") } -func init() { proto.RegisterFile("meta.proto", fileDescriptor_meta_12afffbb4ed1a0bb) } +func init() { proto.RegisterFile("meta.proto", fileDescriptor_meta_16703f2dafac4e74) } -var fileDescriptor_meta_12afffbb4ed1a0bb = []byte{ +var fileDescriptor_meta_16703f2dafac4e74 = []byte{ // 191 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xca, 0x4d, 0x2d, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0xcf, 0x4f, 0xca, 0x4a, 0x4d, 0x2e, 0x29, 0x56, diff --git a/pkg/pb/node.pb.go b/pkg/pb/node.pb.go index 4113e343a..4974b194c 100644 --- a/pkg/pb/node.pb.go +++ b/pkg/pb/node.pb.go @@ -40,7 +40,7 @@ func (x NodeType) String() string { return proto.EnumName(NodeType_name, int32(x)) } func (NodeType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{0} + return fileDescriptor_node_a82e4b21780a1667, []int{0} } // NodeTransport is an enum of possible transports for the overlay network @@ -61,7 +61,7 @@ func (x NodeTransport) String() string { return proto.EnumName(NodeTransport_name, int32(x)) } func (NodeTransport) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{1} + return fileDescriptor_node_a82e4b21780a1667, []int{1} } // NodeRestrictions contains all relevant data about a nodes ability to store data @@ -77,7 +77,7 @@ func (m *NodeRestrictions) Reset() { *m = NodeRestrictions{} } func (m *NodeRestrictions) String() string { return proto.CompactTextString(m) } func (*NodeRestrictions) ProtoMessage() {} func (*NodeRestrictions) Descriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{0} + return fileDescriptor_node_a82e4b21780a1667, []int{0} } func (m *NodeRestrictions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NodeRestrictions.Unmarshal(m, b) @@ -134,7 +134,7 @@ func (m *Node) Reset() { *m = Node{} } func (m *Node) String() string { return proto.CompactTextString(m) } func (*Node) ProtoMessage() {} func (*Node) Descriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{1} + return fileDescriptor_node_a82e4b21780a1667, []int{1} } func (m *Node) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Node.Unmarshal(m, b) @@ -237,7 +237,7 @@ func (m *NodeAddress) Reset() { *m = NodeAddress{} } func (m *NodeAddress) String() string { return proto.CompactTextString(m) } func (*NodeAddress) ProtoMessage() {} func (*NodeAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{2} + return fileDescriptor_node_a82e4b21780a1667, []int{2} } func (m *NodeAddress) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NodeAddress.Unmarshal(m, b) @@ -271,7 +271,7 @@ func (m *NodeAddress) GetAddress() string { return "" } -// NodeStats is info about a single storagenode stored in the stats db +// NodeStats is the reputation characteristics of a node type NodeStats struct { NodeId NodeID `protobuf:"bytes,1,opt,name=node_id,json=nodeId,proto3,customtype=NodeID" json:"node_id"` Latency_90 int64 `protobuf:"varint,2,opt,name=latency_90,json=latency90,proto3" json:"latency_90,omitempty"` @@ -290,7 +290,7 @@ func (m *NodeStats) Reset() { *m = NodeStats{} } func (m *NodeStats) String() string { return proto.CompactTextString(m) } func (*NodeStats) ProtoMessage() {} func (*NodeStats) Descriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{3} + return fileDescriptor_node_a82e4b21780a1667, []int{3} } func (m *NodeStats) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NodeStats.Unmarshal(m, b) @@ -359,62 +359,6 @@ func (m *NodeStats) GetUptimeSuccessCount() int64 { return 0 } -// TODO: combine with `NodeStats` -// NodeRep is the reputation characteristics of a node -type NodeRep struct { - MinUptime float32 `protobuf:"fixed32,1,opt,name=min_uptime,json=minUptime,proto3" json:"min_uptime,omitempty"` - MinAuditSuccess float32 `protobuf:"fixed32,2,opt,name=min_audit_success,json=minAuditSuccess,proto3" json:"min_audit_success,omitempty"` - MinAuditCount int64 `protobuf:"varint,3,opt,name=min_audit_count,json=minAuditCount,proto3" json:"min_audit_count,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *NodeRep) Reset() { *m = NodeRep{} } -func (m *NodeRep) String() string { return proto.CompactTextString(m) } -func (*NodeRep) ProtoMessage() {} -func (*NodeRep) Descriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{4} -} -func (m *NodeRep) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_NodeRep.Unmarshal(m, b) -} -func (m *NodeRep) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_NodeRep.Marshal(b, m, deterministic) -} -func (dst *NodeRep) XXX_Merge(src proto.Message) { - xxx_messageInfo_NodeRep.Merge(dst, src) -} -func (m *NodeRep) XXX_Size() int { - return xxx_messageInfo_NodeRep.Size(m) -} -func (m *NodeRep) XXX_DiscardUnknown() { - xxx_messageInfo_NodeRep.DiscardUnknown(m) -} - -var xxx_messageInfo_NodeRep proto.InternalMessageInfo - -func (m *NodeRep) GetMinUptime() float32 { - if m != nil { - return m.MinUptime - } - return 0 -} - -func (m *NodeRep) GetMinAuditSuccess() float32 { - if m != nil { - return m.MinAuditSuccess - } - return 0 -} - -func (m *NodeRep) GetMinAuditCount() int64 { - if m != nil { - return m.MinAuditCount - } - return 0 -} - type NodeMetadata struct { Email string `protobuf:"bytes,1,opt,name=email,proto3" json:"email,omitempty"` Wallet string `protobuf:"bytes,2,opt,name=wallet,proto3" json:"wallet,omitempty"` @@ -427,7 +371,7 @@ func (m *NodeMetadata) Reset() { *m = NodeMetadata{} } func (m *NodeMetadata) String() string { return proto.CompactTextString(m) } func (*NodeMetadata) ProtoMessage() {} func (*NodeMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_node_a85419faa51872ac, []int{5} + return fileDescriptor_node_a82e4b21780a1667, []int{4} } func (m *NodeMetadata) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_NodeMetadata.Unmarshal(m, b) @@ -466,55 +410,51 @@ func init() { proto.RegisterType((*Node)(nil), "node.Node") proto.RegisterType((*NodeAddress)(nil), "node.NodeAddress") proto.RegisterType((*NodeStats)(nil), "node.NodeStats") - proto.RegisterType((*NodeRep)(nil), "node.NodeRep") proto.RegisterType((*NodeMetadata)(nil), "node.NodeMetadata") proto.RegisterEnum("node.NodeType", NodeType_name, NodeType_value) proto.RegisterEnum("node.NodeTransport", NodeTransport_name, NodeTransport_value) } -func init() { proto.RegisterFile("node.proto", fileDescriptor_node_a85419faa51872ac) } +func init() { proto.RegisterFile("node.proto", fileDescriptor_node_a82e4b21780a1667) } -var fileDescriptor_node_a85419faa51872ac = []byte{ - // 652 bytes of a gzipped FileDescriptorProto +var fileDescriptor_node_a82e4b21780a1667 = []byte{ + // 602 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x94, 0x4f, 0x4f, 0xdb, 0x4c, - 0x10, 0xc6, 0x89, 0xed, 0xfc, 0xf1, 0x38, 0x09, 0x61, 0x40, 0xc8, 0x7a, 0x5f, 0xb5, 0x04, 0xa3, - 0xb6, 0x11, 0x95, 0x22, 0x4a, 0x4f, 0x54, 0xbd, 0x04, 0xa8, 0x10, 0x12, 0x50, 0xb4, 0x09, 0x3d, - 0x70, 0xb1, 0x4c, 0xbc, 0xa5, 0x2b, 0x12, 0xdb, 0xb2, 0x37, 0x42, 0x91, 0xfa, 0xd9, 0x7a, 0xee, - 0xa1, 0x9f, 0xa0, 0x07, 0x3e, 0x4b, 0xb5, 0xb3, 0x36, 0xb1, 0x55, 0xf5, 0x96, 0x3c, 0xcf, 0xcf, - 0xcf, 0xec, 0xce, 0x8c, 0x0d, 0x10, 0xc5, 0x21, 0x1f, 0x26, 0x69, 0x2c, 0x63, 0xb4, 0xd4, 0xef, - 0xff, 0xe0, 0x3e, 0xbe, 0x8f, 0xb5, 0xe2, 0x7d, 0x81, 0xde, 0x55, 0x1c, 0x72, 0xc6, 0x33, 0x99, - 0x8a, 0xa9, 0x14, 0x71, 0x94, 0xe1, 0x2b, 0xe8, 0x7e, 0x4d, 0x39, 0xf7, 0xef, 0x82, 0x28, 0x7c, - 0x14, 0xa1, 0xfc, 0xe6, 0xd6, 0xfa, 0xb5, 0x81, 0xc9, 0x3a, 0x4a, 0x3d, 0x2e, 0x44, 0xfc, 0x1f, - 0x6c, 0xc2, 0x42, 0x91, 0x3d, 0xb8, 0x06, 0x11, 0x2d, 0x25, 0x9c, 0x8a, 0xec, 0xc1, 0xfb, 0x61, - 0x82, 0xa5, 0x82, 0xf1, 0x25, 0x18, 0x22, 0xa4, 0x80, 0xf6, 0x71, 0xf7, 0xe7, 0xd3, 0xce, 0xda, - 0xef, 0xa7, 0x9d, 0x86, 0x72, 0xce, 0x4f, 0x99, 0x21, 0x42, 0x7c, 0x0b, 0xcd, 0x20, 0x0c, 0x53, - 0x9e, 0x65, 0x94, 0xe1, 0x1c, 0x6e, 0x0c, 0xe9, 0xc0, 0x0a, 0x19, 0x69, 0x83, 0x15, 0x04, 0x7a, - 0x60, 0xc9, 0x65, 0xc2, 0x5d, 0xb3, 0x5f, 0x1b, 0x74, 0x0f, 0xbb, 0x2b, 0x72, 0xb2, 0x4c, 0x38, - 0x23, 0x0f, 0x3f, 0x40, 0x3b, 0x2d, 0xdd, 0xc6, 0xb5, 0x28, 0x75, 0x7b, 0xc5, 0x96, 0xef, 0xca, - 0x2a, 0x2c, 0x0e, 0xa1, 0x35, 0xe7, 0x32, 0x08, 0x03, 0x19, 0xb8, 0x75, 0x7a, 0x0e, 0x57, 0xcf, - 0x5d, 0xe6, 0x0e, 0x7b, 0x66, 0x70, 0x17, 0xda, 0xb3, 0x40, 0xf2, 0x68, 0xba, 0xf4, 0x67, 0x22, - 0x93, 0x6e, 0xa3, 0x6f, 0x0e, 0x4c, 0xe6, 0xe4, 0xda, 0x85, 0xc8, 0x24, 0xee, 0x41, 0x27, 0x58, - 0x84, 0x42, 0xfa, 0xd9, 0x62, 0x3a, 0x55, 0xb7, 0x6c, 0xf6, 0x6b, 0x83, 0x16, 0x6b, 0x93, 0x38, - 0xd6, 0x1a, 0x6e, 0x42, 0x5d, 0x64, 0xfe, 0x22, 0x71, 0x5b, 0x64, 0x5a, 0x22, 0xbb, 0x49, 0xd4, - 0x18, 0x16, 0x49, 0x18, 0x48, 0xee, 0xe7, 0x79, 0xae, 0x4d, 0x6e, 0x47, 0xab, 0x17, 0x5a, 0xc4, - 0x03, 0xd8, 0xca, 0xb1, 0x6a, 0x1d, 0x20, 0x18, 0xb5, 0x37, 0x2a, 0x57, 0xdb, 0x83, 0x3c, 0xc2, - 0x5f, 0x24, 0x52, 0xcc, 0xb9, 0xeb, 0xe8, 0x23, 0x69, 0xf1, 0x86, 0x34, 0xef, 0x16, 0x9c, 0xd2, - 0x08, 0xf0, 0x1d, 0xd8, 0x32, 0x0d, 0xa2, 0x2c, 0x89, 0x53, 0x49, 0xd3, 0xec, 0x1e, 0x6e, 0x96, - 0xda, 0x5f, 0x58, 0x6c, 0x45, 0xa1, 0x5b, 0x9d, 0xac, 0xfd, 0x3c, 0x46, 0xef, 0x97, 0x01, 0xb6, - 0x7a, 0x6c, 0x2c, 0x03, 0x99, 0xe1, 0x1b, 0x68, 0xaa, 0x20, 0xff, 0x9f, 0x6b, 0xd2, 0x50, 0xf6, - 0x79, 0x88, 0x2f, 0x00, 0x8a, 0x6e, 0x1f, 0x1d, 0xe4, 0x1b, 0x67, 0xe7, 0xca, 0xd1, 0x01, 0x0e, - 0x61, 0xb3, 0xd2, 0x01, 0x3f, 0x0d, 0xa4, 0x88, 0x69, 0x57, 0x6a, 0x6c, 0xa3, 0xdc, 0x6f, 0xa6, - 0x0c, 0x35, 0x3c, 0x7d, 0xff, 0x1c, 0xb4, 0x08, 0x74, 0xb4, 0xa6, 0x91, 0x1d, 0x70, 0x74, 0xe4, - 0x34, 0x5e, 0x44, 0x92, 0x56, 0xc2, 0x64, 0x40, 0xd2, 0x89, 0x52, 0xfe, 0xae, 0xa9, 0xc1, 0x06, - 0x81, 0x95, 0x9a, 0x9a, 0x5f, 0xd5, 0xd4, 0x60, 0x93, 0xc0, 0xbc, 0xa6, 0x46, 0x68, 0x9e, 0x84, - 0x54, 0x33, 0x5b, 0x84, 0xa2, 0xf6, 0xca, 0xa1, 0xde, 0x77, 0x68, 0xea, 0xbd, 0x4e, 0x54, 0x8b, - 0xe6, 0x22, 0x2a, 0xe6, 0xaa, 0xda, 0x69, 0x30, 0x7b, 0x2e, 0x22, 0x3d, 0x54, 0xdc, 0x87, 0x0d, - 0x65, 0x57, 0x17, 0xc5, 0x20, 0x6a, 0x7d, 0x2e, 0xa2, 0xca, 0x96, 0xbc, 0x86, 0xf5, 0x15, 0xab, - 0x8f, 0x60, 0xea, 0xcf, 0x40, 0x41, 0xea, 0xea, 0x1f, 0xa1, 0x5d, 0x7e, 0x3b, 0x70, 0x0b, 0xea, - 0x7c, 0x1e, 0x88, 0x19, 0x55, 0xb7, 0x99, 0xfe, 0x83, 0xdb, 0xd0, 0x78, 0x0c, 0x66, 0x33, 0x2e, - 0xf3, 0x5d, 0xc8, 0xff, 0xed, 0x7b, 0xd0, 0x2a, 0xde, 0x5f, 0xb4, 0xa1, 0x3e, 0x3a, 0xbd, 0x3c, - 0xbf, 0xea, 0xad, 0xa1, 0x03, 0xcd, 0xf1, 0xe4, 0x33, 0x1b, 0x9d, 0x7d, 0xea, 0xd5, 0xf6, 0x77, - 0xa1, 0x53, 0x59, 0x32, 0xec, 0x41, 0x7b, 0x72, 0x72, 0xed, 0x4f, 0x2e, 0xc6, 0xfe, 0x19, 0xbb, - 0x3e, 0xe9, 0xad, 0x1d, 0x5b, 0xb7, 0x46, 0x72, 0x77, 0xd7, 0xa0, 0x6f, 0xda, 0xfb, 0x3f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xf3, 0xcb, 0x6b, 0x95, 0xf3, 0x04, 0x00, 0x00, + 0x10, 0xc6, 0x49, 0xe2, 0xfc, 0xf1, 0x38, 0x89, 0xc2, 0x80, 0x90, 0xf5, 0xbe, 0x6a, 0x09, 0x46, + 0x55, 0x23, 0x2a, 0x45, 0x94, 0x9e, 0xa8, 0x7a, 0x09, 0x50, 0x21, 0x24, 0xa0, 0x68, 0x13, 0x7a, + 0xe0, 0x62, 0x2d, 0xd9, 0x2d, 0x5d, 0x11, 0x62, 0xcb, 0xbb, 0x11, 0xe2, 0xcb, 0xf5, 0xdc, 0x43, + 0x3f, 0x41, 0x0f, 0x7c, 0x96, 0x6a, 0x67, 0x1d, 0x62, 0xab, 0xea, 0x2d, 0x7e, 0x9e, 0xdf, 0x3e, + 0xe3, 0x9d, 0x99, 0x18, 0x60, 0x9e, 0x08, 0x39, 0x4c, 0xb3, 0xc4, 0x24, 0xe8, 0xd9, 0xdf, 0xff, + 0xc1, 0x5d, 0x72, 0x97, 0x38, 0x25, 0xfa, 0x0a, 0xbd, 0xcb, 0x44, 0x48, 0x26, 0xb5, 0xc9, 0xd4, + 0xd4, 0xa8, 0x64, 0xae, 0xf1, 0x0d, 0x74, 0xbf, 0x65, 0x52, 0xc6, 0xb7, 0x7c, 0x2e, 0x1e, 0x95, + 0x30, 0xdf, 0xc3, 0x4a, 0xbf, 0x32, 0xa8, 0xb1, 0x8e, 0x55, 0x8f, 0x96, 0x22, 0xfe, 0x0f, 0x3e, + 0x61, 0x42, 0xe9, 0xfb, 0xb0, 0x4a, 0x44, 0xcb, 0x0a, 0x27, 0x4a, 0xdf, 0x47, 0x3f, 0x6a, 0xe0, + 0xd9, 0x60, 0x7c, 0x0d, 0x55, 0x25, 0x28, 0xa0, 0x7d, 0xd4, 0xfd, 0xf9, 0xbc, 0xbd, 0xf6, 0xfb, + 0x79, 0xbb, 0x61, 0x9d, 0xb3, 0x13, 0x56, 0x55, 0x02, 0xdf, 0x41, 0x93, 0x0b, 0x91, 0x49, 0xad, + 0x29, 0x23, 0x38, 0x58, 0x1f, 0xd2, 0x0b, 0x5b, 0x64, 0xe4, 0x0c, 0xb6, 0x24, 0x30, 0x02, 0xcf, + 0x3c, 0xa5, 0x32, 0xac, 0xf5, 0x2b, 0x83, 0xee, 0x41, 0x77, 0x45, 0x4e, 0x9e, 0x52, 0xc9, 0xc8, + 0xc3, 0x8f, 0xd0, 0xce, 0x0a, 0xb7, 0x09, 0x3d, 0x4a, 0xdd, 0x5a, 0xb1, 0xc5, 0xbb, 0xb2, 0x12, + 0x8b, 0x43, 0x68, 0x3d, 0x48, 0xc3, 0x05, 0x37, 0x3c, 0xac, 0xd3, 0x39, 0x5c, 0x9d, 0xbb, 0xc8, + 0x1d, 0xf6, 0xc2, 0xe0, 0x0e, 0xb4, 0x67, 0xdc, 0xc8, 0xf9, 0xf4, 0x29, 0x9e, 0x29, 0x6d, 0xc2, + 0x46, 0xbf, 0x36, 0xa8, 0xb1, 0x20, 0xd7, 0xce, 0x95, 0x36, 0xb8, 0x0b, 0x1d, 0xbe, 0x10, 0xca, + 0xc4, 0x7a, 0x31, 0x9d, 0xda, 0x5b, 0x36, 0xfb, 0x95, 0x41, 0x8b, 0xb5, 0x49, 0x1c, 0x3b, 0x0d, + 0x37, 0xa0, 0xae, 0x74, 0xbc, 0x48, 0xc3, 0x16, 0x99, 0x9e, 0xd2, 0xd7, 0xa9, 0x1d, 0xc3, 0x22, + 0x15, 0xdc, 0xc8, 0x38, 0xcf, 0x0b, 0x7d, 0x72, 0x3b, 0x4e, 0x3d, 0x77, 0x22, 0xee, 0xc3, 0x66, + 0x8e, 0x95, 0xeb, 0x00, 0xc1, 0xe8, 0xbc, 0x51, 0xb1, 0xda, 0x2e, 0xe4, 0x11, 0xf1, 0x22, 0x35, + 0xea, 0x41, 0x86, 0x81, 0x7b, 0x25, 0x27, 0x5e, 0x93, 0x16, 0xdd, 0x40, 0x50, 0x18, 0x01, 0xbe, + 0x07, 0xdf, 0x64, 0x7c, 0xae, 0xd3, 0x24, 0x33, 0x34, 0xcd, 0xee, 0xc1, 0x46, 0xa1, 0xfd, 0x4b, + 0x8b, 0xad, 0x28, 0x0c, 0xcb, 0x93, 0xf5, 0x5f, 0xc6, 0x18, 0xfd, 0xaa, 0x82, 0x6f, 0x8f, 0x8d, + 0x0d, 0x37, 0x1a, 0xdf, 0x42, 0xd3, 0x06, 0xc5, 0xff, 0x5c, 0x93, 0x86, 0xb5, 0xcf, 0x04, 0xbe, + 0x02, 0x58, 0x76, 0xfb, 0x70, 0x3f, 0xdf, 0x38, 0x3f, 0x57, 0x0e, 0xf7, 0x71, 0x08, 0x1b, 0xa5, + 0x0e, 0xc4, 0x19, 0x37, 0x2a, 0xa1, 0x5d, 0xa9, 0xb0, 0xf5, 0x62, 0xbf, 0x99, 0x35, 0xec, 0xf0, + 0xdc, 0xfd, 0x73, 0xd0, 0x23, 0x30, 0x70, 0x9a, 0x43, 0xb6, 0x21, 0x70, 0x91, 0xd3, 0x64, 0x31, + 0x37, 0xb4, 0x12, 0x35, 0x06, 0x24, 0x1d, 0x5b, 0xe5, 0xef, 0x9a, 0x0e, 0x6c, 0x10, 0x58, 0xaa, + 0xe9, 0xf8, 0x55, 0x4d, 0x07, 0x36, 0x09, 0xcc, 0x6b, 0x3a, 0x84, 0xe6, 0x49, 0x48, 0x39, 0xb3, + 0x45, 0x28, 0x3a, 0xaf, 0x18, 0x1a, 0x7d, 0x82, 0x76, 0x71, 0x3f, 0x71, 0x13, 0xea, 0xf2, 0x81, + 0xab, 0x19, 0xb5, 0xd3, 0x67, 0xee, 0x01, 0xb7, 0xa0, 0xf1, 0xc8, 0x67, 0x33, 0x69, 0xf2, 0x69, + 0xe4, 0x4f, 0x7b, 0x11, 0xb4, 0x96, 0xff, 0x20, 0xf4, 0xa1, 0x3e, 0x3a, 0xb9, 0x38, 0xbb, 0xec, + 0xad, 0x61, 0x00, 0xcd, 0xf1, 0xe4, 0x0b, 0x1b, 0x9d, 0x7e, 0xee, 0x55, 0xf6, 0x76, 0xa0, 0x53, + 0x1a, 0x33, 0xf6, 0xa0, 0x3d, 0x39, 0xbe, 0x8a, 0x27, 0xe7, 0xe3, 0xf8, 0x94, 0x5d, 0x1d, 0xf7, + 0xd6, 0x8e, 0xbc, 0x9b, 0x6a, 0x7a, 0x7b, 0xdb, 0xa0, 0xaf, 0xca, 0x87, 0x3f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xd8, 0xd6, 0x7c, 0x48, 0x75, 0x04, 0x00, 0x00, } diff --git a/pkg/pb/node.proto b/pkg/pb/node.proto index 00abbc1b6..8e14735b2 100644 --- a/pkg/pb/node.proto +++ b/pkg/pb/node.proto @@ -46,7 +46,7 @@ message NodeAddress { enum NodeTransport { TCP_TLS_GRPC = 0; } -// NodeStats is info about a single storagenode stored in the stats db +// NodeStats is the reputation characteristics of a node message NodeStats { bytes node_id = 1 [(gogoproto.customtype) = "NodeID", (gogoproto.nullable) = false]; int64 latency_90 = 2; // 90th percentile measure of storagenode latency @@ -58,14 +58,6 @@ message NodeStats { int64 uptime_success_count = 8; } -// TODO: combine with `NodeStats` -// NodeRep is the reputation characteristics of a node -message NodeRep { - float min_uptime = 1; - float min_audit_success = 2; - int64 min_audit_count = 3; -} - message NodeMetadata { string email = 1; string wallet = 2; diff --git a/pkg/pb/overlay.pb.go b/pkg/pb/overlay.pb.go index 46df7a4f7..d248b357c 100644 --- a/pkg/pb/overlay.pb.go +++ b/pkg/pb/overlay.pb.go @@ -9,10 +9,8 @@ import math "math" import _ "github.com/gogo/protobuf/gogoproto" import duration "github.com/golang/protobuf/ptypes/duration" -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc "google.golang.org/grpc" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -54,7 +52,7 @@ func (x Restriction_Operator) String() string { return proto.EnumName(Restriction_Operator_name, int32(x)) } func (Restriction_Operator) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{11, 0} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{11, 0} } type Restriction_Operand int32 @@ -77,7 +75,7 @@ func (x Restriction_Operand) String() string { return proto.EnumName(Restriction_Operand_name, int32(x)) } func (Restriction_Operand) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{11, 1} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{11, 1} } // LookupRequest is is request message for the lookup rpc call @@ -92,7 +90,7 @@ func (m *LookupRequest) Reset() { *m = LookupRequest{} } func (m *LookupRequest) String() string { return proto.CompactTextString(m) } func (*LookupRequest) ProtoMessage() {} func (*LookupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{0} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{0} } func (m *LookupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LookupRequest.Unmarshal(m, b) @@ -124,7 +122,7 @@ func (m *LookupResponse) Reset() { *m = LookupResponse{} } func (m *LookupResponse) String() string { return proto.CompactTextString(m) } func (*LookupResponse) ProtoMessage() {} func (*LookupResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{1} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{1} } func (m *LookupResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LookupResponse.Unmarshal(m, b) @@ -163,7 +161,7 @@ func (m *LookupRequests) Reset() { *m = LookupRequests{} } func (m *LookupRequests) String() string { return proto.CompactTextString(m) } func (*LookupRequests) ProtoMessage() {} func (*LookupRequests) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{2} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{2} } func (m *LookupRequests) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LookupRequests.Unmarshal(m, b) @@ -202,7 +200,7 @@ func (m *LookupResponses) Reset() { *m = LookupResponses{} } func (m *LookupResponses) String() string { return proto.CompactTextString(m) } func (*LookupResponses) ProtoMessage() {} func (*LookupResponses) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{3} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{3} } func (m *LookupResponses) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LookupResponses.Unmarshal(m, b) @@ -241,7 +239,7 @@ func (m *FindStorageNodesResponse) Reset() { *m = FindStorageNodesRespon func (m *FindStorageNodesResponse) String() string { return proto.CompactTextString(m) } func (*FindStorageNodesResponse) ProtoMessage() {} func (*FindStorageNodesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{4} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{4} } func (m *FindStorageNodesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindStorageNodesResponse.Unmarshal(m, b) @@ -284,7 +282,7 @@ func (m *FindStorageNodesRequest) Reset() { *m = FindStorageNodesRequest func (m *FindStorageNodesRequest) String() string { return proto.CompactTextString(m) } func (*FindStorageNodesRequest) ProtoMessage() {} func (*FindStorageNodesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{5} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{5} } func (m *FindStorageNodesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindStorageNodesRequest.Unmarshal(m, b) @@ -335,7 +333,7 @@ func (m *FindStorageNodesRequest) GetMaxNodes() int64 { // OverlayOptions is a set of criteria that a node must meet to be considered for a storage opportunity type OverlayOptions struct { MaxLatency *duration.Duration `protobuf:"bytes,1,opt,name=max_latency,json=maxLatency" json:"max_latency,omitempty"` - MinReputation *NodeRep `protobuf:"bytes,2,opt,name=min_reputation,json=minReputation" json:"min_reputation,omitempty"` + MinStats *NodeStats `protobuf:"bytes,2,opt,name=min_stats,json=minStats" json:"min_stats,omitempty"` MinSpeedKbps int64 `protobuf:"varint,3,opt,name=min_speed_kbps,json=minSpeedKbps,proto3" json:"min_speed_kbps,omitempty"` Amount int64 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"` Restrictions *NodeRestrictions `protobuf:"bytes,5,opt,name=restrictions" json:"restrictions,omitempty"` @@ -349,7 +347,7 @@ func (m *OverlayOptions) Reset() { *m = OverlayOptions{} } func (m *OverlayOptions) String() string { return proto.CompactTextString(m) } func (*OverlayOptions) ProtoMessage() {} func (*OverlayOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{6} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{6} } func (m *OverlayOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OverlayOptions.Unmarshal(m, b) @@ -376,9 +374,9 @@ func (m *OverlayOptions) GetMaxLatency() *duration.Duration { return nil } -func (m *OverlayOptions) GetMinReputation() *NodeRep { +func (m *OverlayOptions) GetMinStats() *NodeStats { if m != nil { - return m.MinReputation + return m.MinStats } return nil } @@ -418,7 +416,7 @@ func (m *QueryRequest) Reset() { *m = QueryRequest{} } func (m *QueryRequest) String() string { return proto.CompactTextString(m) } func (*QueryRequest) ProtoMessage() {} func (*QueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{7} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{7} } func (m *QueryRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueryRequest.Unmarshal(m, b) @@ -478,7 +476,7 @@ func (m *QueryResponse) Reset() { *m = QueryResponse{} } func (m *QueryResponse) String() string { return proto.CompactTextString(m) } func (*QueryResponse) ProtoMessage() {} func (*QueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{8} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{8} } func (m *QueryResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueryResponse.Unmarshal(m, b) @@ -522,7 +520,7 @@ func (m *PingRequest) Reset() { *m = PingRequest{} } func (m *PingRequest) String() string { return proto.CompactTextString(m) } func (*PingRequest) ProtoMessage() {} func (*PingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{9} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{9} } func (m *PingRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PingRequest.Unmarshal(m, b) @@ -552,7 +550,7 @@ func (m *PingResponse) Reset() { *m = PingResponse{} } func (m *PingResponse) String() string { return proto.CompactTextString(m) } func (*PingResponse) ProtoMessage() {} func (*PingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{10} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{10} } func (m *PingResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PingResponse.Unmarshal(m, b) @@ -585,7 +583,7 @@ func (m *Restriction) Reset() { *m = Restriction{} } func (m *Restriction) String() string { return proto.CompactTextString(m) } func (*Restriction) ProtoMessage() {} func (*Restriction) Descriptor() ([]byte, []int) { - return fileDescriptor_overlay_9ebccc0ee1a42314, []int{11} + return fileDescriptor_overlay_55263e8e6ceef0b4, []int{11} } func (m *Restriction) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Restriction.Unmarshal(m, b) @@ -651,9 +649,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// OverlayClient is the client API for Overlay service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for Overlay service + type OverlayClient interface { // Lookup finds a nodes address from the network Lookup(ctx context.Context, in *LookupRequest, opts ...grpc.CallOption) (*LookupResponse, error) @@ -698,7 +695,8 @@ func (c *overlayClient) FindStorageNodes(ctx context.Context, in *FindStorageNod return out, nil } -// OverlayServer is the server API for Overlay service. +// Server API for Overlay service + type OverlayServer interface { // Lookup finds a nodes address from the network Lookup(context.Context, *LookupRequest) (*LookupResponse, error) @@ -787,9 +785,8 @@ var _Overlay_serviceDesc = grpc.ServiceDesc{ Metadata: "overlay.proto", } -// NodesClient is the client API for Nodes service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for Nodes service + type NodesClient interface { Query(ctx context.Context, in *QueryRequest, opts ...grpc.CallOption) (*QueryResponse, error) Ping(ctx context.Context, in *PingRequest, opts ...grpc.CallOption) (*PingResponse, error) @@ -821,7 +818,8 @@ func (c *nodesClient) Ping(ctx context.Context, in *PingRequest, opts ...grpc.Ca return out, nil } -// NodesServer is the server API for Nodes service. +// Server API for Nodes service + type NodesServer interface { Query(context.Context, *QueryRequest) (*QueryResponse, error) Ping(context.Context, *PingRequest) (*PingResponse, error) @@ -884,61 +882,61 @@ var _Nodes_serviceDesc = grpc.ServiceDesc{ Metadata: "overlay.proto", } -func init() { proto.RegisterFile("overlay.proto", fileDescriptor_overlay_9ebccc0ee1a42314) } +func init() { proto.RegisterFile("overlay.proto", fileDescriptor_overlay_55263e8e6ceef0b4) } -var fileDescriptor_overlay_9ebccc0ee1a42314 = []byte{ - // 846 bytes of a gzipped FileDescriptorProto +var fileDescriptor_overlay_55263e8e6ceef0b4 = []byte{ + // 845 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x8e, 0xdb, 0x44, - 0x14, 0x5e, 0xe7, 0xbf, 0x27, 0xb1, 0x37, 0x1a, 0xb5, 0xbb, 0x21, 0x40, 0x37, 0x58, 0x15, 0xac, - 0x04, 0x4a, 0x21, 0xad, 0x2a, 0x5a, 0x81, 0x80, 0x28, 0x69, 0x59, 0x35, 0xea, 0xd2, 0x49, 0xa4, - 0x4a, 0x70, 0x11, 0x39, 0xf1, 0x60, 0xcc, 0xda, 0x33, 0xc6, 0x33, 0xae, 0xb2, 0x7d, 0x02, 0xde, - 0x86, 0xd7, 0xe0, 0x19, 0xb8, 0xd8, 0x47, 0xe0, 0x01, 0xb8, 0x42, 0xf3, 0x63, 0xaf, 0xb3, 0xbb, - 0x59, 0xf5, 0xca, 0x3e, 0xe7, 0x7c, 0xdf, 0x99, 0xf9, 0xbe, 0x39, 0x33, 0x60, 0xb3, 0xb7, 0x24, - 0x8d, 0xbc, 0xf3, 0x61, 0x92, 0x32, 0xc1, 0x50, 0xd3, 0x84, 0xfd, 0xfb, 0x01, 0x63, 0x41, 0x44, - 0x1e, 0xaa, 0xf4, 0x2a, 0xfb, 0xf5, 0xa1, 0x9f, 0xa5, 0x9e, 0x08, 0x19, 0xd5, 0xc0, 0x3e, 0x04, - 0x2c, 0x60, 0xf9, 0x3f, 0x65, 0x3e, 0xd1, 0xff, 0xee, 0xd7, 0x60, 0xcf, 0x18, 0x3b, 0xcb, 0x12, - 0x4c, 0xfe, 0xc8, 0x08, 0x17, 0xe8, 0x33, 0x68, 0xca, 0xf2, 0x32, 0xf4, 0x7b, 0xd6, 0xc0, 0x3a, - 0xee, 0x8c, 0x9d, 0xbf, 0x2f, 0x8e, 0xf6, 0xfe, 0xb9, 0x38, 0x6a, 0xbc, 0x62, 0x3e, 0x39, 0x99, - 0xe0, 0x86, 0x2c, 0x9f, 0xf8, 0xee, 0x97, 0xe0, 0xe4, 0x4c, 0x9e, 0x30, 0xca, 0x09, 0xba, 0x0f, - 0x35, 0x59, 0x53, 0xbc, 0xf6, 0x08, 0x86, 0x6a, 0x19, 0xc9, 0xc2, 0x2a, 0xef, 0x9e, 0x5e, 0x32, - 0xd4, 0x5a, 0x1c, 0x7d, 0x0b, 0x4e, 0xa4, 0x32, 0xcb, 0x54, 0xa7, 0x7a, 0xd6, 0xa0, 0x7a, 0xdc, - 0x1e, 0x1d, 0x0c, 0x73, 0x99, 0x5b, 0x04, 0x6c, 0x47, 0xe5, 0xd0, 0x9d, 0xc3, 0xfe, 0xf6, 0x16, - 0x38, 0xfa, 0x1e, 0xf6, 0x8b, 0x8e, 0x3a, 0x67, 0x5a, 0x1e, 0x5e, 0x6b, 0xa9, 0xcb, 0xd8, 0x89, - 0xb6, 0x62, 0xf7, 0x1b, 0xe8, 0x3d, 0x0f, 0xa9, 0x3f, 0x17, 0x2c, 0xf5, 0x02, 0x22, 0xb7, 0xcf, - 0x0b, 0x85, 0x03, 0xa8, 0x4b, 0x25, 0xdc, 0xf4, 0x2c, 0x4b, 0xd4, 0x05, 0xf7, 0x5f, 0x0b, 0x0e, - 0xaf, 0xd3, 0xb5, 0xb5, 0x47, 0xd0, 0x66, 0xab, 0xdf, 0xc9, 0x5a, 0x2c, 0x79, 0xf8, 0x4e, 0xdb, - 0x54, 0xc5, 0xa0, 0x53, 0xf3, 0xf0, 0x1d, 0x41, 0x63, 0xd8, 0x5f, 0x33, 0x2a, 0x52, 0x6f, 0x2d, - 0x96, 0x11, 0xa1, 0x81, 0xf8, 0xad, 0x57, 0x51, 0x5e, 0x7e, 0x30, 0xd4, 0xc7, 0x3b, 0xcc, 0x8f, - 0x77, 0x38, 0x31, 0xc7, 0x8b, 0x9d, 0x9c, 0x31, 0x53, 0x04, 0xf4, 0x39, 0xd4, 0x58, 0x22, 0x78, - 0xaf, 0xaa, 0x88, 0x97, 0xaa, 0x4f, 0xf5, 0xf7, 0x34, 0x91, 0x2c, 0x8e, 0x15, 0x08, 0x3d, 0x80, - 0x3a, 0x17, 0x5e, 0x2a, 0x7a, 0xb5, 0x1b, 0x8f, 0x5a, 0x17, 0xd1, 0x87, 0x70, 0x27, 0xf6, 0x36, - 0x4b, 0xad, 0xbc, 0xae, 0x76, 0xdd, 0x8a, 0xbd, 0x8d, 0xd2, 0xe6, 0xfe, 0x55, 0x01, 0x67, 0xbb, - 0x37, 0x7a, 0x06, 0x6d, 0x89, 0x8f, 0x3c, 0x41, 0xe8, 0xfa, 0xdc, 0x8c, 0xc3, 0x2d, 0x12, 0x20, - 0xf6, 0x36, 0x33, 0x0d, 0x46, 0x8f, 0xc1, 0x89, 0x43, 0xba, 0x4c, 0x49, 0x92, 0x09, 0x55, 0x35, - 0x0e, 0xd8, 0x25, 0xab, 0x49, 0x82, 0xed, 0x38, 0xa4, 0xb8, 0xc0, 0xa0, 0x07, 0x9a, 0xc5, 0x13, - 0x42, 0xfc, 0xe5, 0xd9, 0x2a, 0xd1, 0xf2, 0xab, 0xb8, 0x13, 0x87, 0x74, 0x2e, 0x93, 0x2f, 0x57, - 0x09, 0x47, 0x07, 0xd0, 0xf0, 0x62, 0x96, 0x51, 0x2d, 0xb7, 0x8a, 0x4d, 0x84, 0x9e, 0x41, 0x27, - 0x25, 0x5c, 0xa4, 0xe1, 0x5a, 0xed, 0x5f, 0x49, 0x94, 0x33, 0x58, 0x5a, 0xf1, 0xb2, 0x8a, 0xb7, - 0xb0, 0xe8, 0x2b, 0x70, 0xc8, 0x66, 0x1d, 0x65, 0x3e, 0xf1, 0x8d, 0x41, 0x8d, 0x41, 0xf5, 0xb8, - 0x33, 0x86, 0x92, 0x8d, 0x76, 0x8e, 0xd0, 0x8e, 0xfd, 0x69, 0x41, 0xe7, 0x75, 0x46, 0xd2, 0xf3, - 0x7c, 0x2e, 0x5c, 0x68, 0x70, 0x42, 0x7d, 0x92, 0xde, 0x70, 0x73, 0x4c, 0x45, 0x62, 0x84, 0x97, - 0x06, 0x44, 0x18, 0x3f, 0xb6, 0x30, 0xba, 0x82, 0xee, 0x42, 0x3d, 0x0a, 0xe3, 0x50, 0x18, 0xf1, - 0x3a, 0x40, 0x7d, 0x68, 0x25, 0x21, 0x0d, 0x56, 0xde, 0xfa, 0x4c, 0xe9, 0x6e, 0xe1, 0x22, 0x76, - 0x7f, 0x01, 0xdb, 0xec, 0xc4, 0x0c, 0xf8, 0xfb, 0x6c, 0xe5, 0x53, 0x68, 0x15, 0x77, 0xab, 0x72, - 0xed, 0x1e, 0x14, 0x35, 0xd7, 0x86, 0xf6, 0x4f, 0x21, 0x0d, 0xf2, 0xcb, 0xea, 0x40, 0x47, 0x87, - 0xa6, 0xfc, 0x9f, 0x05, 0xed, 0x92, 0xb1, 0xe8, 0x29, 0xb4, 0x58, 0x42, 0x52, 0x4f, 0x30, 0xbd, - 0xb8, 0x33, 0xfa, 0xb8, 0x18, 0xde, 0x12, 0x6e, 0x78, 0x6a, 0x40, 0xb8, 0x80, 0xa3, 0x27, 0xd0, - 0x54, 0xff, 0xd4, 0x57, 0xee, 0x38, 0xa3, 0x8f, 0x76, 0x33, 0xa9, 0x8f, 0x73, 0xb0, 0x34, 0xec, - 0xad, 0x17, 0x65, 0x24, 0x37, 0x4c, 0x05, 0xee, 0x63, 0x68, 0xe5, 0x6b, 0xa0, 0x06, 0x54, 0x66, - 0x8b, 0xee, 0x9e, 0xfc, 0x4e, 0x5f, 0x77, 0x2d, 0xf9, 0x7d, 0xb1, 0xe8, 0x56, 0x50, 0x13, 0xaa, - 0xb3, 0xc5, 0xb4, 0x5b, 0x95, 0x3f, 0x2f, 0x16, 0xd3, 0x6e, 0xcd, 0xfd, 0x02, 0x9a, 0xa6, 0x3f, - 0x42, 0xe0, 0x3c, 0xc7, 0xd3, 0xe9, 0x72, 0xfc, 0xc3, 0xab, 0xc9, 0x9b, 0x93, 0xc9, 0xe2, 0xc7, - 0xee, 0x1e, 0xb2, 0xe1, 0x8e, 0xca, 0x4d, 0x4e, 0xe6, 0x2f, 0xbb, 0xd6, 0xe8, 0xc2, 0x82, 0xa6, - 0xb9, 0x35, 0xe8, 0x29, 0x34, 0xf4, 0x93, 0x84, 0x76, 0x3c, 0x7b, 0xfd, 0x5d, 0x6f, 0x17, 0xfa, - 0x0e, 0x60, 0x9c, 0x45, 0x67, 0x86, 0x7e, 0x78, 0x33, 0x9d, 0xf7, 0x7b, 0x3b, 0xf8, 0x1c, 0xbd, - 0x81, 0xee, 0xd5, 0xd7, 0x0a, 0x0d, 0x0a, 0xf4, 0x8e, 0x87, 0xac, 0xff, 0xc9, 0x2d, 0x08, 0xdd, - 0x79, 0x24, 0xa0, 0xae, 0xbb, 0x3d, 0x81, 0xba, 0x1a, 0x31, 0x74, 0xaf, 0x20, 0x95, 0x87, 0xbf, - 0x7f, 0x70, 0x35, 0x6d, 0xa4, 0x3d, 0x82, 0x9a, 0x1c, 0x17, 0x74, 0xb7, 0xa8, 0x97, 0x86, 0xa9, - 0x7f, 0xef, 0x4a, 0x56, 0x93, 0xc6, 0xb5, 0x9f, 0x2b, 0xc9, 0x6a, 0xd5, 0x50, 0x4f, 0xcc, 0xa3, - 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x26, 0xc0, 0x69, 0xb7, 0x2c, 0x07, 0x00, 0x00, + 0x14, 0x5e, 0xe7, 0xc7, 0xc9, 0x9e, 0x24, 0x5e, 0x6b, 0xd4, 0xee, 0x06, 0x03, 0xdd, 0x60, 0x55, + 0xb0, 0x12, 0x55, 0x0a, 0x29, 0xaa, 0x68, 0x05, 0x02, 0xa2, 0xa4, 0x65, 0xd5, 0xa8, 0x4b, 0x27, + 0x91, 0x2a, 0xc1, 0x85, 0xe5, 0xc4, 0x83, 0x31, 0xeb, 0x78, 0x8c, 0x67, 0x5c, 0xed, 0xf6, 0x09, + 0x78, 0x13, 0x5e, 0x85, 0x67, 0xe0, 0x62, 0x1f, 0x81, 0x07, 0xe0, 0x0a, 0xcd, 0x8f, 0x1d, 0x67, + 0x77, 0x53, 0xf5, 0x6a, 0xe6, 0x9c, 0xf3, 0x7d, 0x67, 0xe6, 0x3b, 0x73, 0xe6, 0x40, 0x8f, 0xbe, + 0x21, 0x59, 0xec, 0x5f, 0x0e, 0xd3, 0x8c, 0x72, 0x8a, 0x5a, 0xda, 0x74, 0xee, 0x85, 0x94, 0x86, + 0x31, 0x79, 0x28, 0xdd, 0xcb, 0xfc, 0xd7, 0x87, 0x41, 0x9e, 0xf9, 0x3c, 0xa2, 0x89, 0x02, 0x3a, + 0x10, 0xd2, 0x90, 0x16, 0xfb, 0x84, 0x06, 0x44, 0xed, 0xdd, 0xaf, 0xa1, 0x37, 0xa3, 0xf4, 0x3c, + 0x4f, 0x31, 0xf9, 0x23, 0x27, 0x8c, 0xa3, 0xcf, 0xa0, 0x25, 0xc2, 0x5e, 0x14, 0xf4, 0x8d, 0x81, + 0x71, 0xd2, 0x1d, 0x5b, 0x7f, 0x5f, 0x1d, 0xef, 0xfd, 0x73, 0x75, 0x6c, 0xbe, 0xa4, 0x01, 0x39, + 0x9d, 0x60, 0x53, 0x84, 0x4f, 0x03, 0xf7, 0x0b, 0xb0, 0x0a, 0x26, 0x4b, 0x69, 0xc2, 0x08, 0xba, + 0x07, 0x0d, 0x11, 0x93, 0xbc, 0xce, 0x08, 0x86, 0xf2, 0x18, 0xc1, 0xc2, 0xd2, 0xef, 0x9e, 0x6d, + 0x18, 0xf2, 0x2c, 0x86, 0xbe, 0x05, 0x2b, 0x96, 0x1e, 0x2f, 0x53, 0xae, 0xbe, 0x31, 0xa8, 0x9f, + 0x74, 0x46, 0x87, 0xc3, 0x42, 0xe6, 0x16, 0x01, 0xf7, 0xe2, 0xaa, 0xe9, 0xce, 0xe1, 0x60, 0xfb, + 0x0a, 0x0c, 0x7d, 0x0f, 0x07, 0x65, 0x46, 0xe5, 0xd3, 0x29, 0x8f, 0x6e, 0xa4, 0x54, 0x61, 0x6c, + 0xc5, 0x5b, 0xb6, 0xfb, 0x0d, 0xf4, 0x9f, 0x45, 0x49, 0x30, 0xe7, 0x34, 0xf3, 0x43, 0x22, 0xae, + 0xcf, 0x4a, 0x85, 0x03, 0x68, 0x0a, 0x25, 0x4c, 0xe7, 0xac, 0x4a, 0x54, 0x01, 0xf7, 0x5f, 0x03, + 0x8e, 0x6e, 0xd2, 0x55, 0x69, 0x8f, 0xa1, 0x43, 0x97, 0xbf, 0x93, 0x15, 0xf7, 0x58, 0xf4, 0x56, + 0x95, 0xa9, 0x8e, 0x41, 0xb9, 0xe6, 0xd1, 0x5b, 0x82, 0xc6, 0x70, 0xb0, 0xa2, 0x09, 0xcf, 0xfc, + 0x15, 0xf7, 0x62, 0x92, 0x84, 0xfc, 0xb7, 0x7e, 0x4d, 0xd6, 0xf2, 0x83, 0xa1, 0x7a, 0xde, 0x61, + 0xf1, 0xbc, 0xc3, 0x89, 0x7e, 0x5e, 0x6c, 0x15, 0x8c, 0x99, 0x24, 0xa0, 0xcf, 0xa1, 0x41, 0x53, + 0xce, 0xfa, 0x75, 0x49, 0xdc, 0xa8, 0x3e, 0x53, 0xeb, 0x59, 0x2a, 0x58, 0x0c, 0x4b, 0x10, 0xba, + 0x0f, 0x4d, 0xc6, 0xfd, 0x8c, 0xf7, 0x1b, 0xb7, 0x3e, 0xb5, 0x0a, 0xa2, 0x0f, 0x61, 0x7f, 0xed, + 0x5f, 0x78, 0x4a, 0x79, 0x53, 0xde, 0xba, 0xbd, 0xf6, 0x2f, 0xa4, 0x36, 0xf7, 0xaf, 0x1a, 0x58, + 0xdb, 0xb9, 0xd1, 0x53, 0xe8, 0x08, 0x7c, 0xec, 0x73, 0x92, 0xac, 0x2e, 0x75, 0x3b, 0xbc, 0x43, + 0x02, 0xac, 0xfd, 0x8b, 0x99, 0x02, 0xa3, 0x07, 0xb0, 0xbf, 0x8e, 0x12, 0x8f, 0x71, 0x9f, 0x33, + 0x2d, 0xfe, 0x60, 0x53, 0xe5, 0xb9, 0x70, 0xe3, 0xf6, 0x3a, 0x4a, 0xe4, 0x0e, 0xdd, 0x07, 0x4b, + 0xa2, 0x53, 0x42, 0x02, 0xef, 0x7c, 0x99, 0x2a, 0xd9, 0x75, 0xdc, 0x15, 0x08, 0xe1, 0x7c, 0xb1, + 0x4c, 0x19, 0x3a, 0x04, 0xd3, 0x5f, 0xd3, 0x3c, 0x51, 0x32, 0xeb, 0x58, 0x5b, 0xe8, 0x29, 0x74, + 0x33, 0xc2, 0x78, 0x16, 0xad, 0xe4, 0xbd, 0xa5, 0x34, 0xd1, 0x7b, 0x9b, 0x47, 0xad, 0x44, 0xf1, + 0x16, 0x16, 0x7d, 0x09, 0x16, 0xb9, 0x58, 0xc5, 0x79, 0x40, 0x02, 0x5d, 0x18, 0x73, 0x50, 0x3f, + 0xe9, 0x8e, 0xa1, 0x52, 0xbe, 0x5e, 0x81, 0x50, 0x95, 0xfa, 0xd3, 0x80, 0xee, 0xab, 0x9c, 0x64, + 0x97, 0x45, 0x3f, 0xb8, 0x60, 0x32, 0x92, 0x04, 0x24, 0xbb, 0xe5, 0xc7, 0xe8, 0x88, 0xc0, 0x70, + 0x3f, 0x0b, 0x09, 0xd7, 0xc5, 0xd8, 0xc2, 0xa8, 0x08, 0xba, 0x03, 0xcd, 0x38, 0x5a, 0x47, 0x5c, + 0x8b, 0x57, 0x06, 0x72, 0xa0, 0x9d, 0x46, 0x49, 0xb8, 0xf4, 0x57, 0xe7, 0x52, 0x77, 0x1b, 0x97, + 0xb6, 0xfb, 0x0b, 0xf4, 0xf4, 0x4d, 0x74, 0x63, 0xbf, 0xcf, 0x55, 0x3e, 0x85, 0x76, 0xf9, 0xa7, + 0x6a, 0x37, 0xfa, 0xbf, 0x8c, 0xb9, 0x3d, 0xe8, 0xfc, 0x14, 0x25, 0x61, 0xf1, 0x49, 0x2d, 0xe8, + 0x2a, 0x53, 0x87, 0xff, 0x33, 0xa0, 0x53, 0x29, 0x2c, 0x7a, 0x02, 0x6d, 0x9a, 0x92, 0xcc, 0xe7, + 0x54, 0x1d, 0x6e, 0x8d, 0x3e, 0x2e, 0x9b, 0xb6, 0x82, 0x1b, 0x9e, 0x69, 0x10, 0x2e, 0xe1, 0xe8, + 0x31, 0xb4, 0xe4, 0x3e, 0x09, 0x64, 0x75, 0xac, 0xd1, 0x47, 0xbb, 0x99, 0x49, 0x80, 0x0b, 0xb0, + 0x28, 0xd8, 0x1b, 0x3f, 0xce, 0x49, 0x51, 0x30, 0x69, 0xb8, 0x5f, 0x41, 0xbb, 0x38, 0x03, 0x99, + 0x50, 0x9b, 0x2d, 0xec, 0x3d, 0xb1, 0x4e, 0x5f, 0xd9, 0x86, 0x58, 0x9f, 0x2f, 0xec, 0x1a, 0x6a, + 0x41, 0x7d, 0xb6, 0x98, 0xda, 0x75, 0xb1, 0x79, 0xbe, 0x98, 0xda, 0x0d, 0xf7, 0x01, 0xb4, 0x74, + 0x7e, 0x84, 0xc0, 0x7a, 0x86, 0xa7, 0x53, 0x6f, 0xfc, 0xc3, 0xcb, 0xc9, 0xeb, 0xd3, 0xc9, 0xe2, + 0x47, 0x7b, 0x0f, 0xf5, 0x60, 0x5f, 0xfa, 0x26, 0xa7, 0xf3, 0x17, 0xb6, 0x31, 0xba, 0x32, 0xa0, + 0xa5, 0x7f, 0x0b, 0x7a, 0x02, 0xa6, 0x1a, 0x45, 0x68, 0xc7, 0xb8, 0x73, 0x76, 0xcd, 0x2c, 0xf4, + 0x1d, 0xc0, 0x38, 0x8f, 0xcf, 0x35, 0xfd, 0xe8, 0x76, 0x3a, 0x73, 0xfa, 0x3b, 0xf8, 0x0c, 0xbd, + 0x06, 0xfb, 0xfa, 0x94, 0x42, 0x83, 0x12, 0xbd, 0x63, 0x80, 0x39, 0x9f, 0xbc, 0x03, 0xa1, 0x32, + 0x8f, 0x38, 0x34, 0x55, 0xb6, 0xc7, 0xd0, 0x94, 0x2d, 0x86, 0xee, 0x96, 0xa4, 0x6a, 0xf3, 0x3b, + 0x87, 0xd7, 0xdd, 0x5a, 0xda, 0x23, 0x68, 0x88, 0x76, 0x41, 0x77, 0xca, 0x78, 0xa5, 0x99, 0x9c, + 0xbb, 0xd7, 0xbc, 0x8a, 0x34, 0x6e, 0xfc, 0x5c, 0x4b, 0x97, 0x4b, 0x53, 0x8e, 0x96, 0x47, 0xff, + 0x07, 0x00, 0x00, 0xff, 0xff, 0xae, 0x57, 0x27, 0x55, 0x24, 0x07, 0x00, 0x00, } diff --git a/pkg/pb/overlay.proto b/pkg/pb/overlay.proto index 8acae8737..c147c8b7e 100644 --- a/pkg/pb/overlay.proto +++ b/pkg/pb/overlay.proto @@ -63,7 +63,7 @@ message FindStorageNodesRequest { // OverlayOptions is a set of criteria that a node must meet to be considered for a storage opportunity message OverlayOptions { google.protobuf.Duration max_latency = 1; - node.NodeRep min_reputation = 2; + node.NodeStats min_stats = 2; int64 min_speed_kbps = 3; int64 amount = 4; node.NodeRestrictions restrictions = 5; diff --git a/pkg/pb/piecestore.pb.go b/pkg/pb/piecestore.pb.go index 352181b3f..75982fbd9 100644 --- a/pkg/pb/piecestore.pb.go +++ b/pkg/pb/piecestore.pb.go @@ -8,10 +8,8 @@ import fmt "fmt" import math "math" import _ "github.com/gogo/protobuf/gogoproto" -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc "google.golang.org/grpc" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -44,7 +42,7 @@ func (x PayerBandwidthAllocation_Action) String() string { return proto.EnumName(PayerBandwidthAllocation_Action_name, int32(x)) } func (PayerBandwidthAllocation_Action) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{0, 0} + return fileDescriptor_piecestore_c22028cf5808832f, []int{0, 0} } type PayerBandwidthAllocation struct { @@ -59,7 +57,7 @@ func (m *PayerBandwidthAllocation) Reset() { *m = PayerBandwidthAllocati func (m *PayerBandwidthAllocation) String() string { return proto.CompactTextString(m) } func (*PayerBandwidthAllocation) ProtoMessage() {} func (*PayerBandwidthAllocation) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{0} + return fileDescriptor_piecestore_c22028cf5808832f, []int{0} } func (m *PayerBandwidthAllocation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PayerBandwidthAllocation.Unmarshal(m, b) @@ -110,7 +108,7 @@ func (m *PayerBandwidthAllocation_Data) Reset() { *m = PayerBandwidthAll func (m *PayerBandwidthAllocation_Data) String() string { return proto.CompactTextString(m) } func (*PayerBandwidthAllocation_Data) ProtoMessage() {} func (*PayerBandwidthAllocation_Data) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{0, 0} + return fileDescriptor_piecestore_c22028cf5808832f, []int{0, 0} } func (m *PayerBandwidthAllocation_Data) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PayerBandwidthAllocation_Data.Unmarshal(m, b) @@ -177,7 +175,7 @@ func (m *RenterBandwidthAllocation) Reset() { *m = RenterBandwidthAlloca func (m *RenterBandwidthAllocation) String() string { return proto.CompactTextString(m) } func (*RenterBandwidthAllocation) ProtoMessage() {} func (*RenterBandwidthAllocation) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{1} + return fileDescriptor_piecestore_c22028cf5808832f, []int{1} } func (m *RenterBandwidthAllocation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RenterBandwidthAllocation.Unmarshal(m, b) @@ -225,7 +223,7 @@ func (m *RenterBandwidthAllocation_Data) Reset() { *m = RenterBandwidthA func (m *RenterBandwidthAllocation_Data) String() string { return proto.CompactTextString(m) } func (*RenterBandwidthAllocation_Data) ProtoMessage() {} func (*RenterBandwidthAllocation_Data) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{1, 0} + return fileDescriptor_piecestore_c22028cf5808832f, []int{1, 0} } func (m *RenterBandwidthAllocation_Data) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RenterBandwidthAllocation_Data.Unmarshal(m, b) @@ -279,7 +277,7 @@ func (m *PieceStore) Reset() { *m = PieceStore{} } func (m *PieceStore) String() string { return proto.CompactTextString(m) } func (*PieceStore) ProtoMessage() {} func (*PieceStore) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{2} + return fileDescriptor_piecestore_c22028cf5808832f, []int{2} } func (m *PieceStore) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceStore.Unmarshal(m, b) @@ -334,7 +332,7 @@ func (m *PieceStore_PieceData) Reset() { *m = PieceStore_PieceData{} } func (m *PieceStore_PieceData) String() string { return proto.CompactTextString(m) } func (*PieceStore_PieceData) ProtoMessage() {} func (*PieceStore_PieceData) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{2, 0} + return fileDescriptor_piecestore_c22028cf5808832f, []int{2, 0} } func (m *PieceStore_PieceData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceStore_PieceData.Unmarshal(m, b) @@ -388,7 +386,7 @@ func (m *PieceId) Reset() { *m = PieceId{} } func (m *PieceId) String() string { return proto.CompactTextString(m) } func (*PieceId) ProtoMessage() {} func (*PieceId) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{3} + return fileDescriptor_piecestore_c22028cf5808832f, []int{3} } func (m *PieceId) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceId.Unmarshal(m, b) @@ -435,7 +433,7 @@ func (m *PieceSummary) Reset() { *m = PieceSummary{} } func (m *PieceSummary) String() string { return proto.CompactTextString(m) } func (*PieceSummary) ProtoMessage() {} func (*PieceSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{4} + return fileDescriptor_piecestore_c22028cf5808832f, []int{4} } func (m *PieceSummary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceSummary.Unmarshal(m, b) @@ -489,7 +487,7 @@ func (m *PieceRetrieval) Reset() { *m = PieceRetrieval{} } func (m *PieceRetrieval) String() string { return proto.CompactTextString(m) } func (*PieceRetrieval) ProtoMessage() {} func (*PieceRetrieval) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{5} + return fileDescriptor_piecestore_c22028cf5808832f, []int{5} } func (m *PieceRetrieval) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceRetrieval.Unmarshal(m, b) @@ -544,7 +542,7 @@ func (m *PieceRetrieval_PieceData) Reset() { *m = PieceRetrieval_PieceDa func (m *PieceRetrieval_PieceData) String() string { return proto.CompactTextString(m) } func (*PieceRetrieval_PieceData) ProtoMessage() {} func (*PieceRetrieval_PieceData) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{5, 0} + return fileDescriptor_piecestore_c22028cf5808832f, []int{5, 0} } func (m *PieceRetrieval_PieceData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceRetrieval_PieceData.Unmarshal(m, b) @@ -597,7 +595,7 @@ func (m *PieceRetrievalStream) Reset() { *m = PieceRetrievalStream{} } func (m *PieceRetrievalStream) String() string { return proto.CompactTextString(m) } func (*PieceRetrievalStream) ProtoMessage() {} func (*PieceRetrievalStream) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{6} + return fileDescriptor_piecestore_c22028cf5808832f, []int{6} } func (m *PieceRetrievalStream) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceRetrievalStream.Unmarshal(m, b) @@ -644,7 +642,7 @@ func (m *PieceDelete) Reset() { *m = PieceDelete{} } func (m *PieceDelete) String() string { return proto.CompactTextString(m) } func (*PieceDelete) ProtoMessage() {} func (*PieceDelete) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{7} + return fileDescriptor_piecestore_c22028cf5808832f, []int{7} } func (m *PieceDelete) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceDelete.Unmarshal(m, b) @@ -689,7 +687,7 @@ func (m *PieceDeleteSummary) Reset() { *m = PieceDeleteSummary{} } func (m *PieceDeleteSummary) String() string { return proto.CompactTextString(m) } func (*PieceDeleteSummary) ProtoMessage() {} func (*PieceDeleteSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{8} + return fileDescriptor_piecestore_c22028cf5808832f, []int{8} } func (m *PieceDeleteSummary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceDeleteSummary.Unmarshal(m, b) @@ -728,7 +726,7 @@ func (m *PieceStoreSummary) Reset() { *m = PieceStoreSummary{} } func (m *PieceStoreSummary) String() string { return proto.CompactTextString(m) } func (*PieceStoreSummary) ProtoMessage() {} func (*PieceStoreSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{9} + return fileDescriptor_piecestore_c22028cf5808832f, []int{9} } func (m *PieceStoreSummary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PieceStoreSummary.Unmarshal(m, b) @@ -772,7 +770,7 @@ func (m *StatsReq) Reset() { *m = StatsReq{} } func (m *StatsReq) String() string { return proto.CompactTextString(m) } func (*StatsReq) ProtoMessage() {} func (*StatsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{10} + return fileDescriptor_piecestore_c22028cf5808832f, []int{10} } func (m *StatsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatsReq.Unmarshal(m, b) @@ -806,7 +804,7 @@ func (m *StatSummary) Reset() { *m = StatSummary{} } func (m *StatSummary) String() string { return proto.CompactTextString(m) } func (*StatSummary) ProtoMessage() {} func (*StatSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{11} + return fileDescriptor_piecestore_c22028cf5808832f, []int{11} } func (m *StatSummary) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatSummary.Unmarshal(m, b) @@ -867,7 +865,7 @@ func (m *SignedMessage) Reset() { *m = SignedMessage{} } func (m *SignedMessage) String() string { return proto.CompactTextString(m) } func (*SignedMessage) ProtoMessage() {} func (*SignedMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_piecestore_f6b209c85f045534, []int{12} + return fileDescriptor_piecestore_c22028cf5808832f, []int{12} } func (m *SignedMessage) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignedMessage.Unmarshal(m, b) @@ -937,9 +935,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// PieceStoreRoutesClient is the client API for PieceStoreRoutes service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for PieceStoreRoutes service + type PieceStoreRoutesClient interface { Piece(ctx context.Context, in *PieceId, opts ...grpc.CallOption) (*PieceSummary, error) Retrieve(ctx context.Context, opts ...grpc.CallOption) (PieceStoreRoutes_RetrieveClient, error) @@ -1048,7 +1045,8 @@ func (c *pieceStoreRoutesClient) Stats(ctx context.Context, in *StatsReq, opts . return out, nil } -// PieceStoreRoutesServer is the server API for PieceStoreRoutes service. +// Server API for PieceStoreRoutes service + type PieceStoreRoutesServer interface { Piece(context.Context, *PieceId) (*PieceSummary, error) Retrieve(PieceStoreRoutes_RetrieveServer) error @@ -1200,9 +1198,9 @@ var _PieceStoreRoutes_serviceDesc = grpc.ServiceDesc{ Metadata: "piecestore.proto", } -func init() { proto.RegisterFile("piecestore.proto", fileDescriptor_piecestore_f6b209c85f045534) } +func init() { proto.RegisterFile("piecestore.proto", fileDescriptor_piecestore_c22028cf5808832f) } -var fileDescriptor_piecestore_f6b209c85f045534 = []byte{ +var fileDescriptor_piecestore_c22028cf5808832f = []byte{ // 946 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6e, 0xdb, 0xc6, 0x13, 0x36, 0x29, 0x5b, 0xb2, 0x46, 0x7f, 0xac, 0xac, 0x8d, 0xdf, 0x4f, 0x26, 0xe2, 0x5a, 0x60, diff --git a/pkg/pb/pointerdb.pb.go b/pkg/pb/pointerdb.pb.go index cfe543438..1e76fd5d5 100644 --- a/pkg/pb/pointerdb.pb.go +++ b/pkg/pb/pointerdb.pb.go @@ -9,10 +9,8 @@ import math "math" import _ "github.com/gogo/protobuf/gogoproto" import timestamp "github.com/golang/protobuf/ptypes/timestamp" -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc "google.golang.org/grpc" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -42,7 +40,7 @@ func (x RedundancyScheme_SchemeType) String() string { return proto.EnumName(RedundancyScheme_SchemeType_name, int32(x)) } func (RedundancyScheme_SchemeType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{0, 0} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{0, 0} } type Pointer_DataType int32 @@ -65,7 +63,7 @@ func (x Pointer_DataType) String() string { return proto.EnumName(Pointer_DataType_name, int32(x)) } func (Pointer_DataType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{3, 0} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{3, 0} } type RedundancyScheme struct { @@ -85,7 +83,7 @@ func (m *RedundancyScheme) Reset() { *m = RedundancyScheme{} } func (m *RedundancyScheme) String() string { return proto.CompactTextString(m) } func (*RedundancyScheme) ProtoMessage() {} func (*RedundancyScheme) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{0} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{0} } func (m *RedundancyScheme) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RedundancyScheme.Unmarshal(m, b) @@ -159,7 +157,7 @@ func (m *RemotePiece) Reset() { *m = RemotePiece{} } func (m *RemotePiece) String() string { return proto.CompactTextString(m) } func (*RemotePiece) ProtoMessage() {} func (*RemotePiece) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{1} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{1} } func (m *RemotePiece) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemotePiece.Unmarshal(m, b) @@ -201,7 +199,7 @@ func (m *RemoteSegment) Reset() { *m = RemoteSegment{} } func (m *RemoteSegment) String() string { return proto.CompactTextString(m) } func (*RemoteSegment) ProtoMessage() {} func (*RemoteSegment) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{2} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{2} } func (m *RemoteSegment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoteSegment.Unmarshal(m, b) @@ -267,7 +265,7 @@ func (m *Pointer) Reset() { *m = Pointer{} } func (m *Pointer) String() string { return proto.CompactTextString(m) } func (*Pointer) ProtoMessage() {} func (*Pointer) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{3} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{3} } func (m *Pointer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Pointer.Unmarshal(m, b) @@ -349,7 +347,7 @@ func (m *PutRequest) Reset() { *m = PutRequest{} } func (m *PutRequest) String() string { return proto.CompactTextString(m) } func (*PutRequest) ProtoMessage() {} func (*PutRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{4} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{4} } func (m *PutRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PutRequest.Unmarshal(m, b) @@ -395,7 +393,7 @@ func (m *GetRequest) Reset() { *m = GetRequest{} } func (m *GetRequest) String() string { return proto.CompactTextString(m) } func (*GetRequest) ProtoMessage() {} func (*GetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{5} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{5} } func (m *GetRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRequest.Unmarshal(m, b) @@ -439,7 +437,7 @@ func (m *ListRequest) Reset() { *m = ListRequest{} } func (m *ListRequest) String() string { return proto.CompactTextString(m) } func (*ListRequest) ProtoMessage() {} func (*ListRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{6} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{6} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListRequest.Unmarshal(m, b) @@ -512,7 +510,7 @@ func (m *PutResponse) Reset() { *m = PutResponse{} } func (m *PutResponse) String() string { return proto.CompactTextString(m) } func (*PutResponse) ProtoMessage() {} func (*PutResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{7} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{7} } func (m *PutResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PutResponse.Unmarshal(m, b) @@ -547,7 +545,7 @@ func (m *GetResponse) Reset() { *m = GetResponse{} } func (m *GetResponse) String() string { return proto.CompactTextString(m) } func (*GetResponse) ProtoMessage() {} func (*GetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{8} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{8} } func (m *GetResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetResponse.Unmarshal(m, b) @@ -608,7 +606,7 @@ func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{9} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{9} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListResponse.Unmarshal(m, b) @@ -655,7 +653,7 @@ func (m *ListResponse_Item) Reset() { *m = ListResponse_Item{} } func (m *ListResponse_Item) String() string { return proto.CompactTextString(m) } func (*ListResponse_Item) ProtoMessage() {} func (*ListResponse_Item) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{9, 0} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{9, 0} } func (m *ListResponse_Item) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListResponse_Item.Unmarshal(m, b) @@ -707,7 +705,7 @@ func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{10} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{10} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteRequest.Unmarshal(m, b) @@ -745,7 +743,7 @@ func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{11} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{11} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteResponse.Unmarshal(m, b) @@ -780,7 +778,7 @@ func (m *IterateRequest) Reset() { *m = IterateRequest{} } func (m *IterateRequest) String() string { return proto.CompactTextString(m) } func (*IterateRequest) ProtoMessage() {} func (*IterateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{12} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{12} } func (m *IterateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IterateRequest.Unmarshal(m, b) @@ -839,7 +837,7 @@ func (m *PayerBandwidthAllocationRequest) Reset() { *m = PayerBandwidthA func (m *PayerBandwidthAllocationRequest) String() string { return proto.CompactTextString(m) } func (*PayerBandwidthAllocationRequest) ProtoMessage() {} func (*PayerBandwidthAllocationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{13} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{13} } func (m *PayerBandwidthAllocationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PayerBandwidthAllocationRequest.Unmarshal(m, b) @@ -877,7 +875,7 @@ func (m *PayerBandwidthAllocationResponse) Reset() { *m = PayerBandwidth func (m *PayerBandwidthAllocationResponse) String() string { return proto.CompactTextString(m) } func (*PayerBandwidthAllocationResponse) ProtoMessage() {} func (*PayerBandwidthAllocationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_pointerdb_b7facd921d32685d, []int{14} + return fileDescriptor_pointerdb_21b4d7ef3abc5ac1, []int{14} } func (m *PayerBandwidthAllocationResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PayerBandwidthAllocationResponse.Unmarshal(m, b) @@ -933,9 +931,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// PointerDBClient is the client API for PointerDB service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for PointerDB service + type PointerDBClient interface { // Put formats and hands off a file path to be saved to boltdb Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error) @@ -1002,7 +999,8 @@ func (c *pointerDBClient) PayerBandwidthAllocation(ctx context.Context, in *Paye return out, nil } -// PointerDBServer is the server API for PointerDB service. +// Server API for PointerDB service + type PointerDBServer interface { // Put formats and hands off a file path to be saved to boltdb Put(context.Context, *PutRequest) (*PutResponse, error) @@ -1139,9 +1137,9 @@ var _PointerDB_serviceDesc = grpc.ServiceDesc{ Metadata: "pointerdb.proto", } -func init() { proto.RegisterFile("pointerdb.proto", fileDescriptor_pointerdb_b7facd921d32685d) } +func init() { proto.RegisterFile("pointerdb.proto", fileDescriptor_pointerdb_21b4d7ef3abc5ac1) } -var fileDescriptor_pointerdb_b7facd921d32685d = []byte{ +var fileDescriptor_pointerdb_21b4d7ef3abc5ac1 = []byte{ // 1092 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5d, 0x6f, 0x1b, 0x45, 0x17, 0xae, 0xbf, 0xe3, 0xb3, 0x76, 0xea, 0x77, 0xd4, 0x37, 0xdd, 0xba, 0x45, 0x09, 0x8b, 0x80, diff --git a/pkg/pb/streams.pb.go b/pkg/pb/streams.pb.go index a181c2f35..e9af1456f 100644 --- a/pkg/pb/streams.pb.go +++ b/pkg/pb/streams.pb.go @@ -30,7 +30,7 @@ func (m *SegmentMeta) Reset() { *m = SegmentMeta{} } func (m *SegmentMeta) String() string { return proto.CompactTextString(m) } func (*SegmentMeta) ProtoMessage() {} func (*SegmentMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_streams_2b972859339b7bc3, []int{0} + return fileDescriptor_streams_c0d9754174b032dc, []int{0} } func (m *SegmentMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SegmentMeta.Unmarshal(m, b) @@ -78,7 +78,7 @@ func (m *StreamInfo) Reset() { *m = StreamInfo{} } func (m *StreamInfo) String() string { return proto.CompactTextString(m) } func (*StreamInfo) ProtoMessage() {} func (*StreamInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_streams_2b972859339b7bc3, []int{1} + return fileDescriptor_streams_c0d9754174b032dc, []int{1} } func (m *StreamInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamInfo.Unmarshal(m, b) @@ -140,7 +140,7 @@ func (m *StreamMeta) Reset() { *m = StreamMeta{} } func (m *StreamMeta) String() string { return proto.CompactTextString(m) } func (*StreamMeta) ProtoMessage() {} func (*StreamMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_streams_2b972859339b7bc3, []int{2} + return fileDescriptor_streams_c0d9754174b032dc, []int{2} } func (m *StreamMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamMeta.Unmarshal(m, b) @@ -194,9 +194,9 @@ func init() { proto.RegisterType((*StreamMeta)(nil), "streams.StreamMeta") } -func init() { proto.RegisterFile("streams.proto", fileDescriptor_streams_2b972859339b7bc3) } +func init() { proto.RegisterFile("streams.proto", fileDescriptor_streams_c0d9754174b032dc) } -var fileDescriptor_streams_2b972859339b7bc3 = []byte{ +var fileDescriptor_streams_c0d9754174b032dc = []byte{ // 304 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x51, 0xcb, 0x4e, 0xc3, 0x30, 0x10, 0x54, 0x5f, 0x50, 0xb6, 0x29, 0x05, 0x03, 0x52, 0x04, 0x17, 0x14, 0x0e, 0x20, 0x84, 0x7a, diff --git a/pkg/statdb/proto/statdb.pb.go b/pkg/statdb/proto/statdb.pb.go index 633cde1fb..911bf5b2a 100644 --- a/pkg/statdb/proto/statdb.pb.go +++ b/pkg/statdb/proto/statdb.pb.go @@ -8,10 +8,8 @@ import fmt "fmt" import math "math" import _ "github.com/gogo/protobuf/gogoproto" -import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" -) +import context "golang.org/x/net/context" +import grpc "google.golang.org/grpc" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -37,7 +35,7 @@ func (m *CreateRequest) Reset() { *m = CreateRequest{} } func (m *CreateRequest) String() string { return proto.CompactTextString(m) } func (*CreateRequest) ProtoMessage() {} func (*CreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{0} + return fileDescriptor_statdb_99e851656c5814ac, []int{0} } func (m *CreateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateRequest.Unmarshal(m, b) @@ -83,7 +81,7 @@ func (m *CreateResponse) Reset() { *m = CreateResponse{} } func (m *CreateResponse) String() string { return proto.CompactTextString(m) } func (*CreateResponse) ProtoMessage() {} func (*CreateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{1} + return fileDescriptor_statdb_99e851656c5814ac, []int{1} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateResponse.Unmarshal(m, b) @@ -122,7 +120,7 @@ func (m *GetRequest) Reset() { *m = GetRequest{} } func (m *GetRequest) String() string { return proto.CompactTextString(m) } func (*GetRequest) ProtoMessage() {} func (*GetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{2} + return fileDescriptor_statdb_99e851656c5814ac, []int{2} } func (m *GetRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetRequest.Unmarshal(m, b) @@ -154,7 +152,7 @@ func (m *GetResponse) Reset() { *m = GetResponse{} } func (m *GetResponse) String() string { return proto.CompactTextString(m) } func (*GetResponse) ProtoMessage() {} func (*GetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{3} + return fileDescriptor_statdb_99e851656c5814ac, []int{3} } func (m *GetResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetResponse.Unmarshal(m, b) @@ -194,7 +192,7 @@ func (m *FindValidNodesRequest) Reset() { *m = FindValidNodesRequest{} } func (m *FindValidNodesRequest) String() string { return proto.CompactTextString(m) } func (*FindValidNodesRequest) ProtoMessage() {} func (*FindValidNodesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{4} + return fileDescriptor_statdb_99e851656c5814ac, []int{4} } func (m *FindValidNodesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindValidNodesRequest.Unmarshal(m, b) @@ -234,7 +232,7 @@ func (m *FindValidNodesResponse) Reset() { *m = FindValidNodesResponse{} func (m *FindValidNodesResponse) String() string { return proto.CompactTextString(m) } func (*FindValidNodesResponse) ProtoMessage() {} func (*FindValidNodesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{5} + return fileDescriptor_statdb_99e851656c5814ac, []int{5} } func (m *FindValidNodesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FindValidNodesResponse.Unmarshal(m, b) @@ -266,7 +264,7 @@ func (m *UpdateRequest) Reset() { *m = UpdateRequest{} } func (m *UpdateRequest) String() string { return proto.CompactTextString(m) } func (*UpdateRequest) ProtoMessage() {} func (*UpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{6} + return fileDescriptor_statdb_99e851656c5814ac, []int{6} } func (m *UpdateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateRequest.Unmarshal(m, b) @@ -305,7 +303,7 @@ func (m *UpdateResponse) Reset() { *m = UpdateResponse{} } func (m *UpdateResponse) String() string { return proto.CompactTextString(m) } func (*UpdateResponse) ProtoMessage() {} func (*UpdateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{7} + return fileDescriptor_statdb_99e851656c5814ac, []int{7} } func (m *UpdateResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateResponse.Unmarshal(m, b) @@ -344,7 +342,7 @@ func (m *UpdateUptimeRequest) Reset() { *m = UpdateUptimeRequest{} } func (m *UpdateUptimeRequest) String() string { return proto.CompactTextString(m) } func (*UpdateUptimeRequest) ProtoMessage() {} func (*UpdateUptimeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{8} + return fileDescriptor_statdb_99e851656c5814ac, []int{8} } func (m *UpdateUptimeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUptimeRequest.Unmarshal(m, b) @@ -383,7 +381,7 @@ func (m *UpdateUptimeResponse) Reset() { *m = UpdateUptimeResponse{} } func (m *UpdateUptimeResponse) String() string { return proto.CompactTextString(m) } func (*UpdateUptimeResponse) ProtoMessage() {} func (*UpdateUptimeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{9} + return fileDescriptor_statdb_99e851656c5814ac, []int{9} } func (m *UpdateUptimeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUptimeResponse.Unmarshal(m, b) @@ -422,7 +420,7 @@ func (m *UpdateAuditSuccessRequest) Reset() { *m = UpdateAuditSuccessReq func (m *UpdateAuditSuccessRequest) String() string { return proto.CompactTextString(m) } func (*UpdateAuditSuccessRequest) ProtoMessage() {} func (*UpdateAuditSuccessRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{10} + return fileDescriptor_statdb_99e851656c5814ac, []int{10} } func (m *UpdateAuditSuccessRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateAuditSuccessRequest.Unmarshal(m, b) @@ -461,7 +459,7 @@ func (m *UpdateAuditSuccessResponse) Reset() { *m = UpdateAuditSuccessRe func (m *UpdateAuditSuccessResponse) String() string { return proto.CompactTextString(m) } func (*UpdateAuditSuccessResponse) ProtoMessage() {} func (*UpdateAuditSuccessResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{11} + return fileDescriptor_statdb_99e851656c5814ac, []int{11} } func (m *UpdateAuditSuccessResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateAuditSuccessResponse.Unmarshal(m, b) @@ -500,7 +498,7 @@ func (m *UpdateBatchRequest) Reset() { *m = UpdateBatchRequest{} } func (m *UpdateBatchRequest) String() string { return proto.CompactTextString(m) } func (*UpdateBatchRequest) ProtoMessage() {} func (*UpdateBatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{12} + return fileDescriptor_statdb_99e851656c5814ac, []int{12} } func (m *UpdateBatchRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateBatchRequest.Unmarshal(m, b) @@ -540,7 +538,7 @@ func (m *UpdateBatchResponse) Reset() { *m = UpdateBatchResponse{} } func (m *UpdateBatchResponse) String() string { return proto.CompactTextString(m) } func (*UpdateBatchResponse) ProtoMessage() {} func (*UpdateBatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{13} + return fileDescriptor_statdb_99e851656c5814ac, []int{13} } func (m *UpdateBatchResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateBatchResponse.Unmarshal(m, b) @@ -586,7 +584,7 @@ func (m *CreateEntryIfNotExistsRequest) Reset() { *m = CreateEntryIfNotE func (m *CreateEntryIfNotExistsRequest) String() string { return proto.CompactTextString(m) } func (*CreateEntryIfNotExistsRequest) ProtoMessage() {} func (*CreateEntryIfNotExistsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{14} + return fileDescriptor_statdb_99e851656c5814ac, []int{14} } func (m *CreateEntryIfNotExistsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateEntryIfNotExistsRequest.Unmarshal(m, b) @@ -625,7 +623,7 @@ func (m *CreateEntryIfNotExistsResponse) Reset() { *m = CreateEntryIfNot func (m *CreateEntryIfNotExistsResponse) String() string { return proto.CompactTextString(m) } func (*CreateEntryIfNotExistsResponse) ProtoMessage() {} func (*CreateEntryIfNotExistsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_statdb_1131c2a7357160d1, []int{15} + return fileDescriptor_statdb_99e851656c5814ac, []int{15} } func (m *CreateEntryIfNotExistsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateEntryIfNotExistsResponse.Unmarshal(m, b) @@ -679,9 +677,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// StatDBClient is the client API for StatDB service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for StatDB service + type StatDBClient interface { // Create a db entry for the provided storagenode ID Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) @@ -781,7 +778,8 @@ func (c *statDBClient) CreateEntryIfNotExists(ctx context.Context, in *CreateEnt return out, nil } -// StatDBServer is the server API for StatDB service. +// Server API for StatDB service + type StatDBServer interface { // Create a db entry for the provided storagenode ID Create(context.Context, *CreateRequest) (*CreateResponse, error) @@ -990,9 +988,9 @@ var _StatDB_serviceDesc = grpc.ServiceDesc{ Metadata: "statdb.proto", } -func init() { proto.RegisterFile("statdb.proto", fileDescriptor_statdb_1131c2a7357160d1) } +func init() { proto.RegisterFile("statdb.proto", fileDescriptor_statdb_99e851656c5814ac) } -var fileDescriptor_statdb_1131c2a7357160d1 = []byte{ +var fileDescriptor_statdb_99e851656c5814ac = []byte{ // 569 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xdd, 0x6a, 0x13, 0x41, 0x14, 0x36, 0x6d, 0xdd, 0x36, 0x27, 0xdb, 0x08, 0x53, 0x1b, 0xea, 0xd4, 0xa6, 0xba, 0x10, 0x6d,