diff --git a/protos/node/node.pb.go b/protos/node/node.pb.go index 4019514..a6bfa30 100644 --- a/protos/node/node.pb.go +++ b/protos/node/node.pb.go @@ -56,9 +56,10 @@ type Node struct { PeersConnected uint64 `protobuf:"varint,23,opt,name=peers_connected,json=peersConnected,proto3" json:"peers_connected,omitempty" pg:"peers_connected"` TimeCreated time.Time `protobuf:"bytes,24,opt,name=time_created,json=timeCreated,proto3,stdtime" json:"time_created" pg:"time_created"` HVal string `protobuf:"bytes,25,opt,name=h_val,json=hVal,proto3" json:"h_val,omitempty" pg:"h_val"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` + Node_Geo `protobuf:"bytes,26,opt,name=geo,proto3,embedded=geo" json:"geo" pg:"geo"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` } func (m *Node) Reset() { *m = Node{} } @@ -348,68 +349,150 @@ func (m *Node_Settings) GetCollateralStake() uint64 { func (*Node_Settings) XXX_MessageName() string { return "node.Node.Settings" } + +type Node_Geo struct { + CountryShort string `protobuf:"bytes,1,opt,name=country_short,json=countryShort,proto3" json:"country_short,omitempty" pg:"country_short"` + Region string `protobuf:"bytes,2,opt,name=region,proto3" json:"region,omitempty" pg:"region"` + Latitude float32 `protobuf:"fixed32,3,opt,name=latitude,proto3" json:"latitude,omitempty" pg:"latitude"` + Longitude float32 `protobuf:"fixed32,4,opt,name=longitude,proto3" json:"longitude,omitempty" pg:"longitude"` + XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` + XXX_unrecognized []byte `json:"-" pg:"-"` + XXX_sizecache int32 `json:"-" pg:"-"` +} + +func (m *Node_Geo) Reset() { *m = Node_Geo{} } +func (m *Node_Geo) String() string { return proto.CompactTextString(m) } +func (*Node_Geo) ProtoMessage() {} +func (*Node_Geo) Descriptor() ([]byte, []int) { + return fileDescriptor_35f8e1f5ec2240a2, []int{0, 1} +} +func (m *Node_Geo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Node_Geo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Node_Geo.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Node_Geo) XXX_Merge(src proto.Message) { + xxx_messageInfo_Node_Geo.Merge(m, src) +} +func (m *Node_Geo) XXX_Size() int { + return m.Size() +} +func (m *Node_Geo) XXX_DiscardUnknown() { + xxx_messageInfo_Node_Geo.DiscardUnknown(m) +} + +var xxx_messageInfo_Node_Geo proto.InternalMessageInfo + +func (m *Node_Geo) GetCountryShort() string { + if m != nil { + return m.CountryShort + } + return "" +} + +func (m *Node_Geo) GetRegion() string { + if m != nil { + return m.Region + } + return "" +} + +func (m *Node_Geo) GetLatitude() float32 { + if m != nil { + return m.Latitude + } + return 0 +} + +func (m *Node_Geo) GetLongitude() float32 { + if m != nil { + return m.Longitude + } + return 0 +} + +func (*Node_Geo) XXX_MessageName() string { + return "node.Node.Geo" +} func init() { proto.RegisterType((*Node)(nil), "node.Node") golang_proto.RegisterType((*Node)(nil), "node.Node") proto.RegisterType((*Node_Settings)(nil), "node.Node.Settings") golang_proto.RegisterType((*Node_Settings)(nil), "node.Node.Settings") + proto.RegisterType((*Node_Geo)(nil), "node.Node.Geo") + golang_proto.RegisterType((*Node_Geo)(nil), "node.Node.Geo") } func init() { proto.RegisterFile("protos/node/node.proto", fileDescriptor_35f8e1f5ec2240a2) } func init() { golang_proto.RegisterFile("protos/node/node.proto", fileDescriptor_35f8e1f5ec2240a2) } var fileDescriptor_35f8e1f5ec2240a2 = []byte{ - // 788 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x54, 0x4f, 0x6f, 0x23, 0x35, - 0x14, 0xc7, 0x4b, 0x36, 0x4d, 0x9c, 0x6e, 0xda, 0xba, 0x4b, 0xd7, 0x1b, 0xa4, 0xa4, 0x54, 0x42, - 0x04, 0x54, 0xa6, 0x0b, 0x88, 0x03, 0x2b, 0x71, 0xa0, 0x5d, 0x09, 0xad, 0x04, 0xab, 0x6a, 0xb6, - 0xed, 0x81, 0x8b, 0xe5, 0xcc, 0x38, 0x89, 0x95, 0x19, 0xdb, 0x1a, 0x7b, 0x5a, 0xf5, 0x43, 0x20, - 0x71, 0xe4, 0xe3, 0x70, 0xec, 0x71, 0x3f, 0x41, 0x81, 0x96, 0x4f, 0xc0, 0x89, 0x23, 0x7a, 0xcf, - 0xf9, 0xd7, 0xbd, 0x44, 0xe3, 0xdf, 0xef, 0xf7, 0x5e, 0xfc, 0xde, 0xfb, 0x3d, 0xd3, 0x3d, 0x57, - 0xd9, 0x60, 0xfd, 0x91, 0xb1, 0xb9, 0xc2, 0x9f, 0x04, 0x01, 0xd6, 0x80, 0xef, 0xde, 0x8b, 0x89, - 0x0e, 0xd3, 0x7a, 0x94, 0x64, 0xb6, 0x3c, 0x0a, 0x95, 0x35, 0x5f, 0xd6, 0xfe, 0x08, 0xf9, 0x51, - 0x3d, 0x3e, 0x9a, 0xd8, 0x89, 0xc5, 0x03, 0x7e, 0xc5, 0xb8, 0xde, 0x60, 0x62, 0xed, 0xa4, 0x50, - 0x2b, 0x55, 0xd0, 0xa5, 0xf2, 0x41, 0x96, 0x2e, 0x0a, 0x0e, 0x7e, 0x6d, 0xd3, 0xc6, 0x1b, 0x9b, - 0x2b, 0x76, 0x46, 0x69, 0x90, 0xa3, 0x42, 0x09, 0x23, 0x4b, 0xc5, 0xc9, 0x3e, 0x19, 0xb6, 0x8f, - 0xbf, 0xfd, 0xf7, 0x76, 0xf0, 0x95, 0x9b, 0xbc, 0x3c, 0x80, 0x7f, 0x17, 0xa5, 0x0a, 0x95, 0xce, - 0xfc, 0xa1, 0x2c, 0xb4, 0xf4, 0x2f, 0xc3, 0x61, 0xae, 0x7d, 0x26, 0xab, 0x5c, 0xd4, 0x66, 0x66, - 0xec, 0x95, 0x11, 0x99, 0x2d, 0xea, 0xd2, 0xf8, 0x83, 0xb4, 0x8d, 0x89, 0xde, 0xc8, 0x52, 0xb1, - 0x67, 0x74, 0x03, 0x63, 0x75, 0xce, 0x1f, 0x41, 0xca, 0xb4, 0x09, 0xc7, 0xd7, 0x39, 0xfb, 0x84, - 0x6e, 0x8e, 0xc2, 0xd8, 0x8b, 0x4b, 0x55, 0x79, 0x6d, 0x0d, 0xff, 0x10, 0xd9, 0x0e, 0x60, 0x17, - 0x11, 0x82, 0xd8, 0xda, 0x09, 0xb8, 0x30, 0x6f, 0xec, 0x93, 0x61, 0x23, 0x6d, 0xd6, 0xee, 0x4c, - 0x97, 0x0a, 0x62, 0x7d, 0xb0, 0x95, 0x9c, 0x28, 0x51, 0x7b, 0x95, 0xf3, 0xc7, 0xc8, 0x76, 0xe6, - 0xd8, 0xb9, 0x57, 0x39, 0x3b, 0xa4, 0x6c, 0x21, 0xb9, 0x84, 0x6b, 0x29, 0x91, 0x49, 0xc7, 0x9b, - 0x28, 0xdc, 0x9e, 0x33, 0x17, 0x48, 0x9c, 0x48, 0xc7, 0x06, 0xb4, 0x53, 0xaa, 0xd2, 0x56, 0xd7, - 0x31, 0xdf, 0x06, 0xca, 0x68, 0x84, 0x30, 0xdd, 0x73, 0xda, 0xca, 0x5c, 0x1d, 0xd9, 0xd6, 0x3e, - 0x19, 0x92, 0x74, 0x23, 0x73, 0x35, 0x52, 0x7b, 0xb4, 0x59, 0xbb, 0xc2, 0xca, 0x9c, 0xb7, 0x17, - 0x97, 0x84, 0x13, 0xeb, 0xd1, 0x56, 0x6e, 0xaf, 0x0c, 0x32, 0x14, 0x99, 0xe5, 0x19, 0x0a, 0x08, - 0x36, 0xc8, 0x42, 0xcc, 0x23, 0x3b, 0xb1, 0x00, 0xc4, 0xce, 0x63, 0xf8, 0xa7, 0xb4, 0x1b, 0x25, - 0xcb, 0x24, 0x9b, 0x28, 0x7a, 0x82, 0xe8, 0xab, 0x45, 0xa6, 0xb5, 0x3a, 0x5d, 0xa5, 0x33, 0x25, - 0x72, 0x25, 0x0b, 0xfe, 0xe4, 0x41, 0x9d, 0xa7, 0x40, 0xbc, 0x52, 0xb2, 0x60, 0x2f, 0xe8, 0xd3, - 0x91, 0x34, 0xf9, 0x95, 0xce, 0xc3, 0x74, 0x5d, 0xdf, 0x45, 0x3d, 0x5b, 0x72, 0xab, 0x88, 0xef, - 0x68, 0xcb, 0xab, 0x10, 0xb4, 0x99, 0x78, 0xbe, 0xb5, 0x4f, 0x86, 0x9d, 0xaf, 0x77, 0x13, 0xb4, - 0x25, 0x78, 0x26, 0x79, 0x3b, 0xa7, 0x8e, 0x5b, 0x37, 0xb7, 0x83, 0x0f, 0xde, 0xdd, 0x0e, 0x48, - 0xba, 0x94, 0xb3, 0x3e, 0xa5, 0x95, 0x72, 0x75, 0x90, 0x01, 0xe6, 0xbb, 0x8d, 0x5d, 0x5b, 0x43, - 0xd8, 0xc7, 0xb4, 0x3d, 0x2a, 0x6c, 0x36, 0xf3, 0xa2, 0x76, 0x7c, 0x27, 0x76, 0x28, 0x02, 0xe7, - 0x38, 0x91, 0x39, 0x09, 0xf5, 0x73, 0x16, 0x27, 0x12, 0x21, 0x28, 0x1e, 0xcc, 0x61, 0xbd, 0x08, - 0xd7, 0x4e, 0xf1, 0xdd, 0x68, 0x2c, 0xeb, 0xcf, 0xae, 0x9d, 0x82, 0xb4, 0xb2, 0xca, 0xa6, 0x91, - 0x7a, 0x8a, 0x54, 0x0b, 0x00, 0x24, 0xe7, 0x73, 0xd4, 0x66, 0x6c, 0xf9, 0x47, 0xc8, 0xc1, 0x1c, - 0x5f, 0x9b, 0xb1, 0x5d, 0x39, 0xd5, 0xf1, 0xbd, 0x35, 0xa7, 0x3a, 0xf6, 0x19, 0xdd, 0x72, 0x4a, - 0x55, 0x5e, 0x64, 0xd6, 0x18, 0x95, 0x05, 0x95, 0xf3, 0x67, 0x78, 0x9d, 0x2e, 0xc2, 0x27, 0x0b, - 0x94, 0xfd, 0x48, 0x37, 0xc1, 0xac, 0x22, 0xab, 0x94, 0x04, 0x15, 0xc7, 0x7e, 0xf5, 0x92, 0xb8, - 0x82, 0xc9, 0x62, 0x05, 0x93, 0xb3, 0xc5, 0x0a, 0xc6, 0xb6, 0xfd, 0xf6, 0xe7, 0x80, 0xa4, 0x1d, - 0x88, 0x3c, 0x89, 0x81, 0x6c, 0x97, 0x3e, 0x9e, 0x8a, 0x4b, 0x59, 0xf0, 0xe7, 0x78, 0x91, 0xc6, - 0xf4, 0x42, 0x16, 0xbd, 0x7f, 0x08, 0x6d, 0x2d, 0xfa, 0xcd, 0xbe, 0xa0, 0x3b, 0x0f, 0xc7, 0x2e, - 0xfd, 0x0c, 0x77, 0xb6, 0x91, 0x6e, 0xad, 0x4f, 0xfd, 0x07, 0x3f, 0x63, 0x09, 0xdd, 0x7d, 0x7f, - 0xe8, 0xa0, 0x7e, 0x84, 0xea, 0x9d, 0x87, 0x33, 0x07, 0xfd, 0x90, 0x2e, 0x8c, 0x83, 0xbb, 0x27, - 0x4a, 0x1d, 0xb7, 0xb3, 0x91, 0x76, 0xe7, 0x38, 0x14, 0xf0, 0xb3, 0x36, 0xd0, 0x99, 0x55, 0xe6, - 0x42, 0x97, 0x3a, 0xe0, 0xa2, 0x92, 0xb4, 0xbb, 0x84, 0x7f, 0x02, 0x94, 0x7d, 0x4e, 0xb7, 0x33, - 0x5b, 0x14, 0x32, 0xa8, 0x4a, 0x16, 0xc2, 0x07, 0x39, 0x53, 0xf3, 0xa5, 0xdd, 0x5a, 0xe1, 0x6f, - 0x01, 0x3e, 0xfe, 0xfe, 0xbf, 0xbf, 0xfb, 0xe4, 0xe6, 0xae, 0x4f, 0xde, 0xdd, 0xf5, 0xc9, 0x5f, - 0x77, 0x7d, 0xf2, 0xfb, 0x7d, 0x9f, 0xfc, 0x71, 0xdf, 0x27, 0x37, 0xf7, 0x7d, 0x42, 0x37, 0xb5, - 0x4d, 0xe0, 0x89, 0x40, 0x0f, 0x1e, 0xb7, 0xc1, 0x84, 0xa7, 0xd0, 0xd6, 0x53, 0xf2, 0x0b, 0xbe, - 0x90, 0xa3, 0x26, 0x76, 0xf9, 0x9b, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xf9, 0x11, 0x56, - 0x48, 0x05, 0x00, 0x00, + // 869 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x54, 0xcd, 0x6e, 0x23, 0x45, + 0x10, 0x66, 0x12, 0xaf, 0x63, 0xb7, 0x1d, 0x27, 0xe9, 0x2c, 0xd9, 0x59, 0x83, 0xec, 0x10, 0x84, + 0x30, 0xab, 0x30, 0x59, 0x40, 0x1c, 0x58, 0x89, 0x03, 0xc9, 0x4a, 0xd1, 0x4a, 0xb0, 0x8a, 0x26, + 0x3f, 0x07, 0x2e, 0xad, 0xf6, 0x4c, 0x67, 0xdc, 0xf2, 0x4c, 0x77, 0x6b, 0xba, 0x27, 0x51, 0x24, + 0x1e, 0x82, 0x23, 0x6f, 0xc2, 0x95, 0x63, 0x8e, 0xfb, 0x04, 0x01, 0x12, 0x9e, 0x80, 0x13, 0x47, + 0x54, 0xd5, 0xe3, 0x9f, 0xec, 0xc5, 0x9a, 0xfe, 0xbe, 0xaf, 0xca, 0x5d, 0x55, 0x5f, 0x35, 0xd9, + 0x31, 0xa5, 0x76, 0xda, 0x1e, 0x28, 0x9d, 0x0a, 0xfc, 0x89, 0x10, 0xa0, 0x0d, 0xf8, 0xee, 0xbf, + 0xcc, 0xa4, 0x9b, 0x54, 0xe3, 0x28, 0xd1, 0xc5, 0x81, 0x2b, 0xb5, 0xfa, 0xb2, 0xb2, 0x07, 0xc8, + 0x8f, 0xab, 0xcb, 0x83, 0x4c, 0x67, 0x1a, 0x0f, 0xf8, 0xe5, 0xe3, 0xfa, 0xc3, 0x4c, 0xeb, 0x2c, + 0x17, 0x0b, 0x95, 0x93, 0x85, 0xb0, 0x8e, 0x17, 0xc6, 0x0b, 0xf6, 0x7e, 0x27, 0xa4, 0xf1, 0x56, + 0xa7, 0x82, 0x9e, 0x11, 0xe2, 0xf8, 0x38, 0x17, 0x4c, 0xf1, 0x42, 0x84, 0xc1, 0x6e, 0x30, 0x6a, + 0x1f, 0x7e, 0xfb, 0xef, 0xdd, 0xf0, 0x2b, 0x93, 0xbd, 0xda, 0x83, 0x7f, 0x67, 0x85, 0x70, 0xa5, + 0x4c, 0xec, 0x3e, 0xcf, 0x25, 0xb7, 0xaf, 0xdc, 0x7e, 0x2a, 0x6d, 0xc2, 0xcb, 0x94, 0x55, 0x6a, + 0xaa, 0xf4, 0xb5, 0x62, 0x89, 0xce, 0xab, 0x42, 0xd9, 0xbd, 0xb8, 0x8d, 0x89, 0xde, 0xf2, 0x42, + 0xd0, 0x67, 0x64, 0x0d, 0x63, 0x65, 0x1a, 0xae, 0x40, 0xca, 0xb8, 0x09, 0xc7, 0x37, 0x29, 0xfd, + 0x84, 0x74, 0xc7, 0xee, 0xd2, 0xb2, 0x2b, 0x51, 0x5a, 0xa9, 0x55, 0xb8, 0x8a, 0x6c, 0x07, 0xb0, + 0x0b, 0x0f, 0x41, 0x6c, 0x65, 0x18, 0x5c, 0x38, 0x6c, 0xec, 0x06, 0xa3, 0x46, 0xdc, 0xac, 0xcc, + 0x99, 0x2c, 0x04, 0xc4, 0x5a, 0xa7, 0x4b, 0x9e, 0x09, 0x56, 0x59, 0x91, 0x86, 0x4f, 0x90, 0xed, + 0xd4, 0xd8, 0xb9, 0x15, 0x29, 0xdd, 0x27, 0x74, 0x26, 0xb9, 0x82, 0x6b, 0x09, 0x96, 0x70, 0x13, + 0x36, 0x51, 0xb8, 0x59, 0x33, 0x17, 0x48, 0x1c, 0x71, 0x43, 0x87, 0xa4, 0x53, 0x88, 0x42, 0x97, + 0x37, 0x3e, 0xdf, 0x1a, 0xca, 0x88, 0x87, 0x30, 0xdd, 0x73, 0xd2, 0x4a, 0x4c, 0xe5, 0xd9, 0xd6, + 0x6e, 0x30, 0x0a, 0xe2, 0xb5, 0xc4, 0x54, 0x48, 0xed, 0x90, 0x66, 0x65, 0x72, 0xcd, 0xd3, 0xb0, + 0x3d, 0xbb, 0x24, 0x9c, 0x68, 0x9f, 0xb4, 0x52, 0x7d, 0xad, 0x90, 0x21, 0xc8, 0xcc, 0xcf, 0x50, + 0x80, 0xd3, 0x8e, 0xe7, 0xac, 0x8e, 0xec, 0xf8, 0x02, 0x10, 0x3b, 0xf7, 0xe1, 0x9f, 0x91, 0x9e, + 0x97, 0xcc, 0x93, 0x74, 0x51, 0xb4, 0x8e, 0xe8, 0xeb, 0x59, 0xa6, 0xa5, 0x3a, 0x4d, 0x29, 0x13, + 0xc1, 0x52, 0xc1, 0xf3, 0x70, 0xfd, 0x51, 0x9d, 0x27, 0x40, 0xbc, 0x16, 0x3c, 0xa7, 0x2f, 0xc9, + 0xd3, 0x31, 0x57, 0xe9, 0xb5, 0x4c, 0xdd, 0x64, 0x59, 0xdf, 0x43, 0x3d, 0x9d, 0x73, 0x8b, 0x88, + 0xef, 0x48, 0xcb, 0x0a, 0xe7, 0xa4, 0xca, 0x6c, 0xb8, 0xb1, 0x1b, 0x8c, 0x3a, 0x5f, 0x6f, 0x47, + 0x68, 0x4b, 0xf0, 0x4c, 0x74, 0x5a, 0x53, 0x87, 0xad, 0xdb, 0xbb, 0xe1, 0x07, 0xef, 0xee, 0x86, + 0x41, 0x3c, 0x97, 0xd3, 0x01, 0x21, 0xa5, 0x30, 0x95, 0xe3, 0x0e, 0xe6, 0xbb, 0x89, 0x5d, 0x5b, + 0x42, 0xe8, 0x47, 0xa4, 0x3d, 0xce, 0x75, 0x32, 0xb5, 0xac, 0x32, 0xe1, 0x96, 0xef, 0x90, 0x07, + 0xce, 0x71, 0x22, 0x35, 0x09, 0xf5, 0x87, 0xd4, 0x4f, 0xc4, 0x43, 0x50, 0x3c, 0x98, 0x43, 0x5b, + 0xe6, 0x6e, 0x8c, 0x08, 0xb7, 0xbd, 0xb1, 0xb4, 0x3d, 0xbb, 0x31, 0x02, 0xd2, 0xf2, 0x32, 0x99, + 0x78, 0xea, 0x29, 0x52, 0x2d, 0x00, 0x90, 0xac, 0xe7, 0x28, 0xd5, 0xa5, 0x0e, 0x3f, 0x44, 0x0e, + 0xe6, 0xf8, 0x46, 0x5d, 0xea, 0x85, 0x53, 0x4d, 0xb8, 0xb3, 0xe4, 0x54, 0x43, 0x3f, 0x27, 0x1b, + 0x46, 0x88, 0xd2, 0xb2, 0x44, 0x2b, 0x25, 0x12, 0x27, 0xd2, 0xf0, 0x19, 0x5e, 0xa7, 0x87, 0xf0, + 0xd1, 0x0c, 0xa5, 0xc7, 0xa4, 0x0b, 0x66, 0x65, 0x49, 0x29, 0x38, 0xa8, 0x42, 0xec, 0x57, 0x3f, + 0xf2, 0x2b, 0x18, 0xcd, 0x56, 0x30, 0x3a, 0x9b, 0xad, 0xa0, 0x6f, 0xdb, 0xaf, 0x7f, 0x0e, 0x83, + 0xb8, 0x03, 0x91, 0x47, 0x3e, 0x90, 0x6e, 0x93, 0x27, 0x13, 0x76, 0xc5, 0xf3, 0xf0, 0x39, 0x5e, + 0xa4, 0x31, 0xb9, 0xe0, 0x39, 0x7d, 0x41, 0x56, 0x33, 0xa1, 0xc3, 0x3e, 0x26, 0xed, 0x2d, 0x0d, + 0xe1, 0x58, 0xe8, 0xa5, 0xfe, 0x83, 0xa8, 0xff, 0x4f, 0x40, 0x5a, 0xb3, 0xd9, 0xd0, 0x17, 0x64, + 0xeb, 0xb1, 0x45, 0xb8, 0x9d, 0xe2, 0x7e, 0x37, 0xe2, 0x8d, 0x65, 0x87, 0xfc, 0x60, 0xa7, 0x34, + 0x22, 0xdb, 0xef, 0x1b, 0x04, 0xd4, 0x2b, 0xa8, 0xde, 0x7a, 0xec, 0x0f, 0xd0, 0x8f, 0xc8, 0xcc, + 0x64, 0xb8, 0xa7, 0xac, 0x90, 0x7e, 0x93, 0x1b, 0x71, 0xaf, 0xc6, 0xa1, 0xd8, 0x9f, 0xa4, 0x82, + 0x2e, 0x2e, 0x32, 0xe7, 0xb2, 0x90, 0x0e, 0x97, 0x3a, 0x88, 0x7b, 0x73, 0xf8, 0x47, 0x40, 0xe9, + 0x17, 0x64, 0x33, 0xd1, 0x79, 0xce, 0x9d, 0x28, 0x79, 0xce, 0xac, 0xe3, 0x53, 0x51, 0x2f, 0xf8, + 0xc6, 0x02, 0x3f, 0x05, 0xb8, 0xff, 0x0b, 0x59, 0x3d, 0x16, 0x9a, 0x7e, 0x4a, 0xd6, 0x13, 0x5d, + 0x29, 0x57, 0xde, 0x30, 0x3b, 0xd1, 0xa5, 0xf3, 0x8f, 0x57, 0xdc, 0xad, 0xc1, 0x53, 0xc0, 0x60, + 0x4d, 0x4b, 0x91, 0x81, 0x13, 0xeb, 0x77, 0xc8, 0x9f, 0x60, 0x4d, 0x73, 0xee, 0xa4, 0xab, 0x52, + 0x81, 0x37, 0x5f, 0x89, 0xe7, 0x67, 0xfa, 0x31, 0x69, 0xe7, 0x5a, 0x65, 0x9e, 0x6c, 0x20, 0xb9, + 0x00, 0x0e, 0xbf, 0xff, 0xef, 0xef, 0x41, 0x70, 0x7b, 0x3f, 0x08, 0xde, 0xdd, 0x0f, 0x82, 0xbf, + 0xee, 0x07, 0xc1, 0x6f, 0x0f, 0x83, 0xe0, 0x8f, 0x87, 0x41, 0x70, 0xfb, 0x30, 0x08, 0x48, 0x57, + 0xea, 0x08, 0x1e, 0x33, 0x1c, 0xd4, 0x61, 0x1b, 0x26, 0x75, 0x02, 0x06, 0x38, 0x09, 0x7e, 0xc6, + 0xb7, 0x7c, 0xdc, 0x44, 0x3f, 0x7c, 0xf3, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0xdd, 0x39, + 0x8a, 0xf2, 0x05, 0x00, 0x00, } func (m *Node) Marshal() (dAtA []byte, err error) { @@ -436,6 +519,18 @@ func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } + { + size, err := m.Node_Geo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintNode(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xd2 if len(m.HVal) > 0 { i -= len(m.HVal) copy(dAtA[i:], m.HVal) @@ -445,12 +540,12 @@ func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0xca } - n1, err1 := github_com_tron_us_protobuf_types.StdTimeMarshalTo(m.TimeCreated, dAtA[i-github_com_tron_us_protobuf_types.SizeOfStdTime(m.TimeCreated):]) - if err1 != nil { - return 0, err1 + n2, err2 := github_com_tron_us_protobuf_types.StdTimeMarshalTo(m.TimeCreated, dAtA[i-github_com_tron_us_protobuf_types.SizeOfStdTime(m.TimeCreated):]) + if err2 != nil { + return 0, err2 } - i -= n1 - i = encodeVarintNode(dAtA, i, uint64(n1)) + i -= n2 + i = encodeVarintNode(dAtA, i, uint64(n2)) i-- dAtA[i] = 0x1 i-- @@ -663,6 +758,59 @@ func (m *Node_Settings) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Node_Geo) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Node_Geo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Node_Geo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Longitude != 0 { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Longitude)))) + i-- + dAtA[i] = 0x25 + } + if m.Latitude != 0 { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Latitude)))) + i-- + dAtA[i] = 0x1d + } + if len(m.Region) > 0 { + i -= len(m.Region) + copy(dAtA[i:], m.Region) + i = encodeVarintNode(dAtA, i, uint64(len(m.Region))) + i-- + dAtA[i] = 0x12 + } + if len(m.CountryShort) > 0 { + i -= len(m.CountryShort) + copy(dAtA[i:], m.CountryShort) + i = encodeVarintNode(dAtA, i, uint64(len(m.CountryShort))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintNode(dAtA []byte, offset int, v uint64) int { offset -= sovNode(v) base := offset @@ -709,8 +857,10 @@ func NewPopulatedNode(r randyNode, easy bool) *Node { v2 := github_com_tron_us_protobuf_types.NewPopulatedStdTime(r, easy) this.TimeCreated = *v2 this.HVal = string(randStringNode(r)) + v3 := NewPopulatedNode_Geo(r, easy) + this.Node_Geo = *v3 if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedNode(r, 26) + this.XXX_unrecognized = randUnrecognizedNode(r, 27) } return this } @@ -731,6 +881,24 @@ func NewPopulatedNode_Settings(r randyNode, easy bool) *Node_Settings { return this } +func NewPopulatedNode_Geo(r randyNode, easy bool) *Node_Geo { + this := &Node_Geo{} + this.CountryShort = string(randStringNode(r)) + this.Region = string(randStringNode(r)) + this.Latitude = float32(r.Float32()) + if r.Intn(2) == 0 { + this.Latitude *= -1 + } + this.Longitude = float32(r.Float32()) + if r.Intn(2) == 0 { + this.Longitude *= -1 + } + if !easy && r.Intn(10) != 0 { + this.XXX_unrecognized = randUnrecognizedNode(r, 5) + } + return this +} + type randyNode interface { Float32() float32 Float64() float64 @@ -750,9 +918,9 @@ func randUTF8RuneNode(r randyNode) rune { return rune(ru + 61) } func randStringNode(r randyNode) string { - v3 := r.Intn(100) - tmps := make([]rune, v3) - for i := 0; i < v3; i++ { + v4 := r.Intn(100) + tmps := make([]rune, v4) + for i := 0; i < v4; i++ { tmps[i] = randUTF8RuneNode(r) } return string(tmps) @@ -774,11 +942,11 @@ func randFieldNode(dAtA []byte, r randyNode, fieldNumber int, wire int) []byte { switch wire { case 0: dAtA = encodeVarintPopulateNode(dAtA, uint64(key)) - v4 := r.Int63() + v5 := r.Int63() if r.Intn(2) == 0 { - v4 *= -1 + v5 *= -1 } - dAtA = encodeVarintPopulateNode(dAtA, uint64(v4)) + dAtA = encodeVarintPopulateNode(dAtA, uint64(v5)) case 1: dAtA = encodeVarintPopulateNode(dAtA, uint64(key)) dAtA = append(dAtA, byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256)), byte(r.Intn(256))) @@ -890,6 +1058,8 @@ func (m *Node) Size() (n int) { if l > 0 { n += 2 + l + sovNode(uint64(l)) } + l = m.Node_Geo.Size() + n += 2 + l + sovNode(uint64(l)) if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -923,6 +1093,32 @@ func (m *Node_Settings) Size() (n int) { return n } +func (m *Node_Geo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.CountryShort) + if l > 0 { + n += 1 + l + sovNode(uint64(l)) + } + l = len(m.Region) + if l > 0 { + n += 1 + l + sovNode(uint64(l)) + } + if m.Latitude != 0 { + n += 5 + } + if m.Longitude != 0 { + n += 5 + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func sovNode(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1549,6 +1745,39 @@ func (m *Node) Unmarshal(dAtA []byte) error { } m.HVal = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 26: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Node_Geo", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Node_Geo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipNode(dAtA[iNdEx:]) @@ -1715,6 +1944,146 @@ func (m *Node_Settings) Unmarshal(dAtA []byte) error { } return nil } +func (m *Node_Geo) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Geo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Geo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CountryShort", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CountryShort = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Region", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowNode + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthNode + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthNode + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Region = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 5 { + return fmt.Errorf("proto: wrong wireType = %d for field Latitude", wireType) + } + var v uint32 + if (iNdEx + 4) > l { + return io.ErrUnexpectedEOF + } + v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) + iNdEx += 4 + m.Latitude = float32(math.Float32frombits(v)) + case 4: + if wireType != 5 { + return fmt.Errorf("proto: wrong wireType = %d for field Longitude", wireType) + } + var v uint32 + if (iNdEx + 4) > l { + return io.ErrUnexpectedEOF + } + v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) + iNdEx += 4 + m.Longitude = float32(math.Float32frombits(v)) + default: + iNdEx = preIndex + skippy, err := skipNode(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthNode + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthNode + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipNode(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/protos/node/node.proto b/protos/node/node.proto index dfa9823..ec2f568 100644 --- a/protos/node/node.proto +++ b/protos/node/node.proto @@ -28,6 +28,12 @@ message Node { double bandwidth_limit = 4; uint64 collateral_stake = 5; } + message Geo { + string country_short = 1; + string region = 2; + float latitude = 3; + float longitude = 4; + } string table_name = 1 [(gogoproto.moretags) = "pg:\"node_metrics,alias:t,discard_unknown_columns\""]; string node_id = 2; string btfs_version = 3; @@ -59,4 +65,8 @@ message Node { (gogoproto.stdtime) = true ]; string h_val = 25; + Geo geo = 26 [ + (gogoproto.embed) = true, + (gogoproto.nullable) = false + ]; } diff --git a/protos/status/status.pb.go b/protos/status/status.pb.go index 94bb30a..61a67c6 100644 --- a/protos/status/status.pb.go +++ b/protos/status/status.pb.go @@ -5,7 +5,6 @@ package status import ( context "context" - encoding_binary "encoding/binary" fmt "fmt" types "github.com/gogo/protobuf/types" golang_proto "github.com/golang/protobuf/proto" @@ -266,113 +265,6 @@ func (m *NodeError) GetTimeCreated() time.Time { func (*NodeError) XXX_MessageName() string { return "status.NodeError" } - -type Ip2Location struct { - Ipv4 string `protobuf:"bytes,1,opt,name=ipv4,proto3" json:"ipv4,omitempty" pg:"ipv4"` - CountryShort string `protobuf:"bytes,2,opt,name=country_short,json=countryShort,proto3" json:"country_short,omitempty" pg:"country_short"` - CountryLong string `protobuf:"bytes,3,opt,name=country_long,json=countryLong,proto3" json:"country_long,omitempty" pg:"country_long"` - Region string `protobuf:"bytes,4,opt,name=region,proto3" json:"region,omitempty" pg:"region"` - City string `protobuf:"bytes,5,opt,name=city,proto3" json:"city,omitempty" pg:"city"` - Latitude float32 `protobuf:"fixed32,6,opt,name=latitude,proto3" json:"latitude,omitempty" pg:"latitude"` - Longitude float32 `protobuf:"fixed32,7,opt,name=longitude,proto3" json:"longitude,omitempty" pg:"longitude"` - Zipcode string `protobuf:"bytes,8,opt,name=zipcode,proto3" json:"zipcode,omitempty" pg:"zipcode"` - XXX_NoUnkeyedLiteral struct{} `json:"-" pg:"-"` - XXX_unrecognized []byte `json:"-" pg:"-"` - XXX_sizecache int32 `json:"-" pg:"-"` -} - -func (m *Ip2Location) Reset() { *m = Ip2Location{} } -func (m *Ip2Location) String() string { return proto.CompactTextString(m) } -func (*Ip2Location) ProtoMessage() {} -func (*Ip2Location) Descriptor() ([]byte, []int) { - return fileDescriptor_e9255cc60c5ca429, []int{3} -} -func (m *Ip2Location) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Ip2Location) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Ip2Location.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *Ip2Location) XXX_Merge(src proto.Message) { - xxx_messageInfo_Ip2Location.Merge(m, src) -} -func (m *Ip2Location) XXX_Size() int { - return m.Size() -} -func (m *Ip2Location) XXX_DiscardUnknown() { - xxx_messageInfo_Ip2Location.DiscardUnknown(m) -} - -var xxx_messageInfo_Ip2Location proto.InternalMessageInfo - -func (m *Ip2Location) GetIpv4() string { - if m != nil { - return m.Ipv4 - } - return "" -} - -func (m *Ip2Location) GetCountryShort() string { - if m != nil { - return m.CountryShort - } - return "" -} - -func (m *Ip2Location) GetCountryLong() string { - if m != nil { - return m.CountryLong - } - return "" -} - -func (m *Ip2Location) GetRegion() string { - if m != nil { - return m.Region - } - return "" -} - -func (m *Ip2Location) GetCity() string { - if m != nil { - return m.City - } - return "" -} - -func (m *Ip2Location) GetLatitude() float32 { - if m != nil { - return m.Latitude - } - return 0 -} - -func (m *Ip2Location) GetLongitude() float32 { - if m != nil { - return m.Longitude - } - return 0 -} - -func (m *Ip2Location) GetZipcode() string { - if m != nil { - return m.Zipcode - } - return "" -} - -func (*Ip2Location) XXX_MessageName() string { - return "status.Ip2Location" -} func init() { proto.RegisterType((*SignedMetrics)(nil), "status.SignedMetrics") golang_proto.RegisterType((*SignedMetrics)(nil), "status.SignedMetrics") @@ -380,59 +272,50 @@ func init() { golang_proto.RegisterType((*NodeHealth)(nil), "status.NodeHealth") proto.RegisterType((*NodeError)(nil), "status.NodeError") golang_proto.RegisterType((*NodeError)(nil), "status.NodeError") - proto.RegisterType((*Ip2Location)(nil), "status.Ip2Location") - golang_proto.RegisterType((*Ip2Location)(nil), "status.Ip2Location") } func init() { proto.RegisterFile("protos/status/status.proto", fileDescriptor_e9255cc60c5ca429) } func init() { golang_proto.RegisterFile("protos/status/status.proto", fileDescriptor_e9255cc60c5ca429) } var fileDescriptor_e9255cc60c5ca429 = []byte{ - // 706 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xcf, 0x6f, 0xd3, 0x30, - 0x14, 0xc6, 0x63, 0xeb, 0x16, 0xb7, 0x45, 0xc2, 0x88, 0x11, 0x15, 0x68, 0x47, 0xb9, 0xec, 0x30, - 0x5a, 0xd4, 0x21, 0x24, 0x86, 0x04, 0x52, 0xa7, 0x09, 0x26, 0xc6, 0x34, 0xa5, 0x30, 0x09, 0x2e, - 0x91, 0x9b, 0xbc, 0xa6, 0xd6, 0x12, 0x3b, 0x72, 0x9c, 0xa2, 0xf2, 0x57, 0xc0, 0x8d, 0x3f, 0x67, - 0x37, 0x76, 0xe4, 0x2f, 0x18, 0x68, 0x3b, 0x71, 0xdd, 0x8d, 0x1b, 0xb2, 0x9d, 0x6c, 0xfc, 0xda, - 0x01, 0x89, 0x0b, 0xa7, 0xe4, 0x7d, 0xef, 0x7d, 0xb6, 0xbf, 0xcf, 0xef, 0x19, 0x37, 0x52, 0x29, - 0x94, 0xc8, 0xba, 0x99, 0xa2, 0x2a, 0x2f, 0x3f, 0x1d, 0x03, 0x92, 0x8a, 0x8d, 0x1a, 0x77, 0x23, - 0xa6, 0xc6, 0xf9, 0xb0, 0x13, 0x88, 0xa4, 0xab, 0xa4, 0xe0, 0x77, 0xf2, 0xac, 0x6b, 0x2a, 0x86, - 0xf9, 0xa8, 0x1b, 0x89, 0x48, 0x98, 0xc0, 0xfc, 0x59, 0x66, 0xe3, 0x7a, 0x24, 0x44, 0x14, 0xc3, - 0x59, 0x15, 0x24, 0xa9, 0x9a, 0x16, 0xc9, 0xd6, 0xaf, 0x49, 0xc5, 0x12, 0xc8, 0x14, 0x4d, 0x52, - 0x5b, 0xd0, 0x1e, 0xe1, 0xfa, 0x80, 0x45, 0x1c, 0xc2, 0xe7, 0xa0, 0x24, 0x0b, 0x32, 0x72, 0x13, - 0xe3, 0x34, 0x1f, 0xc6, 0x2c, 0xf0, 0xf7, 0x60, 0xea, 0xa2, 0x25, 0xb4, 0x5c, 0xf3, 0x1c, 0x8b, - 0x3c, 0x83, 0x29, 0xb9, 0x81, 0x9d, 0x8c, 0x45, 0x9c, 0xaa, 0x5c, 0x82, 0x3b, 0x63, 0xb3, 0xa7, - 0x00, 0x71, 0xf1, 0x7c, 0x4a, 0xa7, 0xb1, 0xa0, 0xa1, 0x7b, 0xd1, 0xe4, 0xca, 0xb0, 0xfd, 0x7e, - 0x06, 0xe3, 0x6d, 0x11, 0xc2, 0x53, 0xa0, 0xb1, 0x1a, 0x93, 0x57, 0x18, 0x2b, 0x3a, 0x8c, 0xc1, - 0xe7, 0x34, 0x01, 0xb3, 0x8b, 0xd3, 0x5f, 0x3b, 0x39, 0x6c, 0xdd, 0x4f, 0xa3, 0xb5, 0xf6, 0xd8, - 0xd4, 0xf8, 0x89, 0xe0, 0x4c, 0x09, 0xc9, 0x78, 0xb4, 0x42, 0x63, 0x46, 0xb3, 0x35, 0xb5, 0x12, - 0xb2, 0x2c, 0xa0, 0x32, 0xf4, 0x73, 0xbe, 0xc7, 0xc5, 0x1b, 0xee, 0x07, 0x22, 0xce, 0x13, 0x9e, - 0xb5, 0x3d, 0xc7, 0xac, 0xb6, 0x4d, 0x13, 0x20, 0xd7, 0xf0, 0x3c, 0x17, 0x21, 0xf8, 0x2c, 0x34, - 0xe7, 0x73, 0xbc, 0x8a, 0x0e, 0x37, 0x43, 0x72, 0x0b, 0xd7, 0x86, 0x6a, 0x94, 0xf9, 0x13, 0x90, - 0x19, 0x13, 0xdc, 0x9c, 0xd0, 0xf1, 0xaa, 0x1a, 0xdb, 0xb5, 0x10, 0xb9, 0x8d, 0xeb, 0x23, 0xca, - 0xe2, 0x5c, 0x82, 0x9f, 0x0a, 0xc6, 0x95, 0x3b, 0x6b, 0x6a, 0x6a, 0x05, 0xb8, 0xa3, 0x31, 0xf2, - 0x04, 0xd7, 0xb4, 0x8b, 0x7e, 0x20, 0x81, 0x2a, 0x08, 0xdd, 0xb9, 0x25, 0xb4, 0x5c, 0xed, 0x35, - 0x3a, 0xd6, 0xea, 0x4e, 0x69, 0x75, 0xe7, 0x45, 0x69, 0x75, 0x7f, 0xe1, 0xe0, 0xb0, 0x75, 0xe1, - 0xdd, 0xe7, 0x16, 0xf2, 0xaa, 0x9a, 0xb9, 0x6e, 0x89, 0xed, 0x6f, 0x08, 0x3b, 0xda, 0x93, 0x0d, - 0x29, 0x85, 0x24, 0xde, 0x1f, 0x2c, 0x59, 0x3d, 0x39, 0x6c, 0x75, 0xb5, 0x25, 0x0a, 0x32, 0xe5, - 0x83, 0xae, 0xfb, 0x2b, 0x2f, 0xae, 0xe0, 0xb9, 0xb1, 0x3f, 0xa1, 0x71, 0xe1, 0xc4, 0xec, 0x78, - 0x97, 0xc6, 0xda, 0xa0, 0x14, 0x40, 0x6a, 0x83, 0xac, 0x05, 0x15, 0x1d, 0x5a, 0x83, 0xcc, 0x16, - 0xbe, 0xed, 0xc5, 0x42, 0x7c, 0xd5, 0x60, 0x03, 0x03, 0xfd, 0x3b, 0xed, 0x5f, 0x11, 0xae, 0x6e, - 0xa6, 0xbd, 0x2d, 0x11, 0x50, 0xa5, 0x9d, 0x27, 0x78, 0x96, 0xa5, 0x93, 0x7b, 0x56, 0xb7, 0x67, - 0xfe, 0xf5, 0x6d, 0x04, 0x22, 0xe7, 0x4a, 0x4e, 0xfd, 0x6c, 0x2c, 0xa4, 0x2a, 0x54, 0xd4, 0x0a, - 0x70, 0xa0, 0x31, 0x7d, 0xe8, 0xb2, 0x28, 0x16, 0x3c, 0x2a, 0x6f, 0xb5, 0xc0, 0xb6, 0x04, 0x8f, - 0xc8, 0x22, 0xae, 0x48, 0x88, 0xf4, 0x95, 0x5b, 0x45, 0x45, 0xa4, 0xf7, 0x0c, 0x98, 0x9a, 0x1a, - 0x11, 0x8e, 0x67, 0xfe, 0x49, 0x03, 0x2f, 0xc4, 0x54, 0x31, 0x95, 0x87, 0xe0, 0x56, 0x96, 0xd0, - 0xf2, 0x8c, 0x77, 0x1a, 0xeb, 0xde, 0xd7, 0x5b, 0xd8, 0xe4, 0xbc, 0x49, 0x9e, 0x01, 0xba, 0xf7, - 0xdf, 0xb2, 0x34, 0x10, 0x21, 0xb8, 0x0b, 0x66, 0xc1, 0x32, 0xec, 0xed, 0x23, 0x5c, 0x29, 0xfc, - 0x7b, 0x84, 0xeb, 0x2f, 0xd3, 0x90, 0x2a, 0x28, 0xc7, 0xed, 0x6a, 0xa7, 0x78, 0x06, 0x7e, 0x9a, - 0xc2, 0xc6, 0xe2, 0x6f, 0x8e, 0x6e, 0xe8, 0xa9, 0x26, 0x0f, 0x71, 0x7d, 0x5d, 0xc4, 0x31, 0x04, - 0xaa, 0x18, 0x24, 0x52, 0xf2, 0xcf, 0x86, 0xeb, 0x5c, 0xf2, 0x03, 0x5c, 0x2b, 0xc8, 0xb6, 0xe3, - 0x2e, 0xff, 0xc8, 0x35, 0xd0, 0x79, 0xd4, 0xde, 0x47, 0x84, 0xeb, 0x56, 0xc2, 0x00, 0xe4, 0x84, - 0x05, 0xf0, 0xbf, 0x2a, 0xe9, 0x3f, 0x3e, 0x38, 0x6a, 0xa2, 0x4f, 0x47, 0x4d, 0xf4, 0xe5, 0xa8, - 0x89, 0x3e, 0x1c, 0x37, 0xd1, 0xfe, 0x71, 0x13, 0x1d, 0x1c, 0x37, 0x11, 0xbe, 0xc4, 0x44, 0x47, - 0x3f, 0x06, 0xc5, 0x5a, 0xfd, 0xaa, 0x15, 0xbc, 0xa3, 0xf9, 0x3b, 0xe8, 0x75, 0xf1, 0x42, 0x0f, - 0x2b, 0x66, 0xc1, 0xd5, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x13, 0xfb, 0x08, 0xce, 0x05, + // 594 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x94, 0xcf, 0x6e, 0x13, 0x3f, + 0x10, 0xc7, 0x7f, 0xee, 0xaf, 0x4d, 0x59, 0x27, 0x41, 0xc2, 0x08, 0x88, 0x02, 0x24, 0x25, 0x5c, + 0x7a, 0x28, 0x1b, 0xd4, 0x4a, 0x48, 0x14, 0x09, 0xa4, 0x54, 0x15, 0x20, 0x44, 0x55, 0xa5, 0x50, + 0x09, 0x2e, 0x96, 0xb3, 0x3b, 0xd9, 0x58, 0xf5, 0xda, 0x2b, 0xdb, 0x5b, 0x94, 0xb7, 0x80, 0x1b, + 0x8f, 0xd3, 0x1b, 0x3d, 0xf2, 0x04, 0x05, 0xb5, 0x6f, 0xd0, 0x1b, 0x37, 0x64, 0x7b, 0x43, 0xf9, + 0xd7, 0x03, 0x12, 0x17, 0x4e, 0xc9, 0x7c, 0x67, 0xbe, 0x63, 0xcf, 0x27, 0xe3, 0xe0, 0x76, 0xa1, + 0x95, 0x55, 0xa6, 0x6f, 0x2c, 0xb3, 0xe5, 0xec, 0x23, 0xf6, 0x22, 0xa9, 0x85, 0xa8, 0x7d, 0x37, + 0xe3, 0x76, 0x52, 0x8e, 0xe2, 0x44, 0xe5, 0x7d, 0xab, 0x95, 0xbc, 0x53, 0x9a, 0xbe, 0xaf, 0x18, + 0x95, 0xe3, 0x7e, 0xa6, 0x32, 0xe5, 0x03, 0xff, 0x2d, 0x38, 0xdb, 0xd7, 0x33, 0xa5, 0x32, 0x01, + 0x67, 0x55, 0x90, 0x17, 0x76, 0x5a, 0x25, 0xbb, 0x3f, 0x27, 0x2d, 0xcf, 0xc1, 0x58, 0x96, 0x17, + 0xa1, 0xa0, 0x37, 0xc6, 0xcd, 0x1d, 0x9e, 0x49, 0x48, 0x9f, 0x83, 0xd5, 0x3c, 0x31, 0xe4, 0x26, + 0xc6, 0x45, 0x39, 0x12, 0x3c, 0xa1, 0x7b, 0x30, 0x6d, 0xa1, 0x25, 0xb4, 0xdc, 0x18, 0x46, 0x41, + 0x79, 0x06, 0x53, 0x72, 0x03, 0x47, 0x86, 0x67, 0x92, 0xd9, 0x52, 0x43, 0x6b, 0x2e, 0x64, 0xbf, + 0x09, 0xa4, 0x85, 0x17, 0x0b, 0x36, 0x15, 0x8a, 0xa5, 0xad, 0xff, 0x7d, 0x6e, 0x16, 0xf6, 0xde, + 0xcd, 0x61, 0xbc, 0xa5, 0x52, 0x78, 0x02, 0x4c, 0xd8, 0x09, 0x79, 0x85, 0xb1, 0x65, 0x23, 0x01, + 0x54, 0xb2, 0x1c, 0xfc, 0x29, 0xd1, 0x60, 0xfd, 0xf4, 0xa8, 0x7b, 0xaf, 0xc8, 0xd6, 0x7b, 0x13, + 0x5f, 0x43, 0x73, 0x25, 0xb9, 0x55, 0x9a, 0xcb, 0x6c, 0x85, 0x09, 0xce, 0xcc, 0xba, 0x5d, 0x49, + 0xb9, 0x49, 0x98, 0x4e, 0x69, 0x29, 0xf7, 0xa4, 0x7a, 0x23, 0x69, 0xa2, 0x44, 0x99, 0x4b, 0xd3, + 0x1b, 0x46, 0xbe, 0xdb, 0x16, 0xcb, 0x81, 0x5c, 0xc3, 0x8b, 0x52, 0xa5, 0x40, 0x79, 0xea, 0xef, + 0x17, 0x0d, 0x6b, 0x2e, 0x7c, 0x9a, 0x92, 0x5b, 0xb8, 0x31, 0xb2, 0x63, 0x43, 0xf7, 0x41, 0x1b, + 0xae, 0xa4, 0xbf, 0x61, 0x34, 0xac, 0x3b, 0x6d, 0x37, 0x48, 0xe4, 0x36, 0x6e, 0x8e, 0x19, 0x17, + 0xa5, 0x06, 0x5a, 0x28, 0x2e, 0x6d, 0x6b, 0xde, 0xd7, 0x34, 0x2a, 0x71, 0xdb, 0x69, 0xe4, 0x31, + 0x6e, 0x38, 0x8a, 0x34, 0xd1, 0xc0, 0x2c, 0xa4, 0xad, 0x85, 0x25, 0xb4, 0x5c, 0x5f, 0x6d, 0xc7, + 0x01, 0x75, 0x3c, 0x43, 0x1d, 0xbf, 0x98, 0xa1, 0x1e, 0x5c, 0x38, 0x3c, 0xea, 0xfe, 0xf7, 0xf6, + 0x53, 0x17, 0x0d, 0xeb, 0xce, 0xb9, 0x11, 0x8c, 0xbd, 0x2f, 0x08, 0x47, 0x8e, 0xc9, 0xa6, 0xd6, + 0x4a, 0x93, 0xe1, 0x6f, 0x90, 0xac, 0x9d, 0x1e, 0x75, 0xfb, 0x0e, 0x89, 0x05, 0x63, 0x29, 0xb8, + 0xba, 0x3f, 0x62, 0x71, 0x19, 0x2f, 0x4c, 0xe8, 0x3e, 0x13, 0x15, 0x89, 0xf9, 0xc9, 0x2e, 0x13, + 0x0e, 0x50, 0x01, 0xa0, 0x1d, 0xa0, 0x80, 0xa0, 0xe6, 0xc2, 0x00, 0xc8, 0x1f, 0x41, 0xc3, 0x2e, + 0x56, 0xc3, 0xd7, 0xbd, 0xb6, 0xe3, 0xa5, 0xbf, 0x36, 0xfb, 0xea, 0x01, 0xc2, 0xb5, 0xaa, 0xe7, + 0x43, 0xdc, 0x7c, 0x59, 0xa4, 0xcc, 0xc2, 0x6c, 0x05, 0xaf, 0xc4, 0xd5, 0xd3, 0xf8, 0x61, 0x33, + 0xdb, 0x57, 0x7f, 0x39, 0x65, 0xd3, 0x6d, 0x3a, 0x79, 0x80, 0x9b, 0x1b, 0x4a, 0x08, 0x48, 0x6c, + 0xb5, 0x5c, 0x64, 0xe6, 0x3f, 0x5b, 0xb8, 0x73, 0xcd, 0xf7, 0x71, 0xa3, 0x32, 0x87, 0x5f, 0xe1, + 0xd2, 0xf7, 0x5e, 0x2f, 0x9d, 0x67, 0x5d, 0xfd, 0x80, 0x70, 0x33, 0x8c, 0xb0, 0x03, 0x7a, 0x9f, + 0x27, 0xf0, 0xaf, 0x4e, 0x32, 0x78, 0x74, 0x78, 0xdc, 0x41, 0x1f, 0x8f, 0x3b, 0xe8, 0xf3, 0x71, + 0x07, 0xbd, 0x3f, 0xe9, 0xa0, 0x83, 0x93, 0x0e, 0x3a, 0x3c, 0xe9, 0x20, 0x7c, 0x91, 0xab, 0xd8, + 0x3d, 0x90, 0xaa, 0xd7, 0xa0, 0x1e, 0x06, 0xde, 0x76, 0xfe, 0x6d, 0xf4, 0xba, 0xfa, 0xd7, 0x1a, + 0xd5, 0x7c, 0xc3, 0xb5, 0xaf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x50, 0x88, 0x0f, 0xfd, 0xe2, 0x04, 0x00, 0x00, } @@ -906,87 +789,6 @@ func (m *NodeError) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Ip2Location) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Ip2Location) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Ip2Location) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.Zipcode) > 0 { - i -= len(m.Zipcode) - copy(dAtA[i:], m.Zipcode) - i = encodeVarintStatus(dAtA, i, uint64(len(m.Zipcode))) - i-- - dAtA[i] = 0x42 - } - if m.Longitude != 0 { - i -= 4 - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Longitude)))) - i-- - dAtA[i] = 0x3d - } - if m.Latitude != 0 { - i -= 4 - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Latitude)))) - i-- - dAtA[i] = 0x35 - } - if len(m.City) > 0 { - i -= len(m.City) - copy(dAtA[i:], m.City) - i = encodeVarintStatus(dAtA, i, uint64(len(m.City))) - i-- - dAtA[i] = 0x2a - } - if len(m.Region) > 0 { - i -= len(m.Region) - copy(dAtA[i:], m.Region) - i = encodeVarintStatus(dAtA, i, uint64(len(m.Region))) - i-- - dAtA[i] = 0x22 - } - if len(m.CountryLong) > 0 { - i -= len(m.CountryLong) - copy(dAtA[i:], m.CountryLong) - i = encodeVarintStatus(dAtA, i, uint64(len(m.CountryLong))) - i-- - dAtA[i] = 0x1a - } - if len(m.CountryShort) > 0 { - i -= len(m.CountryShort) - copy(dAtA[i:], m.CountryShort) - i = encodeVarintStatus(dAtA, i, uint64(len(m.CountryShort))) - i-- - dAtA[i] = 0x12 - } - if len(m.Ipv4) > 0 { - i -= len(m.Ipv4) - copy(dAtA[i:], m.Ipv4) - i = encodeVarintStatus(dAtA, i, uint64(len(m.Ipv4))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func encodeVarintStatus(dAtA []byte, offset int, v uint64) int { offset -= sovStatus(v) base := offset @@ -1082,48 +884,6 @@ func (m *NodeError) Size() (n int) { return n } -func (m *Ip2Location) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Ipv4) - if l > 0 { - n += 1 + l + sovStatus(uint64(l)) - } - l = len(m.CountryShort) - if l > 0 { - n += 1 + l + sovStatus(uint64(l)) - } - l = len(m.CountryLong) - if l > 0 { - n += 1 + l + sovStatus(uint64(l)) - } - l = len(m.Region) - if l > 0 { - n += 1 + l + sovStatus(uint64(l)) - } - l = len(m.City) - if l > 0 { - n += 1 + l + sovStatus(uint64(l)) - } - if m.Latitude != 0 { - n += 5 - } - if m.Longitude != 0 { - n += 5 - } - l = len(m.Zipcode) - if l > 0 { - n += 1 + l + sovStatus(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func sovStatus(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1716,274 +1476,6 @@ func (m *NodeError) Unmarshal(dAtA []byte) error { } return nil } -func (m *Ip2Location) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStatus - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Ip2Location: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Ip2Location: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Ipv4", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStatus - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStatus - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStatus - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Ipv4 = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CountryShort", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStatus - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStatus - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStatus - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CountryShort = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CountryLong", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStatus - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStatus - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStatus - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CountryLong = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Region", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStatus - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStatus - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStatus - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Region = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field City", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStatus - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStatus - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStatus - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.City = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 5 { - return fmt.Errorf("proto: wrong wireType = %d for field Latitude", wireType) - } - var v uint32 - if (iNdEx + 4) > l { - return io.ErrUnexpectedEOF - } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.Latitude = float32(math.Float32frombits(v)) - case 7: - if wireType != 5 { - return fmt.Errorf("proto: wrong wireType = %d for field Longitude", wireType) - } - var v uint32 - if (iNdEx + 4) > l { - return io.ErrUnexpectedEOF - } - v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:])) - iNdEx += 4 - m.Longitude = float32(math.Float32frombits(v)) - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Zipcode", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStatus - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStatus - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStatus - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Zipcode = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStatus(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthStatus - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthStatus - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipStatus(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/protos/status/status.proto b/protos/status/status.proto index b07be66..2e7170f 100644 --- a/protos/status/status.proto +++ b/protos/status/status.proto @@ -59,14 +59,3 @@ message NodeError { (gogoproto.stdtime) = true ]; } - -message Ip2Location { - string ipv4 = 1; - string country_short = 2; - string country_long = 3; - string region = 4; - string city = 5; - float latitude = 6; - float longitude = 7; - string zipcode = 8; -}