update proto

gen/proto/go/nodemanager/v1/resource.pb.go

@@ -128,93 +128,33 @@ func (m *DeviceInfo) GetDevicePower() uint64 {
 	return 0
 }
 
-type WorkerContent struct {
-	MinerPubkey          string        `protobuf:"bytes,1,opt,name=miner_pubkey,json=minerPubkey,proto3" json:"miner_pubkey,omitempty"`
-	Devices              []*DeviceInfo `protobuf:"bytes,2,rep,name=devices,proto3" json:"devices,omitempty"`
-	DeviceSignature      []byte        `protobuf:"bytes,3,opt,name=device_signature,json=deviceSignature,proto3" json:"device_signature,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
-	XXX_unrecognized     []byte        `json:"-"`
-	XXX_sizecache        int32         `json:"-"`
-}
-
-func (m *WorkerContent) Reset()         { *m = WorkerContent{} }
-func (m *WorkerContent) String() string { return proto.CompactTextString(m) }
-func (*WorkerContent) ProtoMessage()    {}
-func (*WorkerContent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_462e4441103de524, []int{2}
-}
-func (m *WorkerContent) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_WorkerContent.Unmarshal(m, b)
-}
-func (m *WorkerContent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_WorkerContent.Marshal(b, m, deterministic)
-}
-func (m *WorkerContent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WorkerContent.Merge(m, src)
-}
-func (m *WorkerContent) XXX_Size() int {
-	return xxx_messageInfo_WorkerContent.Size(m)
-}
-func (m *WorkerContent) XXX_DiscardUnknown() {
-	xxx_messageInfo_WorkerContent.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_WorkerContent proto.InternalMessageInfo
-
-func (m *WorkerContent) GetMinerPubkey() string {
-	if m != nil {
-		return m.MinerPubkey
-	}
-	return ""
-}
-
-func (m *WorkerContent) GetDevices() []*DeviceInfo {
-	if m != nil {
-		return m.Devices
-	}
-	return nil
-}
-
-func (m *WorkerContent) GetDeviceSignature() []byte {
-	if m != nil {
-		return m.DeviceSignature
-	}
-	return nil
-}
-
 func init() {
 	proto.RegisterType((*NodeManagerInfo)(nil), "nodemanager.v1.NodeManagerInfo")
 	proto.RegisterType((*DeviceInfo)(nil), "nodemanager.v1.DeviceInfo")
-	proto.RegisterType((*WorkerContent)(nil), "nodemanager.v1.WorkerContent")
 }
 
 func init() { proto.RegisterFile("nodemanager/v1/resource.proto", fileDescriptor_462e4441103de524) }
 
 var fileDescriptor_462e4441103de524 = []byte{
-	// 393 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xcf, 0x6e, 0x9b, 0x40,
-	0x10, 0xc6, 0x05, 0xb6, 0xda, 0x7a, 0xfd, 0xaf, 0xe2, 0x84, 0xac, 0x56, 0x75, 0x7d, 0x72, 0x0f,
-	0x05, 0xd1, 0xf6, 0xe4, 0xde, 0xdc, 0x4a, 0x55, 0x55, 0xd9, 0x45, 0xb4, 0x72, 0xac, 0xc8, 0x92,
-	0xb5, 0xc0, 0x84, 0x20, 0x9b, 0x1d, 0xb4, 0x2c, 0x44, 0x3c, 0x47, 0xa4, 0x3c, 0x40, 0x8e, 0x79,
-	0x94, 0x48, 0x79, 0x89, 0x1c, 0xf3, 0x14, 0x11, 0x0b, 0xb6, 0x21, 0x37, 0xbe, 0xdf, 0x7c, 0xfb,
-	0xed, 0x0c, 0xb3, 0xe4, 0x3d, 0x43, 0x1f, 0x22, 0xca, 0x68, 0x00, 0xdc, 0xcc, 0x2c, 0x93, 0x43,
-	0x82, 0x29, 0xf7, 0xc0, 0x88, 0x39, 0x0a, 0xd4, 0x06, 0xb5, 0xb2, 0x91, 0x59, 0x93, 0x3f, 0x64,
-	0xb8, 0x44, 0x1f, 0x16, 0x25, 0xf9, 0xcd, 0x2e, 0x50, 0x7b, 0x47, 0x3a, 0x71, 0xea, 0xee, 0x43,
-	0x6f, 0x07, 0xb9, 0xae, 0x8c, 0x95, 0x69, 0xc7, 0x39, 0x01, 0x6d, 0x44, 0xde, 0x00, 0xf3, 0x63,
-	0x0c, 0x99, 0xd0, 0x55, 0x59, 0x3c, 0xea, 0xc9, 0x8d, 0x42, 0xc8, 0x4f, 0xc8, 0x42, 0x0f, 0x64,
-	0xd0, 0x07, 0xd2, 0xf5, 0xa5, 0xda, 0x8a, 0x3c, 0x86, 0x2a, 0x8a, 0x94, 0xe8, 0x7f, 0x1e, 0x83,
-	0xf6, 0x91, 0xf4, 0x2a, 0x43, 0x84, 0x3e, 0xec, 0xab, 0xbc, 0xea, 0xd0, 0xa2, 0x40, 0x35, 0x4b,
-	0x4c, 0x39, 0x8d, 0xf4, 0x56, 0xdd, 0x62, 0x17, 0xa8, 0x6e, 0xc1, 0x2b, 0xe0, 0x7a, 0x7b, 0xac,
-	0x4c, 0xdb, 0x47, 0x4b, 0x81, 0x26, 0xd7, 0x0a, 0xe9, 0x9f, 0x21, 0xdf, 0x01, 0xff, 0x81, 0x4c,
-	0x00, 0x13, 0xc5, 0xa1, 0x28, 0x64, 0xc0, 0xb7, 0x71, 0xea, 0x9e, 0xe6, 0xec, 0x4a, 0x66, 0x4b,
-	0xa4, 0x7d, 0x23, 0xaf, 0xcb, 0x8c, 0x44, 0x57, 0xc7, 0xad, 0x69, 0xf7, 0xcb, 0xc8, 0x68, 0xfe,
-	0x3c, 0xe3, 0x34, 0xab, 0x73, 0xb0, 0x6a, 0x9f, 0xc8, 0xdb, 0xaa, 0x9b, 0x24, 0x0c, 0x18, 0x15,
-	0x29, 0x07, 0xd9, 0x74, 0xcf, 0x19, 0x96, 0xfc, 0xdf, 0x01, 0xcf, 0x1f, 0x14, 0xa2, 0x79, 0x18,
-	0xbd, 0x48, 0x9d, 0xf7, 0x9d, 0x6a, 0x65, 0x76, 0xb1, 0x31, 0x5b, 0x39, 0xff, 0x1b, 0x84, 0xe2,
-	0x32, 0x75, 0x0d, 0x0f, 0x23, 0x13, 0xfd, 0x3c, 0x49, 0x20, 0x4d, 0x8e, 0x1f, 0x9f, 0xe5, 0x5e,
-	0x3d, 0xdc, 0x9b, 0x01, 0x30, 0x53, 0x0a, 0x33, 0x40, 0xb3, 0xf9, 0x0a, 0xbe, 0xd7, 0x64, 0x66,
-	0xdd, 0xaa, 0xad, 0xe5, 0x7a, 0x7d, 0xa7, 0x0e, 0x96, 0xb5, 0x8b, 0x57, 0xd6, 0x7d, 0x03, 0x6c,
-	0x56, 0xd6, 0xa3, 0x3a, 0x6a, 0x82, 0xcd, 0x2f, 0x7b, 0xbe, 0x00, 0x41, 0x7d, 0x2a, 0xe8, 0x93,
-	0x3a, 0xac, 0x15, 0x67, 0xb3, 0x95, 0xe5, 0xbe, 0x92, 0xb7, 0x7f, 0x7d, 0x0e, 0x00, 0x00, 0xff,
-	0xff, 0x88, 0x98, 0xc1, 0x27, 0x83, 0x02, 0x00, 0x00,
+	// 314 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xc1, 0x4a, 0xf3, 0x40,
+	0x14, 0x85, 0x49, 0x5a, 0x7e, 0xfe, 0x8e, 0xda, 0x42, 0x56, 0xa1, 0x28, 0xd6, 0xae, 0xba, 0x31,
+	0x43, 0x70, 0x57, 0x77, 0x45, 0x10, 0x91, 0xd6, 0x50, 0xa4, 0x14, 0x29, 0xc8, 0x34, 0x73, 0x8d,
+	0xc1, 0x26, 0x77, 0x98, 0x4c, 0x22, 0x79, 0x11, 0x1f, 0xc0, 0xa5, 0x8f, 0x22, 0xf8, 0x12, 0x2e,
+	0x7d, 0x0a, 0xc9, 0x34, 0xc4, 0xc9, 0x2e, 0xe7, 0x3b, 0x27, 0xe7, 0x32, 0x87, 0x9c, 0xa4, 0xc8,
+	0x21, 0x61, 0x29, 0x8b, 0x40, 0xd2, 0xc2, 0xa7, 0x12, 0x32, 0xcc, 0x65, 0x08, 0x9e, 0x90, 0xa8,
+	0xd0, 0xe9, 0x1b, 0xb6, 0x57, 0xf8, 0xe3, 0x5b, 0x32, 0x58, 0x20, 0x87, 0xf9, 0x9e, 0xdc, 0xa4,
+	0x4f, 0xe8, 0x1c, 0x93, 0x9e, 0xc8, 0xb7, 0xbb, 0x38, 0x7c, 0x81, 0xd2, 0xb5, 0x46, 0xd6, 0xa4,
+	0xb7, 0xfc, 0x03, 0xce, 0x90, 0xfc, 0x87, 0x94, 0x0b, 0x8c, 0x53, 0xe5, 0xda, 0xda, 0x6c, 0xf4,
+	0xf8, 0xcd, 0x22, 0xe4, 0x0a, 0x8a, 0x38, 0x04, 0x5d, 0x74, 0x4a, 0x0e, 0xb8, 0x56, 0x8f, 0xaa,
+	0x14, 0x50, 0x57, 0x91, 0x3d, 0xba, 0x2f, 0x05, 0x38, 0x67, 0xe4, 0xb0, 0x0e, 0x24, 0xc8, 0x61,
+	0x57, 0xf7, 0xd5, 0x3f, 0xcd, 0x2b, 0x64, 0x44, 0x04, 0x93, 0x2c, 0x71, 0x3b, 0x66, 0x24, 0xa8,
+	0x90, 0x19, 0xc1, 0x57, 0x90, 0x6e, 0x77, 0x64, 0x4d, 0xba, 0x4d, 0xa4, 0x42, 0xb3, 0x2f, 0x8b,
+	0x38, 0x21, 0x26, 0x5e, 0xfb, 0xf1, 0xb3, 0xa3, 0x65, 0x3d, 0x4e, 0x50, 0x6d, 0x13, 0x58, 0x0f,
+	0x77, 0x51, 0xac, 0x9e, 0xf3, 0xad, 0x17, 0x62, 0x42, 0x91, 0x97, 0x59, 0x06, 0x79, 0xd6, 0x7c,
+	0x9c, 0xeb, 0x05, 0x43, 0xdc, 0xd1, 0x08, 0x52, 0xaa, 0x05, 0x8d, 0x90, 0xb6, 0xf7, 0xbe, 0x34,
+	0x64, 0xe1, 0xbf, 0xdb, 0x9d, 0xc5, 0x7a, 0xfd, 0x61, 0xf7, 0x17, 0xc6, 0xe1, 0x95, 0xff, 0xd9,
+	0x02, 0x9b, 0x95, 0xff, 0x6d, 0x0f, 0xdb, 0x60, 0x73, 0x1d, 0xcc, 0xe6, 0xa0, 0x18, 0x67, 0x8a,
+	0xfd, 0xd8, 0x03, 0xc3, 0x9c, 0x4e, 0x57, 0xfe, 0xf6, 0x9f, 0xbe, 0x7e, 0xf1, 0x1b, 0x00, 0x00,
+	0xff, 0xff, 0xda, 0x17, 0x48, 0x05, 0xed, 0x01, 0x00, 0x00,
 }

nodemanager/nodemanager/v1/request_response.proto

@@ -54,7 +54,9 @@ message DeviceInfoRequest {
 }
 
 message DeviceInfoResponse {
-  repeated DeviceInfo devices = 1;
+  string miner_pubkey = 1;
+  repeated DeviceInfo devices = 2;
+  bytes device_signature = 3; // 由测试程序对设备信息进行签名
 }
 
 message DeviceUsage {

nodemanager/nodemanager/v1/resource.proto

@@ -14,9 +14,4 @@ message DeviceInfo {
     string device_param = 3; // 内存容量/CPU主频/GPU显存 等等
     uint64 device_power = 4; // CPU: hashrate, MEM: size, GPU: 算力, GPUMEM:size
   }
-  
-  message WorkerContent {
+  
\ No newline at end of file
-    string miner_pubkey = 1;
-    repeated DeviceInfo devices = 2;
-    bytes device_signature = 3; // 由测试程序对设备信息进行签名
-  }
\ No newline at end of file