diff --git a/event/event.pb.go b/event/event.pb.go index 3aff698de..f45cf2667 100644 --- a/event/event.pb.go +++ b/event/event.pb.go @@ -26,9 +26,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Event represents a single event run in engine. type Event struct { // Hash is a unique hash to identify event. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" hash:"-" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" hash:"-" validate:"required,hash"` // instanceHash is hash of instance that can proceed an execution. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" hash:"name:2" validate:"required,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" hash:"name:2" validate:"required,hash"` // key is the key of the event. Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty" hash:"name:3" validate:"required,printascii"` // data is the data for the event. @@ -69,25 +69,25 @@ func init() { func init() { proto.RegisterFile("event.proto", fileDescriptor_2d17a9d3f0ddf27e) } var fileDescriptor_2d17a9d3f0ddf27e = []byte{ - // 319 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0x41, 0x4b, 0xc3, 0x30, - 0x14, 0xc7, 0xd7, 0x6d, 0x0a, 0x66, 0xf3, 0x60, 0x41, 0x28, 0x13, 0x6c, 0xcd, 0x41, 0x07, 0x6e, - 0x89, 0x6c, 0x9e, 0x86, 0xa7, 0x82, 0xe0, 0x79, 0x5e, 0x44, 0xf0, 0x90, 0xb5, 0x6f, 0x6d, 0x70, - 0x4d, 0x6a, 0x93, 0x0e, 0x76, 0xf4, 0xdb, 0xed, 0x33, 0x78, 0x28, 0xf8, 0x15, 0x7a, 0xf5, 0x22, - 0xc9, 0x54, 0x26, 0x88, 0x82, 0xb7, 0xbc, 0xbc, 0xfc, 0x7f, 0x3f, 0xf2, 0x1e, 0xea, 0xc0, 0x12, - 0x84, 0x26, 0x79, 0x21, 0xb5, 0x74, 0x51, 0x06, 0x2a, 0x21, 0x7a, 0x95, 0x83, 0xea, 0xe1, 0x44, - 0x26, 0x92, 0xda, 0xfb, 0x59, 0x39, 0xa7, 0xa6, 0xb2, 0x85, 0x3d, 0x6d, 0xde, 0xf7, 0x8e, 0xbe, - 0xda, 0x36, 0x43, 0x95, 0x2e, 0xca, 0xe8, 0x03, 0x86, 0xdf, 0x9a, 0x68, 0xe7, 0xda, 0xc0, 0xdd, - 0x05, 0x6a, 0xa7, 0x4c, 0xa5, 0x9e, 0x13, 0x38, 0xfd, 0x6e, 0x78, 0xb7, 0xae, 0xfc, 0xc6, 0x4b, - 0xe5, 0x9f, 0x27, 0x5c, 0xa7, 0xe5, 0x8c, 0x44, 0x32, 0xa3, 0xc6, 0x3b, 0x9c, 0xcb, 0x52, 0xc4, - 0x4c, 0x73, 0x29, 0x28, 0x88, 0x84, 0x0b, 0xa0, 0x26, 0x45, 0x6e, 0x98, 0x4a, 0xeb, 0xca, 0x3f, - 0x31, 0xc5, 0x04, 0x0f, 0x71, 0xb0, 0x64, 0x0b, 0x1e, 0x33, 0x0d, 0x13, 0x5c, 0xc0, 0x53, 0xc9, - 0x0b, 0x88, 0x07, 0xa6, 0x87, 0xa7, 0xd6, 0xe2, 0x3e, 0x3b, 0xa8, 0xcb, 0x85, 0xd2, 0x4c, 0x44, - 0x60, 0xb2, 0x5e, 0xd3, 0x6a, 0x1f, 0xfe, 0xa7, 0x3d, 0xdd, 0x68, 0x05, 0xcb, 0x60, 0x32, 0xfa, - 0xc5, 0xfd, 0x4d, 0xe9, 0x86, 0xa8, 0xf5, 0x08, 0x2b, 0xaf, 0x15, 0x38, 0xfd, 0xbd, 0xf0, 0xa2, - 0xae, 0xfc, 0xc1, 0x16, 0x66, 0xfc, 0x23, 0x26, 0x2f, 0xb8, 0xd0, 0x4c, 0x45, 0x9c, 0xe3, 0xa9, - 0x09, 0xbb, 0x57, 0xa8, 0x1d, 0x33, 0xcd, 0xbc, 0x76, 0xe0, 0xf4, 0x3b, 0xa3, 0x43, 0x62, 0x77, - 0xf3, 0x39, 0x70, 0x72, 0x6b, 0x47, 0x1d, 0x1e, 0xd4, 0x95, 0xbf, 0xbf, 0xc5, 0xbe, 0xc4, 0x53, - 0x9b, 0x0a, 0x87, 0xeb, 0xd7, 0xe3, 0xc6, 0xfd, 0xd9, 0xdf, 0x9f, 0xb5, 0xfb, 0x9f, 0xed, 0x5a, - 0xf0, 0xf8, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x53, 0x5c, 0x1b, 0x1f, 0x0f, 0x02, 0x00, 0x00, + // 316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x91, 0xc1, 0x4a, 0xfb, 0x40, + 0x10, 0xc6, 0xff, 0x69, 0xfb, 0x17, 0xdc, 0xd6, 0x83, 0x01, 0x21, 0x54, 0x30, 0x71, 0x0f, 0x5a, + 0xb0, 0xdd, 0x95, 0xd6, 0x53, 0xf0, 0x14, 0x10, 0x3c, 0x47, 0x2f, 0x7a, 0xdb, 0x24, 0xd3, 0x64, + 0xd1, 0xec, 0xc6, 0xec, 0xa6, 0xd0, 0x83, 0xef, 0xe7, 0x53, 0x04, 0x7c, 0x85, 0x1c, 0x3d, 0xc9, + 0x6e, 0x55, 0x2a, 0x08, 0x5e, 0xbc, 0xe5, 0x9b, 0x99, 0xef, 0xfb, 0x65, 0x67, 0xd0, 0x10, 0x56, + 0x20, 0x34, 0xa9, 0x6a, 0xa9, 0xa5, 0x8b, 0x4a, 0x50, 0x39, 0xd1, 0xeb, 0x0a, 0xd4, 0x18, 0xe7, + 0x32, 0x97, 0xd4, 0xd6, 0x93, 0x66, 0x49, 0x8d, 0xb2, 0xc2, 0x7e, 0x6d, 0xe6, 0xc7, 0x87, 0x5f, + 0x6d, 0xeb, 0xa1, 0x4a, 0xd7, 0x4d, 0xfa, 0x11, 0x86, 0xbb, 0x1e, 0xfa, 0x7f, 0x65, 0xc2, 0xdd, + 0x02, 0x0d, 0x0a, 0xa6, 0x0a, 0xcf, 0x09, 0x9c, 0xc9, 0x28, 0xba, 0xed, 0x5a, 0xff, 0xd8, 0xe8, + 0x10, 0xcf, 0x70, 0xb0, 0x62, 0x8f, 0x3c, 0x63, 0x1a, 0x42, 0x5c, 0xc3, 0x53, 0xc3, 0x6b, 0xc8, + 0xa6, 0xa6, 0x87, 0xdf, 0x5a, 0xff, 0x2c, 0xe7, 0xba, 0x68, 0x12, 0x92, 0xca, 0x92, 0x9a, 0x1f, + 0x9b, 0x2d, 0x65, 0x23, 0x32, 0xa6, 0xb9, 0x14, 0x14, 0x44, 0xce, 0x05, 0x50, 0x33, 0x4a, 0xae, + 0x99, 0x2a, 0x62, 0x4b, 0x70, 0x9f, 0xd1, 0x88, 0x0b, 0xa5, 0x99, 0x48, 0xc1, 0x54, 0xbd, 0x9e, + 0x25, 0xde, 0x75, 0xad, 0x7f, 0xb2, 0x21, 0x0a, 0x56, 0x42, 0x38, 0xff, 0x3b, 0xec, 0x37, 0x9c, + 0x1b, 0xa1, 0xfe, 0x03, 0xac, 0xbd, 0x7e, 0xe0, 0x4c, 0x76, 0xa3, 0xf3, 0xae, 0xf5, 0xa7, 0x5b, + 0xd4, 0xc5, 0x8f, 0xd4, 0xaa, 0xe6, 0x42, 0x33, 0x95, 0x72, 0x8e, 0x63, 0x63, 0x76, 0x2f, 0xd1, + 0x20, 0x63, 0x9a, 0x79, 0x83, 0xc0, 0x99, 0x0c, 0xe7, 0x07, 0xc4, 0x9e, 0xe4, 0x73, 0xcf, 0xe4, + 0xc6, 0x6e, 0x38, 0xda, 0xef, 0x5a, 0x7f, 0x6f, 0x2b, 0xfb, 0x02, 0xc7, 0xd6, 0x15, 0xcd, 0x5e, + 0x5e, 0x8f, 0xfe, 0xdd, 0x9f, 0xfe, 0xfe, 0x04, 0x7b, 0xf6, 0x64, 0xc7, 0x06, 0x2f, 0xde, 0x03, + 0x00, 0x00, 0xff, 0xff, 0x48, 0xc8, 0x52, 0x5d, 0x06, 0x02, 0x00, 0x00, } diff --git a/execution/execution.pb.go b/execution/execution.pb.go index c1840d527..3249c744f 100644 --- a/execution/execution.pb.go +++ b/execution/execution.pb.go @@ -71,17 +71,17 @@ func (Status) EnumDescriptor() ([]byte, []int) { // Execution represents a single execution run in engine. type Execution struct { // Hash is a unique hash to identify execution. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" hash:"-" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" hash:"-" validate:"required,hash"` // parentHash is the unique hash of parent execution. // if execution is triggered by another one, // dependency execution considered as the parent. - ParentHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=parentHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"parentHash" hash:"name:2" validate:"required_without=EventHash,omitempty,hash"` + ParentHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=parentHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"parentHash,omitempty" hash:"name:2" validate:"required_without=EventHash,omitempty,hash"` // eventHash is unique event hash. - EventHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=eventHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"eventHash" hash:"name:3" validate:"required_without=ParentHash,omitempty,hash"` + EventHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=eventHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"eventHash,omitempty" hash:"name:3" validate:"required_without=ParentHash,omitempty,hash"` // Status is the current status of execution. Status Status `protobuf:"varint,4,opt,name=status,proto3,enum=mesg.types.Status" json:"status,omitempty" hash:"-" validate:"required"` // instanceHash is hash of the instance that can proceed an execution - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" hash:"name:5" validate:"required,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" hash:"name:5" validate:"required,hash"` // taskKey is the key of the task of this execution. TaskKey string `protobuf:"bytes,6,opt,name=taskKey,proto3" json:"taskKey,omitempty" hash:"name:6" validate:"required,printascii"` // inputs data of the execution. @@ -93,11 +93,11 @@ type Execution struct { // tags are optionally associated with execution by the user. Tags []string `protobuf:"bytes,10,rep,name=tags,proto3" json:"tags,omitempty" hash:"name:10" validate:"dive,printascii"` // processHash is the unique hash of the process associated to this execution. - ProcessHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,11,opt,name=processHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"processHash" hash:"name:11" validate:"omitempty,hash"` + ProcessHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,11,opt,name=processHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"processHash,omitempty" hash:"name:11" validate:"omitempty,hash"` // node key of the process. NodeKey string `protobuf:"bytes,12,opt,name=nodeKey,proto3" json:"nodeKey,omitempty" hash:"name:12"` // runner that should execute this execution. - ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,13,opt,name=executorHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash" hash:"name:13" validate:"required,hash"` + ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,13,opt,name=executorHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash,omitempty" hash:"name:13" validate:"required,hash"` // price of running the exeuction. Price string `protobuf:"bytes,14,opt,name=price,proto3" json:"price,omitempty" hash:"name:14" validate:"required,coinsPositiveZero"` // blockHeight where the execution was included into blockchain. @@ -138,7 +138,7 @@ var xxx_messageInfo_Execution proto.InternalMessageInfo // Emitter is a runner that proposed an execution. type Execution_Emitter struct { // Emitter's hash. - RunnerHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=runnerHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"runnerHash" hash:"-" validate:"required,hash"` + RunnerHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=runnerHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"runnerHash,omitempty" hash:"-" validate:"required,hash"` // Block height when this emitter proposed the execution. BlockHeight int64 `protobuf:"varint,2,opt,name=blockHeight,proto3" json:"blockHeight,omitempty" hash:"-" validate:"required"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -179,60 +179,59 @@ func init() { func init() { proto.RegisterFile("execution.proto", fileDescriptor_776e2c5022e94aef) } var fileDescriptor_776e2c5022e94aef = []byte{ - // 835 bytes of a gzipped FileDescriptorProto + // 826 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xdd, 0x8e, 0xdb, 0x44, - 0x14, 0x5e, 0x6f, 0x76, 0x93, 0xcd, 0x49, 0x36, 0x4d, 0x47, 0x42, 0xb2, 0x96, 0x52, 0x1b, 0x5f, - 0x40, 0x80, 0x8d, 0xd3, 0x66, 0x5b, 0x40, 0x2b, 0x55, 0x62, 0x5d, 0x2d, 0x2a, 0x3f, 0xaa, 0x56, - 0xae, 0x10, 0xa8, 0x02, 0x2a, 0xaf, 0x3d, 0x75, 0x46, 0x1b, 0xcf, 0x98, 0x99, 0x71, 0xda, 0xe5, - 0x0e, 0xae, 0x78, 0x04, 0x78, 0x03, 0xde, 0x84, 0x3e, 0x03, 0x17, 0x96, 0xe0, 0x11, 0x7c, 0xc9, - 0x15, 0xf2, 0x38, 0xce, 0x4e, 0x96, 0x28, 0xa0, 0x48, 0x5c, 0x25, 0xe3, 0x39, 0xe7, 0xfb, 0xbe, - 0x33, 0xdf, 0x99, 0x33, 0x70, 0x03, 0xbf, 0xc4, 0x61, 0x26, 0x09, 0xa3, 0x6e, 0xca, 0x99, 0x64, - 0x08, 0x12, 0x2c, 0x62, 0x57, 0x5e, 0xa6, 0x58, 0x1c, 0x38, 0x31, 0x8b, 0xd9, 0x48, 0x7d, 0x3f, - 0xcf, 0x9e, 0x8f, 0xca, 0x95, 0x5a, 0xa8, 0x7f, 0x55, 0xfc, 0xc1, 0xeb, 0x8b, 0x6d, 0x95, 0x33, - 0x12, 0x92, 0x67, 0xa1, 0xac, 0x36, 0x9d, 0x9f, 0x7a, 0xd0, 0x3e, 0xad, 0x09, 0xd0, 0x14, 0x76, - 0x26, 0x81, 0x98, 0x98, 0x86, 0x6d, 0x0c, 0xba, 0xde, 0x57, 0xaf, 0x72, 0x6b, 0xeb, 0xf7, 0xdc, - 0x7a, 0x2f, 0x26, 0x72, 0x92, 0x9d, 0xbb, 0x21, 0x4b, 0x46, 0x25, 0xf7, 0xf0, 0x39, 0xcb, 0x68, - 0x14, 0x94, 0x19, 0x23, 0x4c, 0x63, 0x42, 0xf1, 0xa8, 0xcc, 0x72, 0x1f, 0x05, 0x62, 0x52, 0xe4, - 0xd6, 0x9b, 0xe5, 0xe2, 0xd8, 0x19, 0x3a, 0xf6, 0x2c, 0x98, 0x92, 0x28, 0x90, 0xf8, 0xd8, 0xe1, - 0xf8, 0xbb, 0x8c, 0x70, 0x1c, 0x1d, 0x96, 0x7b, 0x8e, 0xaf, 0x58, 0xd0, 0x2f, 0x06, 0x40, 0x1a, - 0x70, 0x4c, 0x65, 0x99, 0x69, 0x6e, 0x2b, 0xd2, 0xcb, 0xcd, 0x48, 0xbd, 0x8a, 0x94, 0x06, 0x09, - 0x3e, 0x1e, 0xaf, 0x62, 0x7e, 0xf6, 0x82, 0xc8, 0x09, 0xcb, 0xe4, 0x83, 0xd3, 0xd9, 0x9c, 0xf0, - 0x90, 0x25, 0x44, 0xe2, 0x24, 0x95, 0x97, 0x73, 0x55, 0x9a, 0x18, 0xf4, 0xb3, 0x01, 0x6d, 0x5c, - 0x47, 0x9a, 0x0d, 0x25, 0xed, 0xfb, 0xcd, 0xa4, 0x3d, 0xd4, 0xa4, 0x1d, 0xad, 0x95, 0x76, 0xb6, - 0xe0, 0xff, 0x87, 0xb6, 0x2b, 0x31, 0xe8, 0x73, 0x68, 0x0a, 0x19, 0xc8, 0x4c, 0x98, 0x3b, 0xb6, - 0x31, 0xe8, 0x8d, 0x91, 0x7b, 0xd5, 0x10, 0xee, 0x13, 0xb5, 0xe3, 0xd9, 0x45, 0x6e, 0xdd, 0x5a, - 0xe3, 0x83, 0xe3, 0xcf, 0x31, 0xd0, 0x0f, 0x06, 0x74, 0x09, 0x15, 0x32, 0xa0, 0x21, 0x56, 0xb5, - 0xee, 0xaa, 0x5a, 0xbf, 0xd9, 0xac, 0xd6, 0xb7, 0xb4, 0x5a, 0xef, 0xaf, 0x69, 0x80, 0x25, 0x4a, - 0xf4, 0x29, 0xb4, 0x64, 0x20, 0x2e, 0x3e, 0xc3, 0x97, 0x66, 0xd3, 0x36, 0x06, 0x6d, 0xef, 0x4e, - 0x91, 0x5b, 0x87, 0x1a, 0xd4, 0xfb, 0x2b, 0xa1, 0x52, 0x4e, 0xa8, 0x0c, 0x44, 0x48, 0x88, 0xe3, - 0xd7, 0x00, 0xe8, 0x23, 0x68, 0x12, 0x9a, 0x66, 0x52, 0x98, 0x2d, 0xdb, 0x18, 0x74, 0xc6, 0xaf, - 0x55, 0xa7, 0x53, 0xdf, 0x01, 0xf7, 0x89, 0xea, 0x7e, 0xef, 0x66, 0x91, 0x5b, 0xfb, 0x1a, 0xc3, - 0x07, 0x8e, 0x3f, 0xcf, 0x43, 0x0f, 0xa0, 0xc5, 0x32, 0xa9, 0x20, 0xf6, 0xd6, 0x41, 0x74, 0x8b, - 0xdc, 0xda, 0xab, 0xcf, 0xd8, 0xaf, 0x73, 0x90, 0x03, 0xbb, 0x98, 0x73, 0xc6, 0xcd, 0xb6, 0x2a, - 0x65, 0x39, 0xaa, 0xda, 0x42, 0x27, 0xb0, 0x23, 0x83, 0x58, 0x98, 0x60, 0x37, 0x06, 0x6d, 0x6f, - 0x58, 0xe4, 0xd6, 0x3b, 0x9a, 0x96, 0xbb, 0x77, 0xf4, 0x72, 0x23, 0x32, 0xc3, 0x4b, 0xa5, 0xaa, - 0xd4, 0xd2, 0xb7, 0x4e, 0xca, 0x59, 0x88, 0x85, 0x50, 0xb6, 0x75, 0x94, 0x6d, 0xcf, 0x36, 0xb3, - 0x6d, 0xa0, 0xb3, 0xdf, 0xd5, 0xd9, 0xaf, 0xf7, 0xa1, 0xce, 0x89, 0x0e, 0xa1, 0x45, 0x59, 0x84, - 0x4b, 0xdf, 0xba, 0xaa, 0x58, 0x54, 0xe4, 0x56, 0x4f, 0xc7, 0x1a, 0x3b, 0x7e, 0x1d, 0x82, 0x7e, - 0x34, 0xa0, 0x5b, 0xcd, 0x32, 0xc6, 0x95, 0xe4, 0x7d, 0x25, 0xf9, 0xdb, 0xcd, 0x24, 0xbf, 0xad, - 0xd3, 0x1c, 0xad, 0x6b, 0x35, 0x9d, 0x13, 0x3d, 0x86, 0xdd, 0x94, 0x93, 0x10, 0x9b, 0x3d, 0x25, - 0xf8, 0xc3, 0x22, 0xb7, 0xee, 0xe9, 0x48, 0xf7, 0x56, 0x22, 0x85, 0x8c, 0x50, 0x71, 0xc6, 0x04, - 0x91, 0x64, 0x86, 0x9f, 0x62, 0xce, 0x1c, 0xbf, 0x82, 0x41, 0x2e, 0x74, 0xce, 0xa7, 0x2c, 0xbc, - 0x78, 0x84, 0x49, 0x3c, 0x91, 0xe6, 0x0d, 0xdb, 0x18, 0x34, 0xae, 0x79, 0xae, 0x07, 0xa0, 0x2f, - 0x61, 0x0f, 0x27, 0x44, 0x4a, 0xcc, 0x85, 0xd9, 0xb7, 0x1b, 0x83, 0xce, 0xf8, 0x0d, 0xfd, 0xfa, - 0x2e, 0x46, 0xb1, 0x7b, 0x5a, 0x45, 0x79, 0xb7, 0x8a, 0xdc, 0x32, 0x57, 0xdc, 0xe4, 0xb2, 0x2d, - 0x1c, 0x7f, 0x01, 0x86, 0x66, 0xd0, 0x0a, 0xa2, 0x88, 0x63, 0x21, 0xcc, 0x9b, 0xea, 0x5c, 0xbf, - 0xbe, 0x3a, 0xa4, 0xd5, 0xa3, 0x38, 0x08, 0xc3, 0x79, 0x86, 0xf3, 0x57, 0x6e, 0x0d, 0xb5, 0xe3, - 0x0f, 0x99, 0x48, 0x98, 0x98, 0xff, 0x0c, 0x45, 0x74, 0x51, 0xbd, 0x1c, 0xee, 0x49, 0x18, 0x9e, - 0x54, 0x19, 0x7e, 0x4d, 0x76, 0xf0, 0x9b, 0x01, 0xad, 0xb9, 0x56, 0xf4, 0x12, 0x80, 0x67, 0x94, - 0xe2, 0xca, 0xde, 0xff, 0xfb, 0x11, 0xd1, 0xb8, 0x90, 0xb7, 0x6c, 0xc3, 0xb6, 0xb2, 0xe1, 0xdf, - 0x87, 0xa0, 0x9e, 0xf4, 0xee, 0x63, 0x68, 0x56, 0xd3, 0x13, 0x75, 0xa0, 0xf5, 0x05, 0xbd, 0xa0, - 0xec, 0x05, 0xed, 0x6f, 0xa1, 0x2e, 0xec, 0x9d, 0x71, 0x96, 0x32, 0x81, 0xa3, 0xbe, 0x81, 0x7a, - 0x00, 0x9f, 0xd0, 0x33, 0xce, 0xe2, 0xb2, 0xf8, 0xfe, 0x36, 0xda, 0x87, 0xf6, 0x43, 0x96, 0xa4, - 0x53, 0x2c, 0x71, 0xd4, 0x6f, 0x20, 0x80, 0xe6, 0xc7, 0x01, 0x99, 0xe2, 0xa8, 0xbf, 0xe3, 0xdd, - 0x7f, 0xf5, 0xc7, 0xed, 0xad, 0x5f, 0xff, 0xbc, 0x6d, 0x3c, 0xfd, 0x0f, 0xb5, 0x2f, 0x1e, 0xf9, - 0xf3, 0xa6, 0x9a, 0x33, 0x47, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x19, 0xe0, 0xba, 0x5c, 0xf8, - 0x07, 0x00, 0x00, + 0x14, 0xae, 0x37, 0xbb, 0xc9, 0xe6, 0x24, 0xbb, 0x4d, 0x47, 0x42, 0xb2, 0x96, 0x52, 0x1b, 0x5f, + 0x80, 0x81, 0x8d, 0xd3, 0x66, 0x5b, 0x40, 0x2b, 0x55, 0x62, 0x5d, 0x2d, 0x2a, 0x3f, 0xaa, 0x56, + 0x2e, 0x08, 0xb1, 0x20, 0x21, 0xc7, 0x9e, 0x3a, 0xa3, 0xc4, 0x33, 0x66, 0x66, 0x9c, 0xb2, 0x17, + 0xe5, 0x29, 0xe0, 0x1d, 0x78, 0x0f, 0x6e, 0x78, 0x0a, 0x4b, 0x70, 0xc7, 0xad, 0x2f, 0xb9, 0x42, + 0x1e, 0xc7, 0xd9, 0x09, 0x8a, 0x16, 0x44, 0xb7, 0x57, 0xc9, 0xf8, 0x9c, 0xf3, 0x7d, 0xdf, 0xf9, + 0x99, 0x33, 0x70, 0x13, 0xff, 0x80, 0xa3, 0x5c, 0x12, 0x46, 0xbd, 0x8c, 0x33, 0xc9, 0x10, 0xa4, + 0x58, 0x24, 0x9e, 0xbc, 0xc8, 0xb0, 0x38, 0x70, 0x12, 0x96, 0xb0, 0x91, 0xfa, 0x3e, 0xc9, 0x9f, + 0x8d, 0xaa, 0x93, 0x3a, 0xa8, 0x7f, 0xb5, 0xff, 0xc1, 0xeb, 0x2b, 0xb3, 0x8a, 0x19, 0x09, 0xc9, + 0xf3, 0x48, 0xd6, 0x46, 0xe7, 0xcf, 0x3d, 0xe8, 0x9e, 0x36, 0x04, 0x68, 0x0a, 0xdb, 0xd3, 0x50, + 0x4c, 0x4d, 0xc3, 0x36, 0xdc, 0xbe, 0xff, 0x45, 0x59, 0x58, 0x6f, 0x56, 0xe7, 0x63, 0x67, 0xe8, + 0xd8, 0x8b, 0x70, 0x4e, 0xe2, 0x50, 0xe2, 0x63, 0x87, 0xe3, 0xef, 0x73, 0xc2, 0x71, 0x7c, 0x58, + 0xd9, 0x9c, 0xbf, 0x0a, 0xeb, 0xbd, 0x84, 0xc8, 0x69, 0x3e, 0xf1, 0x22, 0x96, 0x8e, 0x2a, 0x71, + 0xc3, 0x67, 0x2c, 0xa7, 0x71, 0x58, 0x41, 0x8e, 0x30, 0x4d, 0x08, 0xc5, 0xa3, 0xca, 0xd5, 0x7b, + 0x1c, 0x8a, 0x69, 0xa0, 0x18, 0xd0, 0xcf, 0x06, 0x40, 0x16, 0x72, 0x4c, 0x65, 0xf5, 0xd1, 0xdc, + 0x52, 0x84, 0x79, 0x59, 0x58, 0x7e, 0x4d, 0x48, 0xc3, 0x14, 0x1f, 0x8f, 0x37, 0xb1, 0x7e, 0xf7, + 0x9c, 0xc8, 0x29, 0xcb, 0xe5, 0xc3, 0xd3, 0xc5, 0x32, 0xfa, 0x90, 0xa5, 0x44, 0xe2, 0x34, 0x93, + 0x17, 0xff, 0x4f, 0x91, 0x26, 0x04, 0xfd, 0x64, 0x40, 0x17, 0x37, 0xc0, 0x66, 0x4b, 0xc9, 0x5a, + 0x94, 0x85, 0xf5, 0x48, 0x93, 0x75, 0x74, 0xa5, 0xac, 0xb3, 0x15, 0xd8, 0xcb, 0xea, 0xba, 0x14, + 0x82, 0x3e, 0x87, 0xb6, 0x90, 0xa1, 0xcc, 0x85, 0xb9, 0x6d, 0x1b, 0xee, 0xfe, 0x18, 0x79, 0x97, + 0x43, 0xe0, 0x3d, 0x55, 0x16, 0xdf, 0x2e, 0x0b, 0xeb, 0xf6, 0x15, 0xed, 0x72, 0x82, 0x25, 0x06, + 0x7a, 0x01, 0x7d, 0x42, 0x85, 0x0c, 0x69, 0x84, 0x55, 0x9a, 0x3b, 0x2a, 0xcd, 0xaf, 0xcb, 0xc2, + 0x7a, 0x4b, 0x4b, 0xf3, 0xc1, 0xf5, 0xf5, 0x7c, 0x8d, 0x0e, 0x7d, 0x0a, 0x1d, 0x19, 0x8a, 0xd9, + 0x67, 0xf8, 0xc2, 0x6c, 0xdb, 0x86, 0xdb, 0xf5, 0xef, 0x96, 0x85, 0x75, 0xa8, 0x31, 0xbf, 0xbf, + 0x91, 0x39, 0xe3, 0x84, 0xca, 0x50, 0x44, 0x84, 0x38, 0x41, 0x03, 0x80, 0x3e, 0x82, 0x36, 0xa1, + 0x59, 0x2e, 0x85, 0xd9, 0xb1, 0x0d, 0xb7, 0x37, 0x7e, 0xad, 0x2e, 0x4c, 0x33, 0xf2, 0xde, 0x53, + 0x35, 0xec, 0xfe, 0xad, 0xb2, 0xb0, 0xf6, 0x34, 0x86, 0x0f, 0x9c, 0x60, 0x19, 0x87, 0x1e, 0x42, + 0x87, 0xe5, 0x52, 0x41, 0xec, 0x5e, 0x05, 0xd1, 0x2f, 0x0b, 0x6b, 0xb7, 0x29, 0x6f, 0xd0, 0xc4, + 0x20, 0x07, 0x76, 0x30, 0xe7, 0x8c, 0x9b, 0x5d, 0x95, 0xca, 0xba, 0x57, 0x6d, 0x42, 0x27, 0xb0, + 0x2d, 0xc3, 0x44, 0x98, 0x60, 0xb7, 0xdc, 0xae, 0x3f, 0x2c, 0x0b, 0xeb, 0x1d, 0x4d, 0xcb, 0xbd, + 0xbb, 0x7a, 0xba, 0x31, 0x59, 0xe0, 0xb5, 0x54, 0x55, 0x28, 0x7a, 0x01, 0xbd, 0x8c, 0xb3, 0x08, + 0x0b, 0xa1, 0x3a, 0xd6, 0x53, 0x1d, 0xfb, 0xa6, 0x2c, 0x2c, 0x57, 0x47, 0xba, 0xa7, 0x23, 0xbd, + 0xe4, 0xf4, 0xe9, 0x7c, 0xe8, 0x10, 0x3a, 0x94, 0xc5, 0xb8, 0x6a, 0x59, 0x5f, 0xe5, 0x89, 0xca, + 0xc2, 0xda, 0xd7, 0xa9, 0xc7, 0x4e, 0xd0, 0xb8, 0xa0, 0x1f, 0xa1, 0x5f, 0x2f, 0x2d, 0xc6, 0x95, + 0xda, 0x3d, 0xa5, 0xf6, 0xbc, 0x2c, 0xac, 0xb7, 0xf5, 0x90, 0xa3, 0x6b, 0x1c, 0x30, 0x9d, 0x0f, + 0x3d, 0x81, 0x9d, 0x8c, 0x93, 0x08, 0x9b, 0xfb, 0x4a, 0xeb, 0x87, 0x65, 0x61, 0xdd, 0xd7, 0x89, + 0xef, 0x6f, 0x24, 0x8e, 0x18, 0xa1, 0xe2, 0x8c, 0x09, 0x22, 0xc9, 0x02, 0x9f, 0x63, 0xce, 0x9c, + 0xa0, 0x86, 0x41, 0x1e, 0xf4, 0x26, 0x73, 0x16, 0xcd, 0x1e, 0x63, 0x92, 0x4c, 0xa5, 0x79, 0xd3, + 0x36, 0xdc, 0xd6, 0x3f, 0x3a, 0xad, 0x3b, 0xa0, 0xaf, 0x60, 0x17, 0xa7, 0x44, 0x4a, 0xcc, 0x85, + 0x39, 0xb0, 0x5b, 0x6e, 0x6f, 0xfc, 0x86, 0x7e, 0x5f, 0x57, 0xfb, 0xd6, 0x3b, 0xad, 0xbd, 0xfc, + 0xdb, 0x65, 0x61, 0x99, 0x1b, 0xae, 0x6e, 0x35, 0x0c, 0x4e, 0xb0, 0x02, 0x43, 0x0b, 0xe8, 0x84, + 0x71, 0xcc, 0xb1, 0x10, 0xe6, 0x2d, 0x55, 0xd3, 0x6f, 0x2f, 0x6b, 0xba, 0x79, 0x45, 0x87, 0x51, + 0xb4, 0x8c, 0xa8, 0x6a, 0x3a, 0xd4, 0x6a, 0x1a, 0x31, 0x91, 0x32, 0xb1, 0xfc, 0x19, 0x8a, 0x78, + 0x56, 0x3f, 0x0f, 0xde, 0x49, 0x14, 0x9d, 0xd4, 0x11, 0x41, 0x43, 0x76, 0xf0, 0xab, 0x01, 0x9d, + 0xa5, 0x56, 0x24, 0x01, 0x78, 0x4e, 0x29, 0xae, 0x5b, 0xfb, 0x2a, 0x5f, 0x0a, 0x8d, 0x07, 0xf9, + 0xeb, 0x2d, 0xd8, 0x52, 0x2d, 0xf8, 0xf7, 0x8d, 0xa7, 0x07, 0xbd, 0xfb, 0x04, 0xda, 0xf5, 0xaa, + 0x44, 0x3d, 0xe8, 0x7c, 0x49, 0x67, 0x94, 0x3d, 0xa7, 0x83, 0x1b, 0xa8, 0x0f, 0xbb, 0x67, 0x9c, + 0x65, 0x4c, 0xe0, 0x78, 0x60, 0xa0, 0x7d, 0x80, 0x4f, 0xe8, 0x19, 0x67, 0x49, 0x95, 0xf8, 0x60, + 0x0b, 0xed, 0x41, 0xf7, 0x11, 0x4b, 0xb3, 0x39, 0x96, 0x38, 0x1e, 0xb4, 0x10, 0x40, 0xfb, 0xe3, + 0x90, 0xcc, 0x71, 0x3c, 0xd8, 0xf6, 0x1f, 0xfc, 0xf6, 0xfb, 0x9d, 0x1b, 0xbf, 0xfc, 0x71, 0xc7, + 0x38, 0xff, 0x0f, 0x69, 0xad, 0x5e, 0xf1, 0x49, 0x5b, 0x6d, 0x96, 0xa3, 0xbf, 0x03, 0x00, 0x00, + 0xff, 0xff, 0x4d, 0xc0, 0x65, 0x90, 0xd9, 0x07, 0x00, 0x00, } func (this *Execution) Equal(that interface{}) bool { @@ -254,19 +253,19 @@ func (this *Execution) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.Hash.Equal(that1.Hash) { + if !bytes.Equal(this.Hash, that1.Hash) { return false } - if !this.ParentHash.Equal(that1.ParentHash) { + if !bytes.Equal(this.ParentHash, that1.ParentHash) { return false } - if !this.EventHash.Equal(that1.EventHash) { + if !bytes.Equal(this.EventHash, that1.EventHash) { return false } if this.Status != that1.Status { return false } - if !this.InstanceHash.Equal(that1.InstanceHash) { + if !bytes.Equal(this.InstanceHash, that1.InstanceHash) { return false } if this.TaskKey != that1.TaskKey { @@ -289,13 +288,13 @@ func (this *Execution) Equal(that interface{}) bool { return false } } - if !this.ProcessHash.Equal(that1.ProcessHash) { + if !bytes.Equal(this.ProcessHash, that1.ProcessHash) { return false } if this.NodeKey != that1.NodeKey { return false } - if !this.ExecutorHash.Equal(that1.ExecutorHash) { + if !bytes.Equal(this.ExecutorHash, that1.ExecutorHash) { return false } if this.Price != that1.Price { @@ -339,7 +338,7 @@ func (this *Execution_Emitter) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.RunnerHash.Equal(that1.RunnerHash) { + if !bytes.Equal(this.RunnerHash, that1.RunnerHash) { return false } if this.BlockHeight != that1.BlockHeight { diff --git a/hash/hash.go b/hash/hash.go index cf85e8f81..fbe6a6642 100644 --- a/hash/hash.go +++ b/hash/hash.go @@ -113,37 +113,6 @@ func (h Hash) Equal(h1 Hash) bool { return bytes.Equal(h, h1) } -// Marshal marshals hash into slice of bytes. It's used by protobuf. -func (h Hash) Marshal() ([]byte, error) { - if len(h) != size { - return nil, errInvalidLen - } - return h, nil -} - -// MarshalTo marshals hash into slice of bytes. It's used by protobuf. -func (h Hash) MarshalTo(data []byte) (int, error) { - if len(h) != size { - return 0, errInvalidLen - } - return copy(data, h), nil -} - -// Unmarshal unmarshals slice of bytes into hash. It's used by protobuf. -func (h *Hash) Unmarshal(data []byte) error { - if len(data) != size { - return errInvalidLen - } - *h = make([]byte, len(data)) - copy(*h, data) - return nil -} - -// Size retruns size of hash. It's used by protobuf. -func (h Hash) Size() int { - return len(h) -} - // Valid checks if service hash length is valid. // It treats empty hash as valid one. func (h Hash) Valid() bool { diff --git a/hash/hash_test.go b/hash/hash_test.go index 6607d9237..4faf9d003 100644 --- a/hash/hash_test.go +++ b/hash/hash_test.go @@ -76,12 +76,6 @@ func TestEqual(t *testing.T) { assert.False(t, zero.Equal(one)) } -func TestSize(t *testing.T) { - assert.Equal(t, 0, Hash(nil).Size()) - assert.Equal(t, size, zero.Size()) - assert.Equal(t, 5, Hash([]byte("hello")).Size()) -} - func TestMarshalJSON(t *testing.T) { b, err := json.Marshal(Int(1)) assert.NoError(t, err) @@ -93,28 +87,3 @@ func TestUnmarshalJSON(t *testing.T) { assert.NoError(t, json.Unmarshal([]byte("\"4uQeVj5tqViQh7yWWGStvkEG1Zmhx6uasJtWCJziofM\""), &h)) assert.Equal(t, Int(1), h) } - -func TestUnmarshal(t *testing.T) { - var hash Hash - data := []byte(Int(1)) - hash.Unmarshal(data) - // check if unmarshal copy the data - // test if two slises do not share the same address - assert.True(t, &hash[cap(hash)-1] != &data[cap(data)-1]) -} - -func TestWrongLength(t *testing.T) { - var h Hash - wrongLenByte := []byte("hello") - t.Run("Marshal", func(t *testing.T) { - _, err := Hash(wrongLenByte).Marshal() - require.EqualError(t, err, "hash: invalid length") - }) - t.Run("MarshalTo", func(t *testing.T) { - _, err := h.MarshalTo(wrongLenByte) - require.EqualError(t, err, "hash: invalid length") - }) - t.Run("Unmarshal", func(t *testing.T) { - require.EqualError(t, h.Unmarshal(wrongLenByte), "hash: invalid length") - }) -} diff --git a/instance/instance.pb.go b/instance/instance.pb.go index 0b659d5d2..d391fb778 100644 --- a/instance/instance.pb.go +++ b/instance/instance.pb.go @@ -25,9 +25,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Instance represents service's instance. type Instance struct { - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" hash:"-" validate:"required,hash"` - ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=serviceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash" hash:"name:2" validate:"required,hash"` - EnvHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=envHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"envHash" hash:"name:3" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" hash:"-" validate:"required,hash"` + ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=serviceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash,omitempty" hash:"name:2" validate:"required,hash"` + EnvHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=envHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"envHash,omitempty" hash:"name:3" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -64,23 +64,23 @@ func init() { func init() { proto.RegisterFile("instance.proto", fileDescriptor_fd22322185b2070b) } var fileDescriptor_fd22322185b2070b = []byte{ - // 255 bytes of a gzipped FileDescriptorProto + // 252 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0xcc, 0x2b, 0x2e, 0x49, 0xcc, 0x4b, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xca, 0x4d, 0x2d, 0x4e, 0xd7, 0x2b, 0xa9, 0x2c, 0x48, 0x2d, 0x96, 0x52, 0x4a, 0xcf, 0x4f, 0xcf, 0xd7, 0x07, 0x8b, 0x27, - 0x95, 0xa6, 0xe9, 0x83, 0x78, 0x60, 0x0e, 0x98, 0x05, 0x51, 0xaf, 0xf4, 0x89, 0x89, 0x8b, 0xc3, - 0x13, 0x6a, 0x84, 0x50, 0x0e, 0x17, 0x4b, 0x46, 0x62, 0x71, 0x86, 0x04, 0xa3, 0x02, 0xa3, 0x06, - 0x8f, 0x53, 0xc4, 0x89, 0x7b, 0xf2, 0x0c, 0xb7, 0xee, 0xc9, 0x6b, 0xa7, 0x67, 0x96, 0x64, 0x94, - 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x83, 0x4c, 0xd7, 0x4d, 0xcb, 0x2f, 0xcd, 0x4b, 0x49, 0x2c, - 0xc9, 0xcc, 0xcf, 0xd3, 0x4f, 0xcd, 0x4b, 0xcf, 0xcc, 0x4b, 0xd5, 0x07, 0xe9, 0xd2, 0xf3, 0x48, - 0x2c, 0xce, 0xf8, 0x74, 0x4f, 0x5e, 0x11, 0xc4, 0xb1, 0x52, 0xd2, 0x55, 0x52, 0x28, 0x4b, 0xcc, - 0xc9, 0x4c, 0x49, 0x2c, 0x49, 0xb5, 0x52, 0x2a, 0x4a, 0x2d, 0x2c, 0xcd, 0x2c, 0x4a, 0x4d, 0xd1, - 0x01, 0xc9, 0x29, 0x05, 0x81, 0x6d, 0x11, 0xaa, 0xe7, 0xe2, 0x2e, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, - 0x4e, 0x05, 0xe9, 0x94, 0x60, 0x02, 0x5b, 0x1a, 0x4b, 0x9e, 0xa5, 0x6a, 0x10, 0x4b, 0xf3, 0x12, - 0x73, 0x53, 0xad, 0x8c, 0xf0, 0xd8, 0x8c, 0x6c, 0xa3, 0x50, 0x39, 0x17, 0x7b, 0x6a, 0x5e, 0x19, - 0xd8, 0x72, 0x66, 0x6a, 0x59, 0x6e, 0x8c, 0xc7, 0x72, 0x98, 0x6d, 0x4e, 0x26, 0x27, 0x1e, 0xca, - 0x31, 0xac, 0x78, 0x24, 0xc7, 0x18, 0xa5, 0x45, 0xd8, 0x26, 0x58, 0x04, 0x27, 0xb1, 0x81, 0x63, - 0xcc, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x1b, 0xdc, 0x00, 0xf3, 0x01, 0x00, 0x00, + 0x95, 0xa6, 0xe9, 0x83, 0x78, 0x60, 0x0e, 0x98, 0x05, 0x51, 0xaf, 0xf4, 0x8c, 0x89, 0x8b, 0xc3, + 0x13, 0x6a, 0x84, 0x50, 0x06, 0x17, 0x4b, 0x46, 0x62, 0x71, 0x86, 0x04, 0xa3, 0x02, 0xa3, 0x06, + 0x8f, 0x53, 0xc8, 0xa7, 0x7b, 0xf2, 0x8a, 0x20, 0xbe, 0x95, 0x92, 0xae, 0x92, 0x42, 0x59, 0x62, + 0x4e, 0x66, 0x4a, 0x62, 0x49, 0xaa, 0x95, 0x52, 0x51, 0x6a, 0x61, 0x69, 0x66, 0x51, 0x6a, 0x8a, + 0x0e, 0x48, 0x4e, 0xe9, 0xd7, 0x3d, 0x79, 0xed, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, + 0xfc, 0x5c, 0x7d, 0x90, 0xf5, 0xba, 0x69, 0xf9, 0xa5, 0x79, 0x29, 0x89, 0x25, 0x99, 0xf9, 0x79, + 0xfa, 0xa9, 0x79, 0xe9, 0x99, 0x79, 0xa9, 0xfa, 0x20, 0xa5, 0x7a, 0x1e, 0x89, 0xc5, 0x19, 0x41, + 0x60, 0x1b, 0x84, 0xaa, 0xb9, 0xb8, 0x8b, 0x53, 0x8b, 0xca, 0x32, 0x93, 0x53, 0x41, 0x82, 0x12, + 0x4c, 0x60, 0x0b, 0x23, 0x3f, 0xdd, 0x93, 0x57, 0x83, 0x58, 0x98, 0x97, 0x98, 0x9b, 0x6a, 0x65, + 0x44, 0x3d, 0x5b, 0x91, 0x6d, 0x13, 0x2a, 0xe6, 0x62, 0x4f, 0xcd, 0x2b, 0x03, 0x5b, 0xcc, 0x8c, + 0xd5, 0x62, 0x63, 0xea, 0x59, 0x0c, 0xb3, 0xc9, 0xc9, 0xe4, 0xc4, 0x43, 0x39, 0x86, 0x15, 0x8f, + 0xe4, 0x18, 0xa3, 0xb4, 0x08, 0xeb, 0x87, 0x45, 0x6a, 0x12, 0x1b, 0x38, 0x96, 0x8c, 0x01, 0x01, + 0x00, 0x00, 0xff, 0xff, 0xc8, 0xf9, 0x30, 0x37, 0xe7, 0x01, 0x00, 0x00, } func (this *Instance) Equal(that interface{}) bool { @@ -102,13 +102,13 @@ func (this *Instance) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.Hash.Equal(that1.Hash) { + if !bytes.Equal(this.Hash, that1.Hash) { return false } - if !this.ServiceHash.Equal(that1.ServiceHash) { + if !bytes.Equal(this.ServiceHash, that1.ServiceHash) { return false } - if !this.EnvHash.Equal(that1.EnvHash) { + if !bytes.Equal(this.EnvHash, that1.EnvHash) { return false } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { diff --git a/ownership/ownership.pb.go b/ownership/ownership.pb.go index 203112c10..c16530526 100644 --- a/ownership/ownership.pb.go +++ b/ownership/ownership.pb.go @@ -58,12 +58,12 @@ func (Ownership_Resource) EnumDescriptor() ([]byte, []int) { // Ownership is a ownership relation between one owner and a resource. type Ownership struct { // Service's hash. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" hash:"-" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" hash:"-" validate:"required,hash"` // The owner of the resource. // TODO: to transform to accAddress Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" hash:"name:2" validate:"required"` // Resource's hash. - ResourceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=resourceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"resourceHash" hash:"name:3" validate:"required,hash"` + ResourceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=resourceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"resourceHash,omitempty" hash:"name:3" validate:"required,hash"` // Resource's type. Resource Ownership_Resource `protobuf:"varint,4,opt,name=resource,proto3,enum=mesg.types.Ownership_Resource" json:"resource,omitempty" validate:"required"` // The address of the resource. @@ -105,33 +105,32 @@ func init() { func init() { proto.RegisterFile("ownership.proto", fileDescriptor_21ae26e0dccf9d04) } var fileDescriptor_21ae26e0dccf9d04 = []byte{ - // 407 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xbf, 0x6e, 0xd3, 0x40, - 0x18, 0xcf, 0xb5, 0x6e, 0x49, 0x8f, 0x8a, 0x5a, 0xc7, 0x80, 0xc5, 0x10, 0x9b, 0x93, 0x80, 0x48, - 0x60, 0x5b, 0x6a, 0xc5, 0x62, 0xa6, 0x7a, 0x62, 0x02, 0xe4, 0x2e, 0x08, 0xc1, 0x70, 0x39, 0x7f, - 0xb5, 0x2d, 0xe2, 0xbb, 0x70, 0x67, 0x07, 0x31, 0xb2, 0xf0, 0x2c, 0x3c, 0x4a, 0x1e, 0x80, 0x89, - 0xc1, 0x12, 0x3c, 0x42, 0x46, 0x26, 0xe4, 0x73, 0x9c, 0x04, 0x14, 0x45, 0xa8, 0x93, 0xfd, 0xb3, - 0xef, 0xf7, 0xe7, 0xfb, 0xdd, 0x87, 0xcf, 0xe4, 0x27, 0x01, 0x4a, 0xe7, 0xc5, 0x2c, 0x98, 0x29, - 0x59, 0x49, 0x82, 0x4b, 0xd0, 0x59, 0x50, 0x7d, 0x9e, 0x81, 0xbe, 0x4f, 0x33, 0x99, 0xc9, 0xd0, - 0x7c, 0x9f, 0xd4, 0xd7, 0x61, 0x8b, 0x0c, 0x30, 0x6f, 0xdd, 0x79, 0xfa, 0xdd, 0xc2, 0x27, 0xaf, - 0x7a, 0x0d, 0x32, 0xc5, 0x56, 0xce, 0x74, 0xee, 0x20, 0x0f, 0x8d, 0x4f, 0xe3, 0x37, 0x8b, 0xc6, - 0x1d, 0xfc, 0x68, 0xdc, 0x27, 0x59, 0x51, 0xe5, 0xf5, 0x24, 0xe0, 0xb2, 0x0c, 0x5b, 0x79, 0xff, - 0x5a, 0xd6, 0x22, 0x65, 0x55, 0x21, 0x45, 0x08, 0x22, 0x2b, 0x04, 0x84, 0x2d, 0x2b, 0x78, 0xc1, - 0x74, 0xbe, 0x6c, 0xdc, 0x07, 0x2d, 0x88, 0xa8, 0x4f, 0xbd, 0x39, 0x9b, 0x16, 0x29, 0xab, 0x20, - 0xa2, 0x0a, 0x3e, 0xd6, 0x85, 0x82, 0xf4, 0x69, 0xfb, 0x8f, 0x26, 0xc6, 0x85, 0x3c, 0xc7, 0x47, - 0x26, 0xbe, 0x73, 0xe0, 0xa1, 0xf1, 0x49, 0xfc, 0x70, 0xc3, 0x15, 0xac, 0x84, 0xe8, 0x7c, 0x97, - 0x00, 0x4d, 0x3a, 0x0e, 0xf9, 0x82, 0xf0, 0xa9, 0x02, 0x2d, 0x6b, 0xc5, 0xa1, 0x35, 0x76, 0x0e, - 0x4d, 0xe6, 0xf7, 0x37, 0xcb, 0xfc, 0x68, 0xcb, 0xf7, 0x62, 0x4f, 0xf0, 0xbf, 0x2c, 0xc9, 0x15, - 0x1e, 0xf6, 0xd8, 0xb1, 0x3c, 0x34, 0xbe, 0x73, 0x3e, 0x0a, 0x36, 0xfd, 0x07, 0xeb, 0x5e, 0x83, - 0x64, 0x75, 0x2a, 0xbe, 0xb7, 0x6c, 0xdc, 0xbb, 0xbb, 0xa6, 0x5a, 0x0b, 0x91, 0xaf, 0x08, 0x9f, - 0xf5, 0xe0, 0x32, 0x4d, 0x15, 0x68, 0xed, 0x1c, 0x99, 0xd9, 0xde, 0x2d, 0x1b, 0xf7, 0xf1, 0xbe, - 0x72, 0x19, 0xe7, 0xac, 0x63, 0xd0, 0xdf, 0x8d, 0xeb, 0x6f, 0x55, 0xc0, 0xa5, 0x2e, 0xa5, 0x5e, - 0x3d, 0x7c, 0x9d, 0x7e, 0x08, 0xbb, 0x88, 0x97, 0x9c, 0xaf, 0x3c, 0x92, 0x7f, 0x4d, 0x69, 0x84, - 0x87, 0x7d, 0x6e, 0x32, 0xc4, 0xd6, 0x4b, 0x29, 0xc0, 0x1e, 0x90, 0xdb, 0xf8, 0xd6, 0x15, 0xa8, - 0x79, 0xc1, 0xc1, 0x46, 0x2d, 0x78, 0xad, 0x24, 0x07, 0xad, 0xed, 0x03, 0x82, 0xf1, 0x71, 0x52, - 0x0b, 0x01, 0xca, 0x3e, 0x8c, 0x9f, 0x2d, 0x7e, 0x8e, 0x06, 0xdf, 0x7e, 0x8d, 0xd0, 0xdb, 0xff, - 0xb8, 0x88, 0xf5, 0x0e, 0x4f, 0x8e, 0xcd, 0x52, 0x5e, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xc1, - 0xad, 0x64, 0x6e, 0xd7, 0x02, 0x00, 0x00, + // 400 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x3f, 0x8f, 0xd3, 0x30, + 0x14, 0xbf, 0xdc, 0xe5, 0x8e, 0x9e, 0x39, 0x71, 0x91, 0x19, 0x88, 0x18, 0x9a, 0x60, 0x09, 0xa8, + 0x04, 0x49, 0xa4, 0xab, 0x58, 0xc2, 0xd4, 0x4c, 0x4c, 0x80, 0x52, 0x16, 0x10, 0x8b, 0xeb, 0xbc, + 0x26, 0x11, 0xc4, 0x2e, 0x76, 0x52, 0xc4, 0xc0, 0xca, 0x67, 0xe1, 0xa3, 0x20, 0xf1, 0x1d, 0x22, + 0xc1, 0x47, 0xc8, 0xc8, 0x84, 0xec, 0x34, 0x6d, 0x41, 0x15, 0x62, 0xb8, 0x29, 0xf9, 0xd9, 0xef, + 0xfd, 0xfe, 0x3c, 0x3f, 0x74, 0x29, 0x3e, 0x72, 0x90, 0xaa, 0x28, 0x57, 0xe1, 0x4a, 0x8a, 0x5a, + 0x60, 0x54, 0x81, 0xca, 0xc3, 0xfa, 0xd3, 0x0a, 0xd4, 0x5d, 0x92, 0x8b, 0x5c, 0x44, 0xe6, 0x7c, + 0xd1, 0x2c, 0x23, 0x8d, 0x0c, 0x30, 0x7f, 0x7d, 0x3d, 0xf9, 0x6e, 0xa3, 0xf3, 0x17, 0x03, 0x07, + 0x2e, 0x90, 0x5d, 0x50, 0x55, 0xb8, 0x96, 0x6f, 0x4d, 0x2e, 0x92, 0x57, 0x5d, 0xeb, 0xdd, 0xd3, + 0x38, 0x26, 0x01, 0xf1, 0xd7, 0xf4, 0x7d, 0x99, 0xd1, 0x1a, 0x62, 0x22, 0xe1, 0x43, 0x53, 0x4a, + 0xc8, 0x1e, 0xeb, 0x3b, 0xf2, 0xab, 0xf5, 0x1e, 0xe5, 0x65, 0x5d, 0x34, 0x8b, 0x90, 0x89, 0x2a, + 0xd2, 0xfa, 0xc1, 0x52, 0x34, 0x3c, 0xa3, 0x75, 0x29, 0x78, 0x04, 0x3c, 0x2f, 0x39, 0x44, 0xba, + 0x34, 0x7c, 0x46, 0x55, 0x91, 0x1a, 0x05, 0xfc, 0x14, 0x9d, 0x1a, 0xeb, 0xee, 0xb1, 0x6f, 0x4d, + 0xce, 0x93, 0xfb, 0x3b, 0x29, 0x4e, 0x2b, 0x88, 0xaf, 0x0e, 0xe9, 0x91, 0xb4, 0xef, 0xc1, 0x9f, + 0xd1, 0x85, 0x04, 0x25, 0x1a, 0xc9, 0x40, 0x53, 0xba, 0x27, 0xc6, 0xee, 0xeb, 0xae, 0xf5, 0x1e, + 0xec, 0x71, 0x4c, 0xaf, 0xcf, 0xf3, 0x1f, 0x72, 0x78, 0x8e, 0x46, 0x03, 0x76, 0x6d, 0xdf, 0x9a, + 0xdc, 0xba, 0x1a, 0x87, 0xbb, 0xb1, 0x87, 0xdb, 0x71, 0x86, 0xe9, 0xa6, 0x2a, 0xb9, 0xd3, 0xb5, + 0xde, 0xed, 0x43, 0x81, 0xb6, 0x44, 0xf8, 0x8b, 0x85, 0x2e, 0x07, 0x30, 0xcb, 0x32, 0x09, 0x4a, + 0xb9, 0xa7, 0x26, 0xd7, 0xdb, 0xae, 0xf5, 0x1e, 0xfe, 0xeb, 0x19, 0x28, 0x63, 0xb4, 0xef, 0xd0, + 0xc1, 0x82, 0xbd, 0x60, 0x4c, 0xa8, 0x4a, 0xa8, 0xcd, 0x27, 0x50, 0xd9, 0xbb, 0xa8, 0xb7, 0x38, + 0x63, 0x6c, 0xa3, 0x91, 0xfe, 0x2d, 0x4a, 0x62, 0x34, 0x1a, 0x7c, 0xe3, 0x11, 0xb2, 0x9f, 0x0b, + 0x0e, 0xce, 0x11, 0xbe, 0x89, 0x6e, 0xcc, 0x41, 0xae, 0x4b, 0x06, 0x8e, 0xa5, 0xc1, 0x4b, 0x29, + 0x18, 0x28, 0xe5, 0x1c, 0x63, 0x84, 0xce, 0xd2, 0x86, 0x73, 0x90, 0xce, 0x49, 0xf2, 0xe4, 0xdb, + 0x8f, 0xf1, 0xd1, 0xd7, 0x9f, 0x63, 0xeb, 0xcd, 0x7f, 0x8c, 0x77, 0xbb, 0xba, 0x8b, 0x33, 0xb3, + 0x8b, 0xd3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x54, 0xea, 0xef, 0x74, 0xce, 0x02, 0x00, 0x00, } func (this *Ownership) Equal(that interface{}) bool { @@ -153,13 +152,13 @@ func (this *Ownership) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.Hash.Equal(that1.Hash) { + if !bytes.Equal(this.Hash, that1.Hash) { return false } if this.Owner != that1.Owner { return false } - if !this.ResourceHash.Equal(that1.ResourceHash) { + if !bytes.Equal(this.ResourceHash, that1.ResourceHash) { return false } if this.Resource != that1.Resource { diff --git a/process/process.pb.go b/process/process.pb.go index 098ce8f77..b1b68ad68 100644 --- a/process/process.pb.go +++ b/process/process.pb.go @@ -98,7 +98,7 @@ func (Process_Node_Filter_Condition_Predicate) EnumDescriptor() ([]byte, []int) // A process is a configuration to trigger a specific task when certains conditions of a trigger are valid. type Process struct { // Process's hash - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" hash:"-" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" hash:"-" validate:"required,hash"` // Process's name Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" hash:"name:2" validate:"required,printascii"` // Nodes with information related to the execution to trigger. @@ -258,7 +258,7 @@ func (*Process_Node) XXX_OneofWrappers() []interface{} { type Process_Node_Result struct { // Hash of the instance that triggers the process. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" hash:"name:2" validate:"required,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" hash:"name:2" validate:"required,hash"` // Key of the task that triggers the process. TaskKey string `protobuf:"bytes,3,opt,name=taskKey,proto3" json:"taskKey,omitempty" hash:"name:3" validate:"printascii,required"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -292,7 +292,7 @@ var xxx_messageInfo_Process_Node_Result proto.InternalMessageInfo type Process_Node_Event struct { // Hash of the instance that triggers the process. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" hash:"name:2" validate:"required,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" hash:"name:2" validate:"required,hash"` // Key of the event that triggers the process. EventKey string `protobuf:"bytes,3,opt,name=eventKey,proto3" json:"eventKey,omitempty" hash:"name:3" validate:"printascii,required"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -326,7 +326,7 @@ var xxx_messageInfo_Process_Node_Event proto.InternalMessageInfo type Process_Node_Task struct { // Hash of the instance to execute. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" hash:"name:2" validate:"required,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" hash:"name:2" validate:"required,hash"` // Task of the instance to execute. TaskKey string `protobuf:"bytes,3,opt,name=taskKey,proto3" json:"taskKey,omitempty" hash:"name:3" validate:"printascii,required"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -836,84 +836,84 @@ func init() { func init() { proto.RegisterFile("process.proto", fileDescriptor_54c4d0e8c0aaf5c3) } var fileDescriptor_54c4d0e8c0aaf5c3 = []byte{ - // 1226 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x97, 0xdf, 0x6f, 0xdb, 0x54, - 0x14, 0xc7, 0xeb, 0xc4, 0x49, 0x9a, 0xd3, 0x6c, 0x0a, 0x57, 0x08, 0x59, 0x66, 0x9b, 0x8b, 0xa7, - 0xad, 0x1d, 0xac, 0x0e, 0x4b, 0xba, 0x0d, 0xca, 0x03, 0xaa, 0x4b, 0xb6, 0x95, 0x65, 0x59, 0x1b, - 0xd2, 0x09, 0x0d, 0x50, 0xe5, 0xda, 0x37, 0x89, 0x55, 0xc7, 0xce, 0x7c, 0xaf, 0x4b, 0xcb, 0x1b, - 0x12, 0x12, 0xaf, 0xfc, 0x19, 0xfc, 0x29, 0x13, 0x2f, 0xbc, 0x21, 0xe0, 0x21, 0x12, 0x7b, 0xe3, - 0x35, 0x12, 0x2f, 0x7b, 0x42, 0xf7, 0x5e, 0x27, 0x4d, 0x9b, 0x1f, 0x4d, 0x37, 0x90, 0x10, 0x4f, - 0x89, 0xed, 0x73, 0x3e, 0xc7, 0xe7, 0x9c, 0x7b, 0xbe, 0xf7, 0x1a, 0x2e, 0x74, 0xc2, 0xc0, 0xc6, - 0x84, 0x18, 0x9d, 0x30, 0xa0, 0x01, 0x82, 0x36, 0x26, 0x4d, 0x83, 0x1e, 0x75, 0x30, 0x51, 0xf5, - 0x66, 0xd0, 0x0c, 0x0a, 0xfc, 0xfe, 0x5e, 0xd4, 0x28, 0xb0, 0x2b, 0x7e, 0xc1, 0xff, 0x09, 0x7b, - 0xf5, 0xed, 0xc1, 0x63, 0xee, 0x53, 0x20, 0x34, 0x8c, 0x6c, 0x2a, 0x1e, 0xea, 0x2f, 0x2f, 0x41, - 0x66, 0x4b, 0xe0, 0x91, 0x07, 0x72, 0xcb, 0x22, 0x2d, 0x45, 0x5a, 0x94, 0x96, 0x73, 0xe6, 0xe7, - 0xcf, 0xbb, 0xda, 0xdc, 0xef, 0x5d, 0xed, 0xbd, 0xa6, 0x4b, 0x5b, 0xd1, 0x9e, 0x61, 0x07, 0xed, - 0x02, 0x8b, 0xbc, 0xd2, 0x08, 0x22, 0xdf, 0xb1, 0xa8, 0x1b, 0xf8, 0x05, 0xec, 0x37, 0x5d, 0x1f, - 0x17, 0x98, 0x97, 0xf1, 0xc0, 0x22, 0xad, 0x5e, 0x57, 0x7b, 0x87, 0x5d, 0xac, 0xe9, 0x2b, 0xfa, - 0xe2, 0x81, 0xe5, 0xb9, 0x8e, 0x45, 0xf1, 0x9a, 0x1e, 0xe2, 0x67, 0x91, 0x1b, 0x62, 0xe7, 0x26, - 0x7b, 0xa6, 0xd7, 0x78, 0x14, 0xf4, 0x09, 0xc8, 0xbe, 0xd5, 0xc6, 0x4a, 0x62, 0x51, 0x5a, 0xce, - 0x9a, 0xef, 0xf7, 0xba, 0xda, 0x4d, 0xe1, 0xca, 0xee, 0xae, 0x15, 0xc7, 0xfa, 0x77, 0x42, 0xd7, - 0xa7, 0x16, 0xb1, 0x5d, 0x57, 0xaf, 0x71, 0x6f, 0xf4, 0x14, 0x52, 0x7e, 0xe0, 0x60, 0xa2, 0xc8, - 0x8b, 0xc9, 0xe5, 0x85, 0xa2, 0x62, 0x1c, 0x17, 0xc7, 0x88, 0xf3, 0x32, 0xaa, 0x81, 0x83, 0xcd, - 0x77, 0x7b, 0x5d, 0xed, 0xfa, 0x50, 0x80, 0xd5, 0xe1, 0x00, 0x8e, 0x7b, 0x80, 0x6f, 0xf6, 0xa3, - 0xe8, 0x35, 0x81, 0x64, 0x6c, 0xec, 0x34, 0x31, 0x51, 0x52, 0x93, 0xd9, 0x65, 0xa7, 0x39, 0xca, - 0xbe, 0x3d, 0x8d, 0xcd, 0x91, 0xe8, 0x00, 0x32, 0x96, 0xe3, 0x84, 0x98, 0x10, 0x25, 0xcd, 0xcb, - 0xfd, 0x65, 0xaf, 0xab, 0x2d, 0x4d, 0xab, 0x9d, 0x65, 0xdb, 0xb1, 0x87, 0xfe, 0xb2, 0xab, 0xad, - 0x0c, 0x75, 0xc5, 0x0e, 0x48, 0x3b, 0x20, 0xf1, 0xcf, 0x0a, 0x71, 0xf6, 0x45, 0xa3, 0x8d, 0x75, - 0xdb, 0x5e, 0x17, 0x1e, 0xb5, 0x7e, 0x30, 0xf5, 0x07, 0x05, 0x64, 0x56, 0x0f, 0x74, 0x17, 0x92, - 0xfb, 0xf8, 0x88, 0xf7, 0x3a, 0x6b, 0x5e, 0x3b, 0x6e, 0x1c, 0x4f, 0xe0, 0xd6, 0xb8, 0x37, 0xd0, - 0x6b, 0xcc, 0x03, 0x55, 0x20, 0x1d, 0x62, 0x12, 0x79, 0x94, 0x77, 0x6e, 0xa1, 0xa8, 0x4d, 0x2a, - 0xb9, 0x51, 0xe3, 0x66, 0xe6, 0x1b, 0xbd, 0xae, 0x76, 0xe1, 0x44, 0x6b, 0x1f, 0xcc, 0xd5, 0x62, - 0x06, 0xda, 0x84, 0x14, 0x3e, 0xc0, 0x3e, 0x55, 0x92, 0x1c, 0x76, 0x65, 0x22, 0xac, 0xcc, 0xac, - 0x46, 0x58, 0x25, 0xc6, 0x12, 0x04, 0x74, 0x0f, 0x64, 0x6a, 0x91, 0x7d, 0x45, 0xe6, 0xa4, 0xcb, - 0x13, 0x49, 0x75, 0x8b, 0xec, 0x8f, 0x80, 0x56, 0x19, 0x88, 0xfb, 0xa3, 0x0d, 0x48, 0xb6, 0xad, - 0x8e, 0x92, 0xe2, 0x98, 0x4b, 0x13, 0x31, 0x8f, 0xac, 0xce, 0x08, 0xe5, 0x36, 0xa3, 0x30, 0x6f, - 0x56, 0xa5, 0x86, 0xeb, 0x51, 0x1c, 0xf2, 0xf6, 0x4e, 0xab, 0xd2, 0x3d, 0x6e, 0x36, 0x82, 0xba, - 0xc3, 0xab, 0x24, 0x18, 0xea, 0xaf, 0x12, 0xa4, 0x45, 0x35, 0xd1, 0xb7, 0x12, 0xe4, 0x5c, 0x9f, - 0x50, 0xcb, 0xb7, 0x31, 0x1b, 0x39, 0xde, 0x85, 0x9c, 0xf9, 0xd5, 0xab, 0x4d, 0xeb, 0xf5, 0x33, - 0x47, 0x4e, 0x8c, 0xec, 0x89, 0x90, 0xe8, 0x53, 0xc8, 0xb0, 0x4a, 0x3d, 0xc4, 0x47, 0xbc, 0x6d, - 0xa3, 0xd3, 0x5b, 0x1a, 0x46, 0x1d, 0x0f, 0xed, 0xd0, 0x18, 0xf4, 0x01, 0xea, 0x6f, 0x12, 0xa4, - 0x78, 0x6f, 0xff, 0x13, 0x99, 0x55, 0x60, 0x9e, 0x2f, 0xa6, 0xd7, 0x49, 0x6d, 0x40, 0x50, 0x7f, - 0x91, 0x40, 0x66, 0xab, 0xed, 0x7f, 0xd7, 0xb4, 0x9f, 0xe7, 0x21, 0xf9, 0xc8, 0xea, 0xa0, 0x00, - 0x32, 0x41, 0x44, 0x3b, 0x11, 0x25, 0x8a, 0xc4, 0x35, 0xf2, 0xc6, 0xb4, 0x71, 0x31, 0x1e, 0x0b, - 0xdb, 0xb2, 0x4f, 0xc3, 0xa3, 0x11, 0xd1, 0xbc, 0x35, 0x45, 0x34, 0xfb, 0x51, 0xd4, 0xbf, 0xd2, - 0x90, 0x16, 0x14, 0xb4, 0x0d, 0xb2, 0x1f, 0x79, 0x1e, 0x57, 0xb0, 0x8b, 0xc5, 0xe5, 0x19, 0x02, - 0x1b, 0xd5, 0xc8, 0xf3, 0x46, 0x06, 0xed, 0x16, 0x9f, 0x7c, 0x86, 0x42, 0x77, 0x20, 0x47, 0x68, - 0xe8, 0xfa, 0xcd, 0x5d, 0x3b, 0xf0, 0x09, 0x8d, 0xb7, 0xa6, 0xb1, 0xfa, 0xb5, 0x20, 0x0c, 0x37, - 0x98, 0x1d, 0x2a, 0x43, 0xce, 0x09, 0xa2, 0x3d, 0x0f, 0xc7, 0x7e, 0xac, 0xbe, 0x92, 0xb9, 0xd8, - 0xeb, 0x6a, 0x97, 0x4e, 0xd6, 0xd7, 0x6a, 0xbb, 0x7e, 0xb0, 0xa6, 0x47, 0x3e, 0xb1, 0x1a, 0x98, - 0x63, 0x84, 0x9f, 0xc0, 0x14, 0x01, 0xf6, 0x82, 0xc0, 0x8b, 0x21, 0x4c, 0xc6, 0xe6, 0xc7, 0xeb, - 0x54, 0x96, 0x99, 0x09, 0x9f, 0x4d, 0x48, 0x86, 0xb8, 0x11, 0x8b, 0x95, 0x3e, 0x45, 0x8a, 0x1b, - 0x38, 0xc4, 0xbe, 0x8d, 0x27, 0x48, 0x56, 0x88, 0x1b, 0xac, 0xa0, 0x9e, 0x4b, 0x68, 0x2c, 0x58, - 0x33, 0x15, 0xb4, 0xe2, 0x12, 0x3a, 0x5e, 0xb9, 0x38, 0x0a, 0x55, 0x85, 0x94, 0x66, 0x38, 0x71, - 0x69, 0x16, 0xe2, 0x38, 0x55, 0xbd, 0xdb, 0x57, 0x55, 0xf5, 0x19, 0xc8, 0x2c, 0x24, 0x72, 0x4f, - 0xaf, 0xbb, 0xab, 0x33, 0xb0, 0x5f, 0x6d, 0xc5, 0xbd, 0x90, 0xc4, 0x52, 0xff, 0xe6, 0x74, 0xc8, - 0xd5, 0x19, 0xd3, 0xf9, 0x07, 0x56, 0xfd, 0x2e, 0xe4, 0x86, 0x21, 0x28, 0x3f, 0xb4, 0x77, 0x8b, - 0x4d, 0xf9, 0x43, 0x48, 0x1d, 0x58, 0x5e, 0x84, 0xe3, 0x3d, 0x79, 0x96, 0x72, 0xd4, 0x84, 0xc7, - 0x5a, 0xe2, 0x03, 0x49, 0x7f, 0x0b, 0x64, 0x36, 0x1b, 0xe8, 0x22, 0x40, 0x75, 0xa7, 0x52, 0xd9, - 0x7d, 0xb2, 0x5e, 0xd9, 0x29, 0xe7, 0xe7, 0xcc, 0x4c, 0x8c, 0xfd, 0xd7, 0xdf, 0x40, 0xfd, 0x4e, - 0x86, 0xb4, 0xd8, 0x09, 0x51, 0x07, 0xc0, 0x0e, 0x7c, 0xc7, 0x65, 0xf2, 0x47, 0x94, 0xc4, 0x19, - 0xba, 0x22, 0x9c, 0x8c, 0x8d, 0xbe, 0x87, 0x79, 0x8d, 0x89, 0x6a, 0xaf, 0xab, 0x5d, 0x9e, 0xa4, - 0x92, 0xac, 0xca, 0x7a, 0x6d, 0x28, 0x86, 0xfa, 0x7d, 0x12, 0xb2, 0x03, 0x00, 0x3a, 0x84, 0x6c, - 0x27, 0xc4, 0x8e, 0x6b, 0x5b, 0x54, 0x64, 0x73, 0xb1, 0x58, 0x9a, 0x39, 0xbc, 0xb1, 0xd5, 0x77, - 0x1d, 0x39, 0x54, 0x15, 0xc7, 0x1f, 0xaa, 0x8e, 0x83, 0xa1, 0xed, 0x7e, 0x0d, 0xc5, 0x11, 0xe6, - 0x4d, 0x11, 0xb5, 0x7f, 0x7c, 0x37, 0x9e, 0xb0, 0x67, 0x23, 0xd8, 0xd5, 0xf1, 0x58, 0x41, 0x42, - 0x5f, 0x9c, 0x57, 0x1f, 0x4e, 0xe3, 0x6f, 0x4f, 0x38, 0x0a, 0x86, 0xb8, 0xa1, 0x6f, 0x41, 0x76, - 0x90, 0x2e, 0x5a, 0x80, 0xcc, 0x8e, 0xbf, 0xef, 0x07, 0x5f, 0xfb, 0xf9, 0x39, 0x94, 0x86, 0x44, - 0x79, 0x3b, 0x2f, 0xb1, 0xdf, 0xfb, 0xf5, 0x7c, 0x02, 0x65, 0x20, 0x79, 0xbf, 0x5e, 0xce, 0x27, - 0xd9, 0x8d, 0x4a, 0x3d, 0x2f, 0xb3, 0x1b, 0x95, 0x7a, 0x39, 0x9f, 0x42, 0x39, 0x98, 0xdf, 0x78, - 0x5c, 0xad, 0xaf, 0x6f, 0x56, 0x3f, 0xcb, 0xa7, 0xd5, 0x3f, 0x13, 0x90, 0x1d, 0xbc, 0x0b, 0xfa, - 0x18, 0x32, 0xec, 0x24, 0xfe, 0xf0, 0xbc, 0xe7, 0xd4, 0xbe, 0x17, 0xaa, 0x82, 0xdc, 0xb1, 0x68, - 0x2b, 0x5e, 0x93, 0x4b, 0x67, 0xa7, 0x6f, 0x6c, 0x59, 0xb4, 0x35, 0x46, 0xf1, 0x6b, 0x9c, 0xa3, - 0xfe, 0x24, 0x81, 0xcc, 0x2c, 0xd0, 0x47, 0xc3, 0xa7, 0xe7, 0xa5, 0x5e, 0x57, 0xbb, 0x3a, 0xe9, - 0xad, 0x86, 0x3e, 0x59, 0x98, 0x8a, 0xb1, 0x51, 0xb9, 0x01, 0x29, 0xd7, 0x77, 0xf0, 0x21, 0x7f, - 0x2d, 0x79, 0xfc, 0xfe, 0x22, 0x2c, 0x06, 0x09, 0x24, 0x5f, 0x2f, 0x81, 0x52, 0x9c, 0x80, 0x09, - 0x30, 0x4f, 0xb0, 0x87, 0x6d, 0x1a, 0x84, 0x66, 0x1a, 0x64, 0x46, 0x52, 0x0f, 0x41, 0x66, 0x5f, - 0x31, 0xec, 0x8b, 0x80, 0x84, 0xf6, 0x39, 0xbf, 0x08, 0x48, 0x68, 0x33, 0x47, 0x67, 0xb0, 0x5b, - 0xce, 0xb8, 0xea, 0x99, 0x87, 0x59, 0x7a, 0xfe, 0xc7, 0x95, 0xb9, 0x1f, 0x5f, 0x5c, 0x91, 0x9e, - 0xde, 0x38, 0xfb, 0x04, 0x14, 0x7f, 0x04, 0xef, 0xa5, 0xf9, 0x3c, 0x94, 0xfe, 0x0e, 0x00, 0x00, - 0xff, 0xff, 0x12, 0xc3, 0x10, 0x5e, 0x16, 0x0f, 0x00, 0x00, + // 1221 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x97, 0x5d, 0x6f, 0x1b, 0x45, + 0x17, 0xc7, 0xb3, 0xf6, 0xda, 0x8e, 0x4f, 0xdc, 0xca, 0xcf, 0xe8, 0x11, 0x5a, 0x2d, 0x69, 0x1c, + 0xb6, 0x2a, 0x49, 0x20, 0x59, 0x13, 0x3b, 0x69, 0x21, 0x5c, 0xa0, 0x6c, 0x70, 0xdb, 0x50, 0xd7, + 0x4d, 0x8c, 0x53, 0x89, 0x82, 0x14, 0x6d, 0x76, 0xc7, 0xf6, 0x2a, 0xeb, 0x5d, 0x77, 0x67, 0x36, + 0x24, 0x48, 0x5c, 0x20, 0x21, 0xf1, 0x55, 0xf8, 0x28, 0x15, 0x37, 0x08, 0xc1, 0xb5, 0x25, 0x7a, + 0x83, 0xb8, 0xb5, 0xc4, 0x0d, 0x57, 0x68, 0x66, 0xd6, 0x8e, 0x13, 0xbf, 0xc4, 0xa1, 0x45, 0x48, + 0x5c, 0xd9, 0xbb, 0x7b, 0xce, 0xef, 0xcc, 0x39, 0x33, 0xe7, 0x3f, 0x33, 0x70, 0xa3, 0x1d, 0xf8, + 0x16, 0x26, 0x44, 0x6f, 0x07, 0x3e, 0xf5, 0x11, 0xb4, 0x30, 0x69, 0xe8, 0xf4, 0xac, 0x8d, 0x89, + 0xaa, 0x35, 0xfc, 0x86, 0x9f, 0xe7, 0xef, 0x8f, 0xc2, 0x7a, 0x9e, 0x3d, 0xf1, 0x07, 0xfe, 0x4f, + 0xd8, 0xab, 0x6f, 0xf6, 0x3f, 0x73, 0x9f, 0x3c, 0xa1, 0x41, 0x68, 0x51, 0xf1, 0x51, 0xfb, 0x6d, + 0x1e, 0x52, 0x7b, 0x02, 0x8f, 0x9a, 0x20, 0x37, 0x4d, 0xd2, 0x54, 0xa4, 0x45, 0x69, 0x39, 0x63, + 0xd4, 0xba, 0x9d, 0xdc, 0x5b, 0xec, 0x79, 0x4b, 0x5b, 0xd3, 0x16, 0x4f, 0x4c, 0xd7, 0xb1, 0x4d, + 0x8a, 0xb7, 0xb4, 0x00, 0x3f, 0x0f, 0x9d, 0x00, 0xdb, 0xab, 0xec, 0x9b, 0xf6, 0x67, 0x27, 0xf7, + 0x6e, 0xc3, 0xa1, 0xcd, 0xf0, 0x48, 0xb7, 0xfc, 0x56, 0x9e, 0x0d, 0x6d, 0xad, 0xee, 0x87, 0x9e, + 0x6d, 0x52, 0xc7, 0xf7, 0xf2, 0xd8, 0x6b, 0x38, 0x1e, 0xce, 0x33, 0x53, 0xfd, 0xa1, 0x49, 0x9a, + 0x55, 0x1e, 0x01, 0x7d, 0x0c, 0xb2, 0x67, 0xb6, 0xb0, 0x12, 0x5b, 0x94, 0x96, 0xd3, 0xc6, 0x7b, + 0xdd, 0x4e, 0x6e, 0x55, 0x44, 0x62, 0x6f, 0xb7, 0x0a, 0x23, 0xc3, 0xb5, 0x03, 0xc7, 0xa3, 0x26, + 0xb1, 0x1c, 0x47, 0xab, 0x72, 0x6f, 0xf4, 0x0c, 0x12, 0x9e, 0x6f, 0x63, 0xa2, 0xc8, 0x8b, 0xf1, + 0xe5, 0xb9, 0x82, 0xa2, 0x9f, 0x17, 0x46, 0x8f, 0x72, 0xd2, 0x2b, 0xbe, 0x8d, 0x8d, 0x77, 0xba, + 0x9d, 0xdc, 0xdb, 0x03, 0x01, 0x36, 0x06, 0x03, 0xd8, 0xce, 0x09, 0x5e, 0xed, 0x45, 0xd1, 0xaa, + 0x02, 0xc9, 0xd8, 0xd8, 0x6e, 0x60, 0xa2, 0x24, 0xc6, 0xb3, 0x4b, 0x76, 0x63, 0x98, 0xbd, 0x39, + 0x89, 0xcd, 0x91, 0xe8, 0x04, 0x52, 0xa6, 0x6d, 0x07, 0x98, 0x10, 0x25, 0xc9, 0x4b, 0xfd, 0x45, + 0xb7, 0x93, 0x5b, 0x9a, 0x54, 0x6a, 0xd3, 0xb2, 0x22, 0x0f, 0x56, 0xf0, 0xb5, 0x81, 0x82, 0x5b, + 0x3e, 0x69, 0xf9, 0x24, 0xfa, 0x59, 0x23, 0xf6, 0xb1, 0x98, 0x64, 0x7d, 0xdb, 0xb2, 0xb6, 0x85, + 0x47, 0xb5, 0x17, 0x4c, 0xfd, 0x46, 0x01, 0x99, 0xd5, 0x03, 0xdd, 0x83, 0xf8, 0x31, 0x3e, 0xe3, + 0xf3, 0x9c, 0x36, 0xee, 0x9c, 0xcf, 0x33, 0x4f, 0x60, 0x7d, 0xd4, 0x08, 0xb4, 0x2a, 0xf3, 0x40, + 0x65, 0x48, 0x06, 0x98, 0x84, 0x2e, 0xe5, 0x33, 0x37, 0x57, 0xc8, 0x8d, 0x2b, 0xb9, 0x5e, 0xe5, + 0x66, 0xc6, 0xff, 0xba, 0x9d, 0xdc, 0x8d, 0x0b, 0x53, 0xfb, 0x70, 0xa6, 0x1a, 0x31, 0xd0, 0x2e, + 0x24, 0xf0, 0x09, 0xf6, 0xa8, 0x12, 0xe7, 0xb0, 0x85, 0xb1, 0xb0, 0x12, 0xb3, 0x1a, 0x62, 0x15, + 0x19, 0x4b, 0x10, 0xd0, 0x7d, 0x90, 0xa9, 0x49, 0x8e, 0x15, 0x99, 0x93, 0x6e, 0x8d, 0x25, 0xd5, + 0x4c, 0x72, 0x3c, 0x04, 0xda, 0x60, 0x20, 0xee, 0x8f, 0x76, 0x20, 0xde, 0x32, 0xdb, 0x4a, 0x82, + 0x63, 0xe6, 0xc7, 0x62, 0x1e, 0x9b, 0xed, 0x21, 0xca, 0x26, 0xa3, 0x30, 0x6f, 0x56, 0xa5, 0xba, + 0xe3, 0x52, 0x1c, 0xf0, 0xe9, 0x9d, 0x54, 0xa5, 0xfb, 0xdc, 0x6c, 0x08, 0x75, 0x97, 0x57, 0x49, + 0x30, 0xd4, 0x9f, 0x25, 0x48, 0x8a, 0x6a, 0xa2, 0xaf, 0x21, 0xe3, 0x78, 0x84, 0x9a, 0x9e, 0x85, + 0x59, 0x33, 0xf1, 0x49, 0xc8, 0x18, 0x9f, 0x5d, 0x5a, 0x81, 0x85, 0xd7, 0xd7, 0xad, 0x17, 0xc2, + 0xa1, 0x4f, 0x20, 0xc5, 0x8a, 0xf4, 0x08, 0x9f, 0xf1, 0x19, 0x1b, 0x6e, 0xdc, 0xe2, 0x60, 0xe4, + 0xf3, 0x7e, 0x1d, 0xe8, 0x80, 0x1e, 0x40, 0xfd, 0x45, 0x82, 0x04, 0x9f, 0xd6, 0x7f, 0x3b, 0xa9, + 0x32, 0xcc, 0xf2, 0x25, 0xf4, 0x2a, 0x59, 0xf5, 0x09, 0xea, 0x4f, 0x12, 0xc8, 0x6c, 0x8d, 0xfd, + 0x97, 0xa6, 0xea, 0xc7, 0x59, 0x88, 0x3f, 0x36, 0xdb, 0xc8, 0x87, 0x94, 0x1f, 0xd2, 0x76, 0x48, + 0x89, 0x22, 0x71, 0x51, 0x5c, 0x99, 0xd4, 0x1f, 0xfa, 0x13, 0x61, 0x5b, 0xf2, 0x68, 0x70, 0x36, + 0xa4, 0x92, 0xeb, 0x13, 0x54, 0xb2, 0x17, 0x45, 0xfd, 0x23, 0x09, 0x49, 0x41, 0x41, 0xfb, 0x20, + 0x7b, 0xa1, 0xeb, 0x72, 0xc9, 0xba, 0x59, 0x58, 0x9e, 0x22, 0xb0, 0x5e, 0x09, 0x5d, 0x77, 0xa8, + 0xb3, 0xd6, 0x79, 0xab, 0x33, 0x14, 0xba, 0x0b, 0x19, 0x42, 0x03, 0xc7, 0x6b, 0x1c, 0x5a, 0xbe, + 0x47, 0x68, 0xb4, 0x17, 0x8d, 0x14, 0xac, 0x39, 0x61, 0xb8, 0xc3, 0xec, 0x50, 0x09, 0x32, 0xb6, + 0x1f, 0x1e, 0xb9, 0x38, 0xf2, 0x63, 0xf5, 0x95, 0x8c, 0xc5, 0x6e, 0x27, 0x37, 0x7f, 0xb1, 0xbe, + 0x66, 0xcb, 0xf1, 0xfc, 0x2d, 0x2d, 0xf4, 0x88, 0x59, 0xc7, 0x1c, 0x23, 0xfc, 0x04, 0xa6, 0x00, + 0x70, 0xe4, 0xfb, 0x6e, 0x04, 0x61, 0xba, 0x35, 0x3b, 0x5a, 0x98, 0xd2, 0xcc, 0x4c, 0xf8, 0xec, + 0x42, 0x3c, 0xc0, 0xf5, 0x48, 0x9d, 0xb4, 0x09, 0xda, 0x5b, 0xc7, 0x01, 0xf6, 0x2c, 0x3c, 0x46, + 0xa3, 0x02, 0x5c, 0x67, 0x05, 0x75, 0x1d, 0x42, 0x23, 0x85, 0x9a, 0xaa, 0xa0, 0x65, 0x87, 0xd0, + 0xd1, 0x52, 0xc5, 0x51, 0xa8, 0x22, 0xb4, 0x33, 0xc5, 0x89, 0x4b, 0xd3, 0x10, 0x47, 0xc9, 0xe8, + 0xbd, 0x9e, 0x8c, 0xaa, 0xcf, 0x41, 0x66, 0x21, 0x91, 0x73, 0x79, 0xdd, 0xdd, 0x9e, 0x82, 0xfd, + 0xf7, 0x56, 0xdc, 0x4b, 0x49, 0x2c, 0xf5, 0xaf, 0x2e, 0x87, 0xdc, 0x98, 0x32, 0x9d, 0xd7, 0xb0, + 0xea, 0x0f, 0x21, 0x33, 0x08, 0x41, 0xd9, 0x81, 0xcd, 0x5a, 0xec, 0xc2, 0x1f, 0x40, 0xe2, 0xc4, + 0x74, 0x43, 0x1c, 0x6d, 0xc2, 0xd3, 0x94, 0xa3, 0x2a, 0x3c, 0xb6, 0x62, 0xef, 0x4b, 0xda, 0x1b, + 0x20, 0xb3, 0xde, 0x40, 0x37, 0x01, 0x2a, 0x07, 0xe5, 0xf2, 0xe1, 0xd3, 0xed, 0xf2, 0x41, 0x29, + 0x3b, 0x63, 0xa4, 0x22, 0xec, 0x3f, 0x3e, 0x02, 0xf5, 0x5b, 0x19, 0x92, 0x62, 0xeb, 0x43, 0x6d, + 0x00, 0xcb, 0xf7, 0x6c, 0x87, 0x89, 0x1a, 0x51, 0x62, 0x57, 0xe8, 0x8a, 0x70, 0xd2, 0x77, 0x7a, + 0x1e, 0xc6, 0x9d, 0x17, 0x9d, 0xdc, 0x4c, 0xb7, 0x93, 0xbb, 0x35, 0x4e, 0x54, 0x59, 0x95, 0xb5, + 0xea, 0x40, 0x0c, 0xf5, 0xbb, 0x38, 0xa4, 0xfb, 0x00, 0x74, 0x0a, 0xe9, 0x76, 0x80, 0x6d, 0xc7, + 0x32, 0xa9, 0xc8, 0xe6, 0x66, 0xa1, 0x38, 0x75, 0x78, 0x7d, 0xaf, 0xe7, 0x3a, 0x74, 0x8a, 0x2a, + 0x8c, 0x3e, 0x45, 0x9d, 0x07, 0x43, 0xfb, 0xbd, 0x1a, 0x8a, 0x33, 0xcb, 0xff, 0x45, 0xd4, 0xde, + 0x59, 0x5d, 0x7f, 0xca, 0xbe, 0x0d, 0x61, 0x37, 0x46, 0x63, 0x05, 0x09, 0x7d, 0x7e, 0x5d, 0x7d, + 0xb8, 0x8c, 0xdf, 0x1c, 0x73, 0xf6, 0x0b, 0x70, 0x5d, 0xdb, 0x83, 0x74, 0x3f, 0x5d, 0x34, 0x07, + 0xa9, 0x03, 0xef, 0xd8, 0xf3, 0xbf, 0xf4, 0xb2, 0x33, 0x28, 0x09, 0xb1, 0xd2, 0x7e, 0x56, 0x62, + 0xbf, 0x0f, 0x6a, 0xd9, 0x18, 0x4a, 0x41, 0xfc, 0x41, 0xad, 0x94, 0x8d, 0xb3, 0x17, 0xe5, 0x5a, + 0x56, 0x66, 0x2f, 0xca, 0xb5, 0x52, 0x36, 0x81, 0x32, 0x30, 0xbb, 0xf3, 0xa4, 0x52, 0xdb, 0xde, + 0xad, 0x7c, 0x9a, 0x4d, 0xaa, 0xbf, 0xc7, 0x20, 0xdd, 0x1f, 0x0b, 0xfa, 0x08, 0x52, 0xec, 0xe8, + 0xfd, 0xe8, 0xba, 0x07, 0xd3, 0x9e, 0x17, 0xaa, 0x80, 0xdc, 0x36, 0x69, 0x33, 0x5a, 0x93, 0x4b, + 0x57, 0xa7, 0xaf, 0xef, 0x99, 0xb4, 0x39, 0x42, 0xf1, 0xab, 0x9c, 0xa3, 0xfe, 0x20, 0x81, 0xcc, + 0x2c, 0xd0, 0x87, 0x83, 0xc7, 0xe5, 0xa5, 0x6e, 0x27, 0x77, 0x7b, 0xdc, 0xa8, 0x06, 0xee, 0x28, + 0x4c, 0xc5, 0x58, 0xab, 0xac, 0x40, 0xc2, 0xf1, 0x6c, 0x7c, 0xca, 0x87, 0x25, 0x8f, 0xde, 0x5f, + 0x84, 0x45, 0x3f, 0x81, 0xf8, 0xab, 0x25, 0x50, 0x8c, 0x12, 0x30, 0x00, 0x66, 0x09, 0x76, 0xb1, + 0x45, 0xfd, 0xc0, 0x48, 0x82, 0xcc, 0x48, 0xea, 0x29, 0xc8, 0xec, 0xda, 0xc2, 0xae, 0x00, 0x24, + 0xb0, 0xae, 0x79, 0x05, 0x20, 0x81, 0xc5, 0x1c, 0xed, 0xfe, 0x6e, 0x39, 0xe5, 0xaa, 0x67, 0x1e, + 0x46, 0xf1, 0xc5, 0xaf, 0x0b, 0x33, 0xdf, 0xbf, 0x5c, 0x90, 0x9e, 0xad, 0x5c, 0x7d, 0xae, 0x89, + 0x6e, 0xbc, 0x47, 0x49, 0xde, 0x0f, 0xc5, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x8c, 0x12, + 0x4b, 0x03, 0x0f, 0x00, 0x00, } func (this *Process) Equal(that interface{}) bool { @@ -935,7 +935,7 @@ func (this *Process) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.Hash.Equal(that1.Hash) { + if !bytes.Equal(this.Hash, that1.Hash) { return false } if this.Name != that1.Name { @@ -1140,7 +1140,7 @@ func (this *Process_Node_Result) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.InstanceHash.Equal(that1.InstanceHash) { + if !bytes.Equal(this.InstanceHash, that1.InstanceHash) { return false } if this.TaskKey != that1.TaskKey { @@ -1170,7 +1170,7 @@ func (this *Process_Node_Event) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.InstanceHash.Equal(that1.InstanceHash) { + if !bytes.Equal(this.InstanceHash, that1.InstanceHash) { return false } if this.EventKey != that1.EventKey { @@ -1200,7 +1200,7 @@ func (this *Process_Node_Task) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.InstanceHash.Equal(that1.InstanceHash) { + if !bytes.Equal(this.InstanceHash, that1.InstanceHash) { return false } if this.TaskKey != that1.TaskKey { diff --git a/protobuf/api/event.pb.go b/protobuf/api/event.pb.go index 825c0ed20..74e3b5f21 100644 --- a/protobuf/api/event.pb.go +++ b/protobuf/api/event.pb.go @@ -71,9 +71,9 @@ func (m *StreamEventRequest) GetFilter() *StreamEventRequest_Filter { // Filter contains filtering criteria. type StreamEventRequest_Filter struct { // hash to filter events. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"omitempty,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"omitempty,hash"` // instance's hash to filter events. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" validate:"omitempty,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" validate:"omitempty,hash"` // key is the key of the event. Key string `protobuf:"bytes,3,opt,name=key,proto3" json:"key,omitempty" validate:"printascii"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -105,6 +105,20 @@ func (m *StreamEventRequest_Filter) XXX_DiscardUnknown() { var xxx_messageInfo_StreamEventRequest_Filter proto.InternalMessageInfo +func (m *StreamEventRequest_Filter) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + +func (m *StreamEventRequest_Filter) GetInstanceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.InstanceHash + } + return nil +} + func (m *StreamEventRequest_Filter) GetKey() string { if m != nil { return m.Key @@ -115,7 +129,7 @@ func (m *StreamEventRequest_Filter) GetKey() string { // CreateEventRequest defines request for execution update. type CreateEventRequest struct { // instanceHash is hash of instance that can proceed an execution. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" validate:"required,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" validate:"required,hash"` // key is the key of the event. Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty" validate:"required,printascii"` // data is the data for the event. @@ -149,6 +163,13 @@ func (m *CreateEventRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateEventRequest proto.InternalMessageInfo +func (m *CreateEventRequest) GetInstanceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.InstanceHash + } + return nil +} + func (m *CreateEventRequest) GetKey() string { if m != nil { return m.Key @@ -166,7 +187,7 @@ func (m *CreateEventRequest) GetData() *types.Struct { // CreateEventResponse defines response for execution update. type CreateEventResponse struct { // Hash represents event. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -196,6 +217,13 @@ func (m *CreateEventResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateEventResponse proto.InternalMessageInfo +func (m *CreateEventResponse) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + func init() { proto.RegisterType((*StreamEventRequest)(nil), "mesg.api.StreamEventRequest") proto.RegisterType((*StreamEventRequest_Filter)(nil), "mesg.api.StreamEventRequest.Filter") @@ -206,36 +234,35 @@ func init() { func init() { proto.RegisterFile("protobuf/api/event.proto", fileDescriptor_c0ad091fa003d2ac) } var fileDescriptor_c0ad091fa003d2ac = []byte{ - // 450 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x8d, 0x93, 0xd6, 0x82, 0x6d, 0x2f, 0x2c, 0xaa, 0xe4, 0x9a, 0x0f, 0x57, 0xcb, 0xa5, 0xa8, - 0x60, 0xa3, 0x94, 0x13, 0x88, 0x4b, 0x10, 0x94, 0x1b, 0xc8, 0xdc, 0x38, 0x20, 0x6d, 0xec, 0x89, - 0xb3, 0xa2, 0xde, 0x75, 0x77, 0xc7, 0x95, 0xf2, 0x2b, 0x10, 0xff, 0x8a, 0xdf, 0xc0, 0xc1, 0x37, - 0x2e, 0x1c, 0xf3, 0x0b, 0xd0, 0xee, 0xb6, 0x4d, 0x9d, 0x94, 0x4b, 0x25, 0x6e, 0xd9, 0x99, 0x37, - 0xef, 0xbd, 0x99, 0x3c, 0x93, 0xa8, 0xd1, 0x0a, 0xd5, 0xb4, 0x9d, 0x65, 0xbc, 0x11, 0x19, 0x9c, - 0x83, 0xc4, 0xd4, 0x95, 0xe8, 0x9d, 0x1a, 0x4c, 0x95, 0xf2, 0x46, 0xc4, 0xac, 0x52, 0x95, 0xca, - 0xae, 0x80, 0xf6, 0xe5, 0x1e, 0xee, 0x97, 0x47, 0xc7, 0x0f, 0xae, 0xda, 0xb8, 0x68, 0xc0, 0x64, - 0x06, 0x75, 0x5b, 0x5c, 0x50, 0xc5, 0xf1, 0x5a, 0xf3, 0x9a, 0x0c, 0xfb, 0x3d, 0x24, 0xf4, 0x33, - 0x6a, 0xe0, 0xf5, 0x3b, 0x5b, 0xcd, 0xe1, 0xac, 0x05, 0x83, 0xf4, 0x35, 0x09, 0x67, 0xe2, 0x14, - 0x41, 0x47, 0xc1, 0x41, 0x70, 0xb8, 0x33, 0x7e, 0x92, 0x5e, 0xda, 0x49, 0x37, 0xd1, 0xe9, 0x7b, - 0x07, 0xcd, 0x2f, 0x46, 0xe2, 0x1f, 0x43, 0x12, 0xfa, 0x12, 0x2d, 0xc9, 0xd6, 0x9c, 0x9b, 0xb9, - 0x63, 0xd9, 0x9d, 0x7c, 0xfa, 0xd9, 0x25, 0x83, 0x5f, 0x5d, 0x72, 0x54, 0x09, 0x9c, 0xb7, 0xd3, - 0xb4, 0x50, 0x75, 0x66, 0x79, 0x9f, 0xcf, 0x54, 0x2b, 0x4b, 0x8e, 0x42, 0xc9, 0x0c, 0x64, 0x25, - 0x24, 0x64, 0x76, 0x2a, 0xfd, 0xc0, 0xcd, 0x7c, 0xd9, 0x25, 0xfb, 0xe7, 0xfc, 0x54, 0x94, 0x1c, - 0xe1, 0x15, 0x53, 0xb5, 0x40, 0xa8, 0x1b, 0x5c, 0x3c, 0xb3, 0x00, 0x96, 0x3b, 0x76, 0x8a, 0x64, - 0x57, 0x48, 0x83, 0x5c, 0x16, 0x60, 0x47, 0xa2, 0xe1, 0x7f, 0x52, 0xeb, 0xa9, 0xd0, 0x23, 0x32, - 0xfa, 0x06, 0x8b, 0x68, 0x74, 0x10, 0x1c, 0xde, 0x9d, 0xec, 0x2f, 0xbb, 0x64, 0x6f, 0x35, 0xd9, - 0x68, 0x21, 0x91, 0x9b, 0x42, 0x08, 0x96, 0x5b, 0x14, 0xfb, 0x13, 0x10, 0xfa, 0x56, 0x03, 0x47, - 0xe8, 0xdd, 0xd9, 0xac, 0x39, 0xf7, 0x77, 0xfa, 0x78, 0x3b, 0xe7, 0xd1, 0x4a, 0x5f, 0xc3, 0x59, - 0x2b, 0x34, 0x94, 0x37, 0x1a, 0x7f, 0xe9, 0x8d, 0x0f, 0x9d, 0x71, 0xb6, 0xec, 0x92, 0xc7, 0x37, - 0x0c, 0xae, 0x6f, 0x40, 0x9f, 0x92, 0xad, 0x92, 0x23, 0x77, 0xfb, 0xee, 0x8c, 0xf7, 0x7c, 0x20, - 0x2e, 0x93, 0x65, 0x53, 0xd1, 0x16, 0x98, 0x3b, 0x08, 0xfb, 0x4a, 0xee, 0xf7, 0x76, 0x35, 0x8d, - 0x92, 0x06, 0xe8, 0x49, 0x2f, 0x0c, 0xc7, 0xb7, 0x58, 0xd2, 0xff, 0xdf, 0xe3, 0xef, 0x01, 0xd9, - 0x76, 0xd4, 0xf4, 0x84, 0x84, 0x5e, 0x89, 0x3e, 0x5c, 0x25, 0x74, 0xf3, 0xce, 0xf1, 0xa3, 0x7f, - 0x74, 0xbd, 0x33, 0x36, 0xa0, 0x6f, 0x48, 0xe8, 0x83, 0x7d, 0x9d, 0x68, 0x33, 0xea, 0xf1, 0x3d, - 0xdf, 0x75, 0x1f, 0x52, 0xea, 0x3a, 0x6c, 0xf0, 0x22, 0x98, 0x6c, 0x7f, 0x19, 0xf1, 0x46, 0x4c, - 0x43, 0x77, 0x8f, 0xe3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xdc, 0x83, 0xec, 0xd7, 0x03, - 0x00, 0x00, + // 441 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4d, 0x6f, 0xd4, 0x30, + 0x14, 0x6c, 0x76, 0xdb, 0x08, 0xdc, 0x5e, 0x30, 0xaa, 0x94, 0x86, 0x8f, 0x54, 0xe6, 0x52, 0x54, + 0x48, 0xd0, 0xc2, 0x09, 0xc4, 0x65, 0x2b, 0x3e, 0x24, 0x38, 0x85, 0x5b, 0x4f, 0x78, 0xb3, 0x6f, + 0xb3, 0x16, 0x8d, 0xed, 0xda, 0x2f, 0x95, 0xf6, 0x27, 0x70, 0xe2, 0x17, 0x92, 0x23, 0x3f, 0x60, + 0x8f, 0x9c, 0x90, 0xed, 0xb6, 0xdb, 0xec, 0xc2, 0x05, 0xc1, 0x2d, 0x7e, 0x33, 0x99, 0x19, 0xbf, + 0x4c, 0x48, 0xa2, 0x8d, 0x42, 0x35, 0x69, 0x67, 0x05, 0xd7, 0xa2, 0x80, 0x0b, 0x90, 0x98, 0xfb, + 0x11, 0xbd, 0xd5, 0x80, 0xad, 0x73, 0xae, 0x45, 0xca, 0x6a, 0x55, 0xab, 0xe2, 0x9a, 0xe8, 0x4e, + 0xfe, 0xe0, 0x9f, 0x02, 0x3b, 0xbd, 0x77, 0x0d, 0xe3, 0x42, 0x83, 0x2d, 0x2c, 0x9a, 0xb6, 0xba, + 0x94, 0x4a, 0xd3, 0x35, 0xf0, 0x86, 0x0d, 0xfb, 0x3e, 0x20, 0xf4, 0x13, 0x1a, 0xe0, 0xcd, 0x1b, + 0x37, 0x2d, 0xe1, 0xbc, 0x05, 0x8b, 0xf4, 0x15, 0x89, 0x67, 0xe2, 0x0c, 0xc1, 0x24, 0xd1, 0x61, + 0x74, 0xb4, 0x3b, 0x7a, 0x94, 0x5f, 0xc5, 0xc9, 0x37, 0xd9, 0xf9, 0x5b, 0x4f, 0x2d, 0x2f, 0x5f, + 0x49, 0xbf, 0x0e, 0x48, 0x1c, 0x46, 0xf4, 0x33, 0xd9, 0x9e, 0x73, 0x3b, 0xf7, 0x2a, 0x7b, 0xe3, + 0x8f, 0xcb, 0x2e, 0x3b, 0xb8, 0xe0, 0x67, 0x62, 0xca, 0x11, 0x5e, 0x32, 0xd5, 0x08, 0x84, 0x46, + 0xe3, 0xe2, 0x89, 0xe3, 0xb0, 0x9f, 0x5d, 0x76, 0x5c, 0x0b, 0x9c, 0xb7, 0x93, 0xbc, 0x52, 0x4d, + 0xe1, 0x0c, 0x9f, 0xce, 0x54, 0x2b, 0xa7, 0x1c, 0x85, 0x92, 0x05, 0xc8, 0x5a, 0x48, 0x28, 0x1c, + 0x35, 0x7f, 0xcf, 0xed, 0xbc, 0xf4, 0xca, 0x54, 0x93, 0x3d, 0x21, 0x2d, 0x72, 0x59, 0x81, 0x9b, + 0x26, 0x83, 0xff, 0xe0, 0xd4, 0x73, 0xa0, 0xc7, 0x64, 0xf8, 0x05, 0x16, 0xc9, 0xf0, 0x30, 0x3a, + 0xba, 0x3d, 0x3e, 0x58, 0x76, 0xd9, 0xfe, 0xca, 0x48, 0x1b, 0x21, 0x91, 0xdb, 0x4a, 0x08, 0x56, + 0x3a, 0x16, 0xfb, 0x11, 0x11, 0x7a, 0x62, 0x80, 0x23, 0xf4, 0xf6, 0xab, 0xd6, 0x52, 0x87, 0xfd, + 0x7c, 0x58, 0x76, 0x59, 0xb2, 0x12, 0x33, 0x70, 0xde, 0x0a, 0x03, 0xd3, 0x7f, 0x11, 0xfa, 0x45, + 0x08, 0x3d, 0xf0, 0xa1, 0xd9, 0xb2, 0xcb, 0x1e, 0xfe, 0xc6, 0x67, 0x3d, 0x3d, 0x7d, 0x4c, 0xb6, + 0xa7, 0x1c, 0xb9, 0xbf, 0xeb, 0xee, 0x68, 0x3f, 0x94, 0xe0, 0xaa, 0x4d, 0xae, 0x09, 0x6d, 0x85, + 0xa5, 0xa7, 0xb0, 0x53, 0x72, 0xb7, 0x77, 0x4f, 0xab, 0x95, 0xb4, 0x40, 0x4f, 0x7a, 0x05, 0x28, + 0xfe, 0xea, 0x1b, 0x8f, 0xbe, 0x45, 0x64, 0xc7, 0xcb, 0xd2, 0x77, 0x24, 0x0e, 0x2e, 0xf4, 0xfe, + 0xaa, 0x91, 0x9b, 0xfb, 0x4d, 0x1f, 0xfc, 0x01, 0x0d, 0xa9, 0xd8, 0x16, 0x7d, 0x4d, 0xe2, 0x50, + 0xe4, 0x9b, 0x42, 0x9b, 0xd5, 0x4e, 0xef, 0x04, 0xd4, 0xff, 0x38, 0xb9, 0x47, 0xd8, 0xd6, 0xb3, + 0x68, 0xbc, 0x73, 0x3a, 0xe4, 0x5a, 0x4c, 0x62, 0xbf, 0x8b, 0xe7, 0xbf, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x1e, 0x53, 0x20, 0x40, 0xc7, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protobuf/api/event.proto b/protobuf/api/event.proto index aa6585cf0..13b66cfa7 100644 --- a/protobuf/api/event.proto +++ b/protobuf/api/event.proto @@ -28,15 +28,13 @@ message StreamEventRequest { // hash to filter events. bytes hash = 1 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // instance's hash to filter events. bytes instanceHash = 2 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // key is the key of the event. @@ -54,8 +52,7 @@ message CreateEventRequest { // instanceHash is hash of instance that can proceed an execution. bytes instanceHash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // key is the key of the event. @@ -71,7 +68,6 @@ message CreateEventRequest { message CreateEventResponse { // Hash represents event. bytes hash = 1 [ - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } diff --git a/protobuf/api/execution.pb.go b/protobuf/api/execution.pb.go index 673c1c9bf..b173d6bf7 100644 --- a/protobuf/api/execution.pb.go +++ b/protobuf/api/execution.pb.go @@ -35,11 +35,11 @@ type CreateExecutionRequest struct { Inputs *types.Struct `protobuf:"bytes,3,opt,name=inputs,proto3" json:"inputs,omitempty"` // tags the execution. Tags []string `protobuf:"bytes,4,rep,name=tags,proto3" json:"tags,omitempty" validate:"dive,printascii"` - ParentHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=parentHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"parentHash" validate:"omitempty,hash"` - EventHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,6,opt,name=eventHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"eventHash" validate:"omitempty,hash"` - ProcessHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,7,opt,name=processHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"processHash" validate:"omitempty,hash"` + ParentHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=parentHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"parentHash,omitempty" validate:"omitempty,hash"` + EventHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,6,opt,name=eventHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"eventHash,omitempty" validate:"omitempty,hash"` + ProcessHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,7,opt,name=processHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"processHash,omitempty" validate:"omitempty,hash"` NodeKey string `protobuf:"bytes,8,opt,name=nodeKey,proto3" json:"nodeKey,omitempty"` - ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,9,opt,name=executorHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash" validate:"omitempty,hash"` + ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,9,opt,name=executorHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash,omitempty" validate:"omitempty,hash"` // price of running the execution. Price string `protobuf:"bytes,10,opt,name=price,proto3" json:"price,omitempty" validate:"coins"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -92,6 +92,27 @@ func (m *CreateExecutionRequest) GetTags() []string { return nil } +func (m *CreateExecutionRequest) GetParentHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ParentHash + } + return nil +} + +func (m *CreateExecutionRequest) GetEventHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.EventHash + } + return nil +} + +func (m *CreateExecutionRequest) GetProcessHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ProcessHash + } + return nil +} + func (m *CreateExecutionRequest) GetNodeKey() string { if m != nil { return m.NodeKey @@ -99,6 +120,13 @@ func (m *CreateExecutionRequest) GetNodeKey() string { return "" } +func (m *CreateExecutionRequest) GetExecutorHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ExecutorHash + } + return nil +} + func (m *CreateExecutionRequest) GetPrice() string { if m != nil { return m.Price @@ -109,7 +137,7 @@ func (m *CreateExecutionRequest) GetPrice() string { // CreateExecutionResponse defines response for execution creation. type CreateExecutionResponse struct { // Execution's hash. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -139,10 +167,17 @@ func (m *CreateExecutionResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateExecutionResponse proto.InternalMessageInfo +func (m *CreateExecutionResponse) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // GetExecutionRequest defines request to retrieve a single execution. type GetExecutionRequest struct { // Execution's hash to fetch. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -172,6 +207,13 @@ func (m *GetExecutionRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetExecutionRequest proto.InternalMessageInfo +func (m *GetExecutionRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // StreamExecutionRequest defines request to retrieve a stream of executions. type StreamExecutionRequest struct { // Filter used to filter a stream of executions. @@ -217,13 +259,13 @@ type StreamExecutionRequest_Filter struct { // Statuses to filter executions. One status needs to be present in the execution. Statuses []execution.Status `protobuf:"varint,1,rep,packed,name=statuses,proto3,enum=mesg.types.Status" json:"statuses,omitempty"` // Instance's hash to filter executions. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" validate:"omitempty,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" validate:"omitempty,hash"` // taskKey to filter executions. TaskKey string `protobuf:"bytes,3,opt,name=taskKey,proto3" json:"taskKey,omitempty" validate:"printascii"` // tags to filter executions. All tags needs to be present in the execution. Tags []string `protobuf:"bytes,4,rep,name=tags,proto3" json:"tags,omitempty" validate:"dive,printascii"` // Executor's hash to filter executions. - ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=executorHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash" validate:"omitempty,hash"` + ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=executorHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash,omitempty" validate:"omitempty,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -260,6 +302,13 @@ func (m *StreamExecutionRequest_Filter) GetStatuses() []execution.Status { return nil } +func (m *StreamExecutionRequest_Filter) GetInstanceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.InstanceHash + } + return nil +} + func (m *StreamExecutionRequest_Filter) GetTaskKey() string { if m != nil { return m.TaskKey @@ -274,10 +323,17 @@ func (m *StreamExecutionRequest_Filter) GetTags() []string { return nil } +func (m *StreamExecutionRequest_Filter) GetExecutorHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ExecutorHash + } + return nil +} + // UpdateExecutionRequest defines request for execution update. type UpdateExecutionRequest struct { // Hash represents execution. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` // result pass to execution // // Types that are valid to be assigned to Result: @@ -334,6 +390,13 @@ func (m *UpdateExecutionRequest) GetResult() isUpdateExecutionRequest_Result { return nil } +func (m *UpdateExecutionRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + func (m *UpdateExecutionRequest) GetOutputs() *types.Struct { if x, ok := m.GetResult().(*UpdateExecutionRequest_Outputs); ok { return x.Outputs @@ -473,55 +536,55 @@ func init() { func init() { proto.RegisterFile("protobuf/api/execution.proto", fileDescriptor_96e2c86581f82f05) } var fileDescriptor_96e2c86581f82f05 = []byte{ - // 756 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x4d, 0xe2, 0xc4, 0x49, 0xa6, 0x15, 0xa0, 0x6d, 0x9b, 0xba, 0x01, 0xe2, 0xe0, 0x0b, 0x11, - 0xb4, 0x0e, 0xa4, 0x37, 0x04, 0x42, 0x0a, 0x2a, 0x2d, 0x1f, 0x52, 0x91, 0x2b, 0x2e, 0xdc, 0x36, - 0xce, 0x36, 0x59, 0xd1, 0xd8, 0xee, 0xee, 0xba, 0xa2, 0xfc, 0x07, 0xfe, 0x17, 0x12, 0x37, 0x8e, - 0x1c, 0x7c, 0xe7, 0x9a, 0x1f, 0x80, 0x90, 0x77, 0x13, 0x3b, 0x1f, 0x6e, 0x0f, 0x95, 0xd2, 0x5b, - 0xd6, 0xf3, 0x66, 0xdf, 0xec, 0xcc, 0x9b, 0x17, 0x78, 0x10, 0x30, 0x5f, 0xf8, 0xbd, 0xf0, 0xb4, - 0x8d, 0x03, 0xda, 0x26, 0xdf, 0x88, 0x1b, 0x0a, 0xea, 0x7b, 0xb6, 0xfc, 0x8c, 0x2a, 0x23, 0xc2, - 0x07, 0x36, 0x0e, 0x68, 0xdd, 0x1a, 0xf8, 0x03, 0xbf, 0x9d, 0x80, 0xe3, 0x93, 0x3c, 0xc8, 0x5f, - 0x0a, 0x5d, 0xbf, 0x9f, 0x84, 0xc5, 0x65, 0x40, 0x78, 0x9b, 0x0b, 0x16, 0xba, 0x62, 0x12, 0x6c, - 0x2c, 0x04, 0x17, 0xa8, 0xac, 0x5f, 0x25, 0xa8, 0xbd, 0x61, 0x04, 0x0b, 0x72, 0x30, 0x8d, 0x38, - 0xe4, 0x3c, 0x24, 0x5c, 0xa0, 0x97, 0x50, 0x16, 0x98, 0x7f, 0xfd, 0x40, 0x2e, 0x8d, 0x42, 0x33, - 0xdf, 0xaa, 0x76, 0xad, 0x71, 0x64, 0x36, 0x2e, 0xf0, 0x19, 0xed, 0x63, 0x41, 0x5e, 0x58, 0x8c, - 0x9c, 0x87, 0x94, 0x91, 0xfe, 0x6e, 0xc0, 0xa8, 0x27, 0x30, 0x77, 0x29, 0xb5, 0x9c, 0x69, 0x0a, - 0xda, 0x03, 0x9d, 0x7a, 0x41, 0x28, 0xb8, 0xa1, 0x35, 0xf3, 0xad, 0xb5, 0xce, 0x96, 0x2d, 0x1f, - 0x35, 0x2d, 0xc7, 0x3e, 0x91, 0x55, 0x3a, 0x13, 0x10, 0xea, 0x40, 0x51, 0xe0, 0x01, 0x37, 0x8a, - 0x4d, 0xad, 0x55, 0xed, 0x36, 0xc6, 0x91, 0x59, 0x4f, 0x99, 0xfa, 0xf4, 0x82, 0xcc, 0xb1, 0x48, - 0x2c, 0x0a, 0x00, 0x02, 0xcc, 0x88, 0x27, 0x8e, 0x30, 0x1f, 0x1a, 0xa5, 0x66, 0xbe, 0xb5, 0xde, - 0xfd, 0xf4, 0x33, 0x32, 0x73, 0x7f, 0x22, 0xf3, 0xe9, 0x80, 0x8a, 0x61, 0xd8, 0xb3, 0x5d, 0x7f, - 0xd4, 0x8e, 0x89, 0xf7, 0x4e, 0xfd, 0xd0, 0xeb, 0xe3, 0xf8, 0x7d, 0x6d, 0xe2, 0x0d, 0xa8, 0x47, - 0xda, 0x43, 0xcc, 0x87, 0x76, 0x9c, 0x3a, 0x8e, 0xcc, 0x9d, 0x94, 0xcc, 0x1f, 0x51, 0x41, 0x46, - 0x81, 0xb8, 0xdc, 0x8d, 0x01, 0x96, 0x33, 0xc3, 0x81, 0x3c, 0xa8, 0x92, 0x8b, 0x29, 0xa1, 0xbe, - 0x22, 0xc2, 0x94, 0x02, 0x31, 0x58, 0x0b, 0x98, 0xef, 0x12, 0xce, 0x25, 0x63, 0x79, 0x45, 0x8c, - 0xb3, 0x24, 0xc8, 0x80, 0xb2, 0xe7, 0xf7, 0x49, 0x3c, 0xf6, 0x4a, 0x3c, 0x76, 0x67, 0x7a, 0x44, - 0x02, 0xd6, 0x95, 0x7c, 0x7c, 0x26, 0xcb, 0xa9, 0xae, 0xa8, 0x9c, 0x39, 0x16, 0xf4, 0x04, 0x4a, - 0x01, 0xa3, 0x2e, 0x31, 0x40, 0x8a, 0x70, 0x73, 0x1c, 0x99, 0xf7, 0xd2, 0x5c, 0xd7, 0xa7, 0x1e, - 0xb7, 0x1c, 0x05, 0xb1, 0x7a, 0xb0, 0xbd, 0x24, 0x66, 0x1e, 0xf8, 0x1e, 0x27, 0xe8, 0x10, 0x8a, - 0xf1, 0xed, 0x46, 0x5e, 0x16, 0xbd, 0x7f, 0x83, 0xa2, 0x1d, 0x79, 0x81, 0xf5, 0x1d, 0x36, 0x0e, - 0x89, 0x58, 0xda, 0x16, 0x77, 0xee, 0xfe, 0xe3, 0x9b, 0x35, 0xc5, 0xc8, 0xd8, 0x2e, 0xd5, 0x13, - 0xc5, 0xfd, 0x57, 0x83, 0xda, 0x89, 0x60, 0x04, 0x8f, 0x96, 0xf8, 0x5f, 0x83, 0x7e, 0x4a, 0xcf, - 0x04, 0x61, 0xb2, 0x82, 0xb5, 0xce, 0x63, 0x7b, 0x6a, 0x22, 0x76, 0x76, 0x86, 0xfd, 0x56, 0xc2, - 0x9d, 0x49, 0x5a, 0xfd, 0x87, 0x06, 0xba, 0xfa, 0x84, 0x6c, 0xa8, 0x70, 0x81, 0x45, 0xc8, 0x09, - 0x37, 0xf2, 0x4d, 0xad, 0x75, 0xa7, 0x83, 0xd4, 0x6d, 0xd2, 0x43, 0xec, 0x13, 0x19, 0x73, 0x12, - 0x4c, 0x2c, 0x0c, 0xea, 0x71, 0x81, 0x3d, 0x97, 0x48, 0x61, 0x14, 0x56, 0x25, 0x8c, 0x59, 0x16, - 0xb4, 0x9f, 0xfa, 0x93, 0x26, 0xa5, 0xb1, 0x33, 0x8e, 0xcc, 0xad, 0x34, 0x3b, 0xd3, 0x96, 0x6e, - 0xe2, 0x33, 0x8b, 0xba, 0x2f, 0xdd, 0x86, 0xee, 0xad, 0xdf, 0x79, 0xa8, 0x7d, 0x0e, 0xfa, 0x59, - 0xce, 0x7c, 0x1b, 0x5a, 0x43, 0xcf, 0xa1, 0xec, 0x87, 0x42, 0x3a, 0x78, 0xe1, 0x1a, 0x07, 0x3f, - 0xca, 0x39, 0x53, 0x1c, 0xaa, 0x41, 0x89, 0x30, 0xe6, 0x33, 0x35, 0x8f, 0xa3, 0x9c, 0xa3, 0x8e, - 0xdd, 0x0a, 0xe8, 0x8c, 0xf0, 0xf0, 0x4c, 0x58, 0x3b, 0xb0, 0xbd, 0xf4, 0x26, 0xb5, 0xa0, 0x56, - 0x0d, 0x36, 0x3f, 0x52, 0xbe, 0xb4, 0x58, 0x96, 0x0b, 0x5b, 0x0b, 0xdf, 0x27, 0x1b, 0xfd, 0x1e, - 0x20, 0xf9, 0x37, 0x53, 0x3a, 0x4d, 0x6a, 0x54, 0x3a, 0x4d, 0x52, 0xba, 0x1b, 0xe3, 0xc8, 0xbc, - 0x3b, 0x3f, 0x67, 0xcb, 0x99, 0xc9, 0xee, 0xfc, 0x2b, 0x40, 0x35, 0x81, 0xa3, 0x63, 0xd0, 0x95, - 0x8d, 0xa0, 0x66, 0xba, 0x45, 0xd9, 0xff, 0x92, 0xf5, 0x47, 0xd7, 0x20, 0x26, 0x2f, 0xcb, 0xa1, - 0x57, 0xa0, 0x1d, 0x12, 0x81, 0x1e, 0xa6, 0xd8, 0x0c, 0x0b, 0xa9, 0x67, 0x17, 0x6f, 0xe5, 0xd0, - 0x3b, 0x28, 0xc6, 0x2d, 0x40, 0x8d, 0x34, 0x3f, 0xab, 0x55, 0x75, 0xf3, 0xca, 0x78, 0x52, 0xc9, - 0x01, 0xe8, 0xca, 0x0e, 0x66, 0x9f, 0x96, 0x6d, 0x10, 0x57, 0xd6, 0xf3, 0x2c, 0x1f, 0x77, 0x48, - 0xcd, 0x71, 0xf6, 0x9a, 0x6c, 0xb5, 0xce, 0x76, 0xe8, 0xaa, 0xd9, 0xe7, 0xba, 0xa5, 0x2f, 0x1a, - 0x0e, 0x68, 0x4f, 0x97, 0xea, 0xda, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xe4, 0x54, 0xf3, - 0x20, 0x09, 0x00, 0x00, + // 758 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xdd, 0x6e, 0xda, 0x48, + 0x14, 0x06, 0x0c, 0x06, 0x4e, 0xa2, 0xdd, 0xd5, 0x24, 0x21, 0x0e, 0xbb, 0x8b, 0x59, 0xdf, 0x2c, + 0xda, 0x4d, 0xec, 0x5d, 0x72, 0xb7, 0xda, 0xaa, 0x12, 0x51, 0x9a, 0xb4, 0x89, 0x54, 0xc9, 0x51, + 0x6f, 0x7a, 0xd1, 0x6a, 0x62, 0x26, 0x30, 0x2d, 0x78, 0x9c, 0x99, 0x31, 0x6a, 0x1e, 0xa0, 0x4f, + 0xd5, 0x77, 0xe8, 0x23, 0x58, 0xea, 0x2b, 0x70, 0xd9, 0x8b, 0xaa, 0xf2, 0x18, 0x6c, 0x7e, 0x9c, + 0x48, 0x8d, 0xc4, 0x1d, 0xe3, 0xf3, 0x9d, 0xf3, 0x9d, 0x99, 0xf3, 0x9d, 0x0f, 0xf8, 0x2d, 0xe0, + 0x4c, 0xb2, 0xeb, 0xf0, 0xc6, 0xc1, 0x01, 0x75, 0xc8, 0x07, 0xe2, 0x85, 0x92, 0x32, 0xdf, 0x56, + 0x9f, 0x51, 0x6d, 0x4c, 0xc4, 0xc0, 0xc6, 0x01, 0x6d, 0x5a, 0x03, 0x36, 0x60, 0x4e, 0x0a, 0x8e, + 0x4f, 0xea, 0xa0, 0x7e, 0x25, 0xe8, 0xe6, 0xaf, 0x69, 0x58, 0xde, 0x05, 0x44, 0x38, 0x42, 0xf2, + 0xd0, 0x93, 0xb3, 0x60, 0x6b, 0x25, 0xb8, 0x42, 0x65, 0x7d, 0xaa, 0x40, 0xe3, 0x84, 0x13, 0x2c, + 0xc9, 0xe9, 0x3c, 0xe2, 0x92, 0xdb, 0x90, 0x08, 0x89, 0xfe, 0x87, 0xaa, 0xc4, 0xe2, 0xfd, 0x05, + 0xb9, 0x33, 0x4a, 0xed, 0x62, 0xa7, 0xde, 0xb3, 0xa6, 0x91, 0xd9, 0x9a, 0xe0, 0x11, 0xed, 0x63, + 0x49, 0xfe, 0xb3, 0x38, 0xb9, 0x0d, 0x29, 0x27, 0xfd, 0xc3, 0x80, 0x53, 0x5f, 0x62, 0xe1, 0x51, + 0x6a, 0xb9, 0xf3, 0x14, 0x74, 0x04, 0x3a, 0xf5, 0x83, 0x50, 0x0a, 0x43, 0x6b, 0x17, 0x3b, 0x5b, + 0xdd, 0x3d, 0x5b, 0x5d, 0x6a, 0xde, 0x8e, 0x7d, 0xa5, 0xba, 0x74, 0x67, 0x20, 0xd4, 0x85, 0xb2, + 0xc4, 0x03, 0x61, 0x94, 0xdb, 0x5a, 0xa7, 0xde, 0x6b, 0x4d, 0x23, 0xb3, 0x99, 0x31, 0xf5, 0xe9, + 0x84, 0x2c, 0xb1, 0x28, 0x2c, 0x1a, 0x01, 0x04, 0x98, 0x13, 0x5f, 0x9e, 0x63, 0x31, 0x34, 0x2a, + 0xed, 0x62, 0x67, 0xbb, 0x77, 0x39, 0x8d, 0xcc, 0x83, 0x2c, 0x93, 0x8d, 0xa9, 0x24, 0xe3, 0x40, + 0xde, 0x1d, 0x0e, 0xb1, 0x18, 0x5a, 0x5f, 0x23, 0xf3, 0xef, 0x01, 0x95, 0xc3, 0xf0, 0xda, 0xf6, + 0xd8, 0xd8, 0x89, 0x3b, 0x3a, 0xba, 0x61, 0xa1, 0xdf, 0xc7, 0xf1, 0xc5, 0x1d, 0xe2, 0x0f, 0xa8, + 0x4f, 0x9c, 0x18, 0x6a, 0xc7, 0x35, 0xdd, 0x85, 0xfa, 0xe8, 0x1d, 0xd4, 0xc9, 0x64, 0x4e, 0xa6, + 0x6f, 0x80, 0x2c, 0x2b, 0x8f, 0x7c, 0xd8, 0x0a, 0x38, 0xf3, 0x88, 0x10, 0x8a, 0xad, 0xba, 0x01, + 0xb6, 0x45, 0x02, 0x64, 0x40, 0xd5, 0x67, 0x7d, 0x12, 0x8f, 0xba, 0x16, 0x8f, 0xda, 0x9d, 0x1f, + 0x51, 0x00, 0xdb, 0x89, 0x64, 0x18, 0x57, 0xad, 0xd4, 0x37, 0xd0, 0xca, 0x12, 0x03, 0xfa, 0x0b, + 0x2a, 0x01, 0xa7, 0x1e, 0x31, 0x40, 0x89, 0x6e, 0x77, 0x1a, 0x99, 0xbf, 0x64, 0x54, 0x1e, 0xa3, + 0xbe, 0xb0, 0xdc, 0x04, 0x62, 0xbd, 0x81, 0xfd, 0x35, 0xf1, 0x8a, 0x80, 0xf9, 0x82, 0xa0, 0x13, + 0x28, 0xc7, 0x0c, 0x46, 0x51, 0x35, 0xec, 0xfc, 0x68, 0x4f, 0x2a, 0xd9, 0x9a, 0xc0, 0xce, 0x19, + 0x91, 0x6b, 0x9b, 0xf1, 0x76, 0xa9, 0xf6, 0xc5, 0x34, 0x32, 0x8d, 0x9c, 0xb5, 0x78, 0xd4, 0x5b, + 0x24, 0xbc, 0x5f, 0x34, 0x68, 0x5c, 0x49, 0x4e, 0xf0, 0x78, 0x8d, 0xfb, 0x29, 0xe8, 0x37, 0x74, + 0x24, 0x09, 0x57, 0xec, 0x5b, 0xdd, 0x3f, 0xed, 0xb9, 0x59, 0xd8, 0xf9, 0x19, 0xf6, 0x33, 0x05, + 0x77, 0x67, 0x69, 0xcd, 0x8f, 0x1a, 0xe8, 0xc9, 0x27, 0x64, 0x43, 0x4d, 0x48, 0x2c, 0x43, 0x41, + 0x84, 0x51, 0x6c, 0x6b, 0x9d, 0x9f, 0xba, 0x28, 0xa9, 0xa6, 0xbc, 0xc2, 0xbe, 0x52, 0x31, 0x37, + 0xc5, 0xc4, 0x62, 0xa0, 0xbe, 0x90, 0xd8, 0xf7, 0x88, 0x12, 0x43, 0x69, 0x13, 0x62, 0x58, 0x64, + 0x40, 0xc7, 0x99, 0x07, 0x69, 0x4a, 0x0e, 0x07, 0xd3, 0xc8, 0xdc, 0xcb, 0xc8, 0x72, 0xad, 0xe7, + 0x31, 0x5e, 0xb2, 0xaa, 0xf3, 0xca, 0xa6, 0x75, 0x6e, 0x7d, 0x2e, 0x42, 0xe3, 0x55, 0xd0, 0xcf, + 0x73, 0xde, 0x4d, 0xeb, 0x0b, 0xfd, 0x0b, 0x55, 0x16, 0x4a, 0xe5, 0xce, 0xa5, 0x07, 0xdc, 0xf9, + 0xbc, 0xe0, 0xce, 0x71, 0xa8, 0x01, 0x15, 0xc2, 0x39, 0xe3, 0xc9, 0x1c, 0xce, 0x0b, 0x6e, 0x72, + 0xec, 0xd5, 0x40, 0xe7, 0x44, 0x84, 0x23, 0x69, 0x1d, 0xc0, 0xfe, 0xda, 0x7d, 0x92, 0x65, 0xb4, + 0x1a, 0xb0, 0x7b, 0x49, 0xc5, 0xda, 0x22, 0x59, 0x1e, 0xec, 0xad, 0x7c, 0x9f, 0x6d, 0xef, 0x0b, + 0x80, 0xf4, 0x9f, 0x2a, 0xd1, 0x66, 0xda, 0x63, 0xa2, 0xcd, 0x34, 0xa5, 0xb7, 0x33, 0x8d, 0xcc, + 0x9f, 0x97, 0xe7, 0x6b, 0xb9, 0x0b, 0xd9, 0xdd, 0x6f, 0x25, 0xa8, 0xa7, 0x70, 0xf4, 0x12, 0xf4, + 0xc4, 0x32, 0x50, 0x3b, 0xdb, 0x9c, 0xfc, 0x7f, 0xc0, 0xe6, 0x1f, 0x0f, 0x20, 0x66, 0x37, 0x2b, + 0xa0, 0x27, 0xa0, 0x9d, 0x11, 0x89, 0x7e, 0xcf, 0xb0, 0x39, 0x96, 0xd1, 0xcc, 0x6f, 0xde, 0x2a, + 0xa0, 0xe7, 0x50, 0x8e, 0x9f, 0x00, 0xb5, 0xb2, 0xfc, 0xbc, 0xa7, 0x6a, 0x9a, 0xf7, 0xc6, 0xd3, + 0x4e, 0x4e, 0x41, 0x4f, 0x2c, 0x60, 0xf1, 0x6a, 0xf9, 0xa6, 0x70, 0x6f, 0x3f, 0xff, 0x14, 0xe3, + 0x17, 0x4a, 0xe6, 0xb8, 0x58, 0x26, 0x5f, 0xa9, 0x8b, 0x2f, 0x74, 0xdf, 0xec, 0x0b, 0xbd, 0xca, + 0x6b, 0x0d, 0x07, 0xf4, 0x5a, 0x57, 0xea, 0x3a, 0xfe, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x93, + 0x03, 0xae, 0xfc, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protobuf/api/execution.proto b/protobuf/api/execution.proto index bd76f9025..879ecd446 100644 --- a/protobuf/api/execution.proto +++ b/protobuf/api/execution.proto @@ -47,28 +47,24 @@ message CreateExecutionRequest { bytes parentHash = 5 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; bytes eventHash = 6 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; bytes processHash = 7 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; string nodeKey = 8; bytes executorHash = 9 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // price of running the execution. @@ -81,8 +77,7 @@ message CreateExecutionRequest { message CreateExecutionResponse { // Execution's hash. bytes hash = 1 [ - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -91,8 +86,7 @@ message GetExecutionRequest { // Execution's hash to fetch. bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -106,8 +100,7 @@ message StreamExecutionRequest{ // Instance's hash to filter executions. bytes instanceHash = 2 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // taskKey to filter executions. @@ -123,8 +116,7 @@ message StreamExecutionRequest{ // Executor's hash to filter executions. bytes executorHash = 5 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -137,8 +129,7 @@ message UpdateExecutionRequest { // Hash represents execution. bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // result pass to execution diff --git a/protobuf/api/instance.pb.go b/protobuf/api/instance.pb.go index d00d25c9d..ad055b78a 100644 --- a/protobuf/api/instance.pb.go +++ b/protobuf/api/instance.pb.go @@ -29,7 +29,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // The request's data for the `Get` API. type GetInstanceRequest struct { - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -59,6 +59,13 @@ func (m *GetInstanceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetInstanceRequest proto.InternalMessageInfo +func (m *GetInstanceRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The request's data for the `List` API. type ListInstanceRequest struct { // Filter used to filter a list of instance. @@ -102,7 +109,7 @@ func (m *ListInstanceRequest) GetFilter() *ListInstanceRequest_Filter { // Filter contains filtering criteria. type ListInstanceRequest_Filter struct { // Service hash to filter executions. - ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=serviceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash" validate:"omitempty,hash"` + ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=serviceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash,omitempty" validate:"omitempty,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -132,6 +139,13 @@ func (m *ListInstanceRequest_Filter) XXX_DiscardUnknown() { var xxx_messageInfo_ListInstanceRequest_Filter proto.InternalMessageInfo +func (m *ListInstanceRequest_Filter) GetServiceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ServiceHash + } + return nil +} + // The response's data for the `List` API. type ListInstanceResponse struct { // List of instances that match the request's filters. @@ -182,31 +196,31 @@ func init() { func init() { proto.RegisterFile("protobuf/api/instance.proto", fileDescriptor_71d44b8f4a870f63) } var fileDescriptor_71d44b8f4a870f63 = []byte{ - // 377 bytes of a gzipped FileDescriptorProto + // 370 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0xc1, 0x6e, 0xda, 0x40, 0x10, 0xc5, 0x82, 0x22, 0xba, 0x54, 0xaa, 0xb4, 0x70, 0xa0, 0x6e, 0xa9, 0xd1, 0xaa, 0x07, 0xa4, - 0xb6, 0x6b, 0x89, 0xde, 0x9a, 0x9c, 0x38, 0xc4, 0x44, 0x8a, 0x94, 0xc8, 0xc7, 0x5c, 0xa2, 0xc5, - 0x1e, 0xec, 0x95, 0xb0, 0xd7, 0x78, 0xd7, 0x48, 0x48, 0xf9, 0x88, 0x7c, 0x56, 0xae, 0xb9, 0xe6, - 0xe0, 0x8f, 0xe0, 0x0b, 0x22, 0xaf, 0x31, 0x4e, 0x02, 0xc9, 0x21, 0xb7, 0x9d, 0x99, 0xf7, 0xe6, - 0xcd, 0x9b, 0x59, 0xf4, 0x3d, 0x49, 0x85, 0x12, 0xf3, 0x6c, 0x61, 0xb3, 0x84, 0xdb, 0x3c, 0x96, - 0x8a, 0xc5, 0x1e, 0x50, 0x9d, 0xc5, 0x9d, 0x08, 0x64, 0x40, 0x59, 0xc2, 0x4d, 0x12, 0x88, 0x40, - 0xd8, 0x7b, 0x6c, 0x11, 0xe9, 0x40, 0xbf, 0x4a, 0xb4, 0x39, 0xdc, 0x97, 0xd5, 0x26, 0x01, 0xf9, - 0xaa, 0x19, 0xd9, 0x20, 0xec, 0x80, 0x3a, 0xdf, 0x25, 0x5d, 0x58, 0x65, 0x20, 0x15, 0xf6, 0x50, - 0x2b, 0x64, 0x32, 0x1c, 0x18, 0x23, 0x63, 0xfc, 0x65, 0x7a, 0x79, 0x9f, 0x5b, 0x8d, 0xc7, 0xdc, - 0xfa, 0x1d, 0x70, 0x15, 0x66, 0x73, 0xea, 0x89, 0xc8, 0x2e, 0x66, 0xf8, 0xbb, 0x10, 0x59, 0xec, - 0x33, 0xc5, 0x45, 0x6c, 0x43, 0x1c, 0xf0, 0x18, 0xec, 0x82, 0x45, 0x67, 0x4c, 0x86, 0xdb, 0xdc, - 0x1a, 0xac, 0xd9, 0x92, 0xfb, 0x4c, 0xc1, 0x7f, 0x92, 0xc2, 0x2a, 0xe3, 0x29, 0xf8, 0x7f, 0x8a, - 0x3a, 0x71, 0x75, 0x73, 0xf2, 0x60, 0xa0, 0xde, 0x05, 0x97, 0x07, 0xe2, 0xa7, 0xa8, 0xbd, 0xe0, - 0x4b, 0x05, 0xa9, 0x96, 0xef, 0x4e, 0x7e, 0xd1, 0xca, 0x30, 0x3d, 0x02, 0xa7, 0x67, 0x1a, 0xeb, - 0xee, 0x38, 0xe6, 0x2d, 0x6a, 0x97, 0x19, 0x9c, 0xa2, 0xae, 0x84, 0x74, 0xcd, 0x3d, 0x98, 0xd5, - 0x5e, 0xae, 0x3e, 0xe6, 0xe5, 0x5b, 0xed, 0x45, 0x44, 0x5c, 0x41, 0x94, 0xa8, 0xcd, 0xce, 0xcc, - 0x73, 0x11, 0x72, 0x83, 0xfa, 0x2f, 0x67, 0x94, 0x89, 0x88, 0x25, 0x60, 0x07, 0x7d, 0xae, 0x16, - 0x2f, 0x07, 0xc6, 0xa8, 0x39, 0xee, 0x4e, 0xfa, 0xa5, 0x2d, 0x7d, 0x15, 0x5a, 0x11, 0xa6, 0xbd, - 0x6d, 0x6e, 0x7d, 0xad, 0xc5, 0x7c, 0xbe, 0x06, 0xe2, 0xd6, 0xdc, 0xc9, 0x9d, 0x81, 0x3a, 0x15, - 0x18, 0x9f, 0xa0, 0xa6, 0x03, 0x0a, 0xff, 0xa8, 0x17, 0x74, 0x78, 0x4b, 0xf3, 0xa8, 0x0e, 0x69, - 0x60, 0x07, 0xb5, 0x8a, 0x51, 0xf1, 0xf0, 0xdd, 0xf5, 0x9a, 0x3f, 0xdf, 0x2a, 0x97, 0xce, 0x48, - 0x63, 0xfa, 0xe9, 0xba, 0xc9, 0x12, 0x3e, 0x6f, 0xeb, 0x0f, 0xf5, 0xef, 0x29, 0x00, 0x00, 0xff, - 0xff, 0x21, 0x5f, 0xa9, 0xd2, 0xbc, 0x02, 0x00, 0x00, + 0xb6, 0x6b, 0x89, 0xde, 0xda, 0x9e, 0x38, 0xd4, 0x54, 0xe1, 0xe4, 0x63, 0x2e, 0x68, 0xc1, 0x83, + 0xbd, 0x12, 0xde, 0x35, 0xde, 0x35, 0x0a, 0x7f, 0x91, 0x1f, 0xcb, 0x2f, 0xf8, 0x23, 0x38, 0xe6, + 0x14, 0x79, 0x8d, 0x71, 0x12, 0x48, 0x0e, 0xb9, 0xed, 0xcc, 0xbc, 0x99, 0xf7, 0xde, 0xcc, 0xa2, + 0xcf, 0x49, 0x2a, 0xb5, 0x5c, 0x66, 0x6b, 0x97, 0x25, 0xdc, 0xe5, 0x42, 0x69, 0x26, 0x56, 0x40, + 0x4d, 0x16, 0x77, 0x62, 0x50, 0x21, 0x65, 0x09, 0xb7, 0x49, 0x28, 0x43, 0xe9, 0x9e, 0xb0, 0x45, + 0x64, 0x02, 0xf3, 0x2a, 0xd1, 0xf6, 0xf0, 0x54, 0xd6, 0xfb, 0x04, 0xd4, 0xb3, 0x61, 0x24, 0x43, + 0xd8, 0x03, 0xfd, 0xff, 0x98, 0xf4, 0x61, 0x9b, 0x81, 0xd2, 0x78, 0x81, 0x5a, 0x11, 0x53, 0xd1, + 0xc0, 0x1a, 0x59, 0xe3, 0x0f, 0xd3, 0xab, 0x43, 0xee, 0x0c, 0x76, 0x6c, 0xc3, 0x03, 0xa6, 0xe1, + 0x37, 0x49, 0x61, 0x9b, 0xf1, 0x14, 0x82, 0x1f, 0x05, 0x84, 0xdc, 0xe7, 0xce, 0xf7, 0x90, 0xeb, + 0x28, 0x5b, 0xd2, 0x95, 0x8c, 0xdd, 0x42, 0xdb, 0xcf, 0xb5, 0xcc, 0x44, 0xc0, 0x34, 0x97, 0xc2, + 0x05, 0x11, 0x72, 0x01, 0x6e, 0x01, 0xa5, 0x33, 0xa6, 0x22, 0xdf, 0x0c, 0x26, 0x77, 0x16, 0xea, + 0xcd, 0xb9, 0x3a, 0x23, 0xfe, 0x8b, 0xda, 0x6b, 0xbe, 0xd1, 0x90, 0x1a, 0xea, 0xee, 0xe4, 0x1b, + 0xad, 0xcc, 0xd2, 0x0b, 0x70, 0xfa, 0xcf, 0x60, 0xfd, 0x63, 0x8f, 0x7d, 0x83, 0xda, 0x65, 0x06, + 0x0b, 0xd4, 0x55, 0x90, 0xee, 0xf8, 0x0a, 0x66, 0xb5, 0x8f, 0xf9, 0x21, 0x77, 0x3e, 0xd5, 0x3e, + 0x64, 0xcc, 0x35, 0xc4, 0x89, 0xde, 0xbf, 0xcd, 0xc8, 0x63, 0x02, 0xb2, 0x40, 0xfd, 0xa7, 0xfa, + 0x54, 0x22, 0x85, 0x02, 0xec, 0xa1, 0xf7, 0xd5, 0xc2, 0xd5, 0xc0, 0x1a, 0x35, 0xc7, 0xdd, 0x49, + 0xbf, 0xb4, 0x64, 0xae, 0x41, 0xab, 0x86, 0x69, 0xef, 0x90, 0x3b, 0x1f, 0x6b, 0x6d, 0x01, 0xdf, + 0x01, 0xf1, 0xeb, 0xde, 0xc9, 0xad, 0x85, 0x3a, 0x15, 0x18, 0xff, 0x41, 0x4d, 0x0f, 0x34, 0xfe, + 0x52, 0x2f, 0xe7, 0xfc, 0x86, 0xf6, 0x45, 0x1e, 0xd2, 0xc0, 0x1e, 0x6a, 0x15, 0x52, 0xf1, 0xf0, + 0xd5, 0xd5, 0xda, 0x5f, 0x5f, 0x2a, 0x97, 0xce, 0x48, 0x63, 0xfa, 0xee, 0xba, 0xc9, 0x12, 0xbe, + 0x6c, 0x9b, 0x8f, 0xf4, 0xeb, 0x21, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xbf, 0x3d, 0x00, 0xb4, 0x02, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protobuf/api/instance.proto b/protobuf/api/instance.proto index e77009878..8a7cf83d5 100644 --- a/protobuf/api/instance.proto +++ b/protobuf/api/instance.proto @@ -24,8 +24,7 @@ service Instance { message GetInstanceRequest { bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -36,8 +35,7 @@ message ListInstanceRequest { // Service hash to filter executions. bytes serviceHash = 1 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } diff --git a/protobuf/api/process.pb.go b/protobuf/api/process.pb.go index af67a105a..8d9067e16 100644 --- a/protobuf/api/process.pb.go +++ b/protobuf/api/process.pb.go @@ -88,7 +88,7 @@ func (m *CreateProcessRequest) GetEdges() []*process.Process_Edge { // The response's data for the `Create` API. type CreateProcessResponse struct { // The process's hash created. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -118,10 +118,17 @@ func (m *CreateProcessResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateProcessResponse proto.InternalMessageInfo +func (m *CreateProcessResponse) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The request's data for the `Delete` API. type DeleteProcessRequest struct { // The process's hash to delete. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -151,6 +158,13 @@ func (m *DeleteProcessRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteProcessRequest proto.InternalMessageInfo +func (m *DeleteProcessRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The response's data for the `Delete` API, doesn't contain anything. type DeleteProcessResponse struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -185,7 +199,7 @@ var xxx_messageInfo_DeleteProcessResponse proto.InternalMessageInfo // The request's data for the `Get` API. type GetProcessRequest struct { // The process's hash to fetch. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -215,6 +229,13 @@ func (m *GetProcessRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetProcessRequest proto.InternalMessageInfo +func (m *GetProcessRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The request's data for the `List` API. type ListProcessRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -299,36 +320,36 @@ func init() { func init() { proto.RegisterFile("protobuf/api/process.proto", fileDescriptor_e79ddb1ea8859998) } var fileDescriptor_e79ddb1ea8859998 = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xdd, 0x6e, 0xd3, 0x30, - 0x14, 0x6e, 0xd6, 0x76, 0xb0, 0x03, 0x12, 0xc2, 0xed, 0x44, 0x14, 0xc6, 0x52, 0xf9, 0xaa, 0x12, - 0xe0, 0x48, 0x9b, 0x84, 0x04, 0x97, 0x1d, 0xa3, 0x48, 0x20, 0x40, 0xbd, 0x44, 0x20, 0xe1, 0x36, - 0x67, 0xa9, 0xa5, 0xd5, 0xf6, 0x62, 0x67, 0x12, 0xe2, 0x79, 0x78, 0x17, 0x1e, 0x01, 0x71, 0x91, - 0x87, 0xe8, 0x13, 0xa0, 0x38, 0xd9, 0xfa, 0x97, 0xdc, 0x20, 0xee, 0xec, 0xf3, 0xf3, 0x7d, 0xe7, - 0x7c, 0x9f, 0x0d, 0x81, 0x4e, 0x95, 0x55, 0xd3, 0xec, 0x22, 0xe2, 0x5a, 0x44, 0x3a, 0x55, 0x33, - 0x34, 0x86, 0xb9, 0x20, 0xb9, 0xbb, 0x40, 0x93, 0x30, 0xae, 0x45, 0x40, 0x13, 0x95, 0xa8, 0xe8, - 0xb6, 0xb4, 0xb8, 0xb9, 0x8b, 0x3b, 0x95, 0xd5, 0xc1, 0xd1, 0x6d, 0xda, 0x7e, 0xd7, 0x68, 0x36, - 0xb1, 0xe8, 0x6f, 0x0f, 0xfa, 0x67, 0x29, 0x72, 0x8b, 0x9f, 0xca, 0xf8, 0x04, 0xaf, 0x32, 0x34, - 0x96, 0xbc, 0x80, 0x8e, 0xe4, 0x0b, 0xf4, 0xf7, 0x06, 0xde, 0xf0, 0x60, 0x44, 0x97, 0x79, 0x78, - 0x7c, 0xcd, 0x2f, 0x45, 0xcc, 0x2d, 0xbe, 0xa2, 0x29, 0x5e, 0x65, 0x22, 0xc5, 0xf8, 0x99, 0x4e, - 0x85, 0xb4, 0xdc, 0xcc, 0x84, 0xa0, 0x13, 0x57, 0x4f, 0xce, 0xa0, 0x2b, 0x55, 0x8c, 0xc6, 0xef, - 0x0c, 0xda, 0xc3, 0x7b, 0x27, 0x3e, 0x73, 0xc3, 0x3a, 0x6a, 0x56, 0x51, 0xb0, 0x0f, 0x2a, 0xc6, - 0x51, 0x6f, 0x99, 0x87, 0x0f, 0x56, 0x90, 0xb1, 0xb8, 0x46, 0x3a, 0x29, 0x7b, 0x0b, 0x10, 0x8c, - 0x13, 0x34, 0x7e, 0xb7, 0x19, 0xe4, 0x3c, 0x4e, 0x9a, 0x40, 0x5c, 0x2f, 0xfd, 0x06, 0x87, 0x5b, - 0x9b, 0x19, 0xad, 0xa4, 0x41, 0x32, 0x86, 0xce, 0x9c, 0x9b, 0xb9, 0xef, 0x0d, 0xbc, 0xe1, 0xfd, - 0xd1, 0xe9, 0xaf, 0x3c, 0x6c, 0xfd, 0xc9, 0xc3, 0xa7, 0x89, 0xb0, 0xf3, 0x6c, 0xca, 0x66, 0x6a, - 0x11, 0x15, 0x74, 0xcf, 0x2f, 0x54, 0x26, 0x63, 0x6e, 0x85, 0x92, 0x11, 0xca, 0x44, 0x48, 0x8c, - 0x8a, 0x2e, 0xf6, 0x96, 0x9b, 0xf9, 0xc4, 0x01, 0xd0, 0x1f, 0xd0, 0x7f, 0x8d, 0x97, 0xb8, 0xa3, - 0xdd, 0x6c, 0x83, 0xe0, 0xe3, 0x3f, 0x10, 0x2c, 0xf3, 0xd0, 0xaf, 0x91, 0xdb, 0xb1, 0x56, 0xe4, - 0x8f, 0xe0, 0x70, 0x8b, 0xbc, 0x5c, 0x8f, 0x7e, 0x81, 0x87, 0x63, 0xb4, 0x5b, 0x23, 0xfd, 0xb7, - 0x9d, 0xfb, 0x40, 0xde, 0x0b, 0xb3, 0x05, 0x4f, 0xbf, 0x42, 0x6f, 0x23, 0x5a, 0x29, 0xfd, 0x06, - 0x0e, 0xaa, 0xe7, 0x86, 0xc6, 0xf7, 0x9c, 0x97, 0xbd, 0x1a, 0x2f, 0xeb, 0x6d, 0x5c, 0xb5, 0x9e, - 0xfc, 0xdc, 0x83, 0x3b, 0x55, 0x2d, 0x79, 0x07, 0xfb, 0xa5, 0xad, 0xe4, 0x98, 0xdd, 0x7c, 0x04, - 0x56, 0xf7, 0x84, 0x83, 0xb0, 0x31, 0x5f, 0x29, 0xd5, 0x2a, 0xc0, 0x4a, 0x11, 0xd7, 0xc1, 0xea, - 0x3c, 0x5d, 0x07, 0xab, 0x97, 0xbd, 0x45, 0x5e, 0x42, 0x7b, 0x8c, 0x96, 0x3c, 0x5e, 0x55, 0xee, - 0xf8, 0x10, 0xd4, 0xad, 0x4f, 0x5b, 0xe4, 0x1c, 0x3a, 0x85, 0x7e, 0xe4, 0x68, 0xd5, 0xbb, 0xab, - 0x72, 0xf0, 0xa4, 0x21, 0x7b, 0x33, 0xc1, 0xa8, 0xfb, 0xb9, 0xcd, 0xb5, 0x98, 0xee, 0xbb, 0xbf, - 0x7d, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0x62, 0x74, 0xaa, 0x95, 0x45, 0x04, 0x00, 0x00, + // 456 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0x8d, 0x9b, 0xa4, 0xd0, 0x05, 0x09, 0xb1, 0x49, 0x85, 0x65, 0x4a, 0x1d, 0xed, 0x29, 0x12, + 0xb0, 0x96, 0x8a, 0x84, 0x04, 0xc7, 0x94, 0x52, 0xa4, 0x22, 0x84, 0x72, 0x42, 0x08, 0x84, 0x36, + 0xd9, 0xa9, 0xbd, 0x52, 0xb3, 0xbb, 0xf5, 0xae, 0x8b, 0xf8, 0x20, 0xfe, 0x89, 0x93, 0x3f, 0x22, + 0x47, 0x4e, 0xc8, 0x6b, 0xb7, 0x6e, 0x1c, 0xfb, 0x82, 0x7a, 0xf3, 0xce, 0xcc, 0x7b, 0x33, 0xf3, + 0xde, 0x18, 0x05, 0x3a, 0x55, 0x56, 0x2d, 0xb2, 0xf3, 0x88, 0x69, 0x11, 0xe9, 0x54, 0x2d, 0xc1, + 0x18, 0xea, 0x82, 0xf8, 0xfe, 0x0a, 0x4c, 0x4c, 0x99, 0x16, 0x01, 0x89, 0x55, 0xac, 0xa2, 0x9b, + 0xd2, 0xe2, 0xe5, 0x1e, 0xee, 0xab, 0xac, 0x0e, 0x0e, 0x6e, 0xd2, 0xf6, 0x97, 0x06, 0xb3, 0xc9, + 0x45, 0xfe, 0x78, 0x68, 0x7c, 0x9c, 0x02, 0xb3, 0xf0, 0xb9, 0x8c, 0xcf, 0xe1, 0x32, 0x03, 0x63, + 0xf1, 0x6b, 0x34, 0x90, 0x6c, 0x05, 0xfe, 0xce, 0xc4, 0x9b, 0xee, 0xcd, 0xc8, 0x3a, 0x0f, 0x0f, + 0xaf, 0xd8, 0x85, 0xe0, 0xcc, 0xc2, 0x5b, 0x92, 0xc2, 0x65, 0x26, 0x52, 0xe0, 0x2f, 0x74, 0x2a, + 0xa4, 0x65, 0x66, 0x29, 0x04, 0x99, 0xbb, 0x7a, 0x7c, 0x8c, 0x86, 0x52, 0x71, 0x30, 0xfe, 0x60, + 0xd2, 0x9f, 0x3e, 0x38, 0xf2, 0xa9, 0x1b, 0xd6, 0xb5, 0xa6, 0x55, 0x0b, 0xfa, 0x49, 0x71, 0x98, + 0x8d, 0xd6, 0x79, 0xf8, 0xa8, 0xa6, 0xe4, 0xe2, 0x0a, 0xc8, 0xbc, 0xc4, 0x16, 0x24, 0xc0, 0x63, + 0x30, 0xfe, 0xb0, 0x9b, 0xe4, 0x84, 0xc7, 0x5d, 0x24, 0x0e, 0x4b, 0xbe, 0xa1, 0xfd, 0xc6, 0x66, + 0x46, 0x2b, 0x69, 0x8a, 0x11, 0x07, 0x09, 0x33, 0x89, 0xef, 0x4d, 0xbc, 0xe9, 0xc3, 0x59, 0xf4, + 0x37, 0x0f, 0x9f, 0xc7, 0xc2, 0x26, 0xd9, 0x82, 0x2e, 0xd5, 0x2a, 0x2a, 0x5a, 0xbd, 0x3c, 0x57, + 0x99, 0xe4, 0xcc, 0x0a, 0x25, 0x23, 0x90, 0xb1, 0x90, 0x10, 0x15, 0x08, 0xfa, 0x81, 0x99, 0x64, + 0xee, 0xc0, 0xe4, 0x27, 0x1a, 0xbf, 0x83, 0x0b, 0xd8, 0xd2, 0xed, 0xc7, 0x06, 0xf9, 0xd9, 0x3a, + 0x0f, 0xfd, 0x16, 0xdd, 0x1c, 0xc5, 0xff, 0x35, 0x7e, 0x82, 0xf6, 0x1b, 0x8d, 0xcb, 0xb5, 0xc8, + 0x17, 0xf4, 0xf8, 0x14, 0x6c, 0x63, 0x9c, 0x3b, 0xd9, 0x75, 0x8c, 0xf0, 0x47, 0x61, 0x1a, 0xd4, + 0xe4, 0x3b, 0x1a, 0x6d, 0x44, 0x2b, 0x75, 0xdf, 0xa3, 0xbd, 0xea, 0xc4, 0xc0, 0xf8, 0x9e, 0xf3, + 0x6f, 0xd4, 0xe2, 0x5f, 0xbb, 0x75, 0x35, 0xf4, 0xe8, 0xf7, 0x0e, 0xba, 0x57, 0xd5, 0xe2, 0x33, + 0xb4, 0x5b, 0x5a, 0x89, 0x0f, 0xe9, 0xf5, 0xf1, 0xd3, 0xb6, 0xb3, 0x0d, 0xc2, 0xce, 0x7c, 0xa5, + 0x52, 0xaf, 0x20, 0x2b, 0x05, 0xbc, 0x4d, 0xd6, 0xe6, 0xe5, 0x6d, 0xb2, 0x76, 0xc9, 0x7b, 0xf8, + 0x0d, 0xea, 0x9f, 0x82, 0xc5, 0x4f, 0xeb, 0xca, 0x2d, 0x0f, 0x82, 0xb6, 0xf5, 0x49, 0x0f, 0x9f, + 0xa0, 0x41, 0xa1, 0x1f, 0x3e, 0xa8, 0xb1, 0xdb, 0x2a, 0x07, 0xcf, 0x3a, 0xb2, 0xd7, 0x13, 0xcc, + 0x86, 0x5f, 0xfb, 0x4c, 0x8b, 0xc5, 0xae, 0xfb, 0x9f, 0x5f, 0xfd, 0x0b, 0x00, 0x00, 0xff, 0xff, + 0xcb, 0x00, 0x2c, 0xa4, 0x39, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protobuf/api/process.proto b/protobuf/api/process.proto index c0586bc6b..175eae787 100644 --- a/protobuf/api/process.proto +++ b/protobuf/api/process.proto @@ -50,8 +50,7 @@ message CreateProcessRequest { message CreateProcessResponse { // The process's hash created. bytes hash = 1 [ - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -60,8 +59,7 @@ message DeleteProcessRequest { // The process's hash to delete. bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -73,8 +71,7 @@ message DeleteProcessResponse { message GetProcessRequest { // The process's hash to fetch. bytes hash = 1 [ - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } diff --git a/protobuf/api/runner.pb.go b/protobuf/api/runner.pb.go index b0d02d7a1..cb3d32d26 100644 --- a/protobuf/api/runner.pb.go +++ b/protobuf/api/runner.pb.go @@ -29,7 +29,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // The request's data for the `Get` API. type GetRunnerRequest struct { - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -59,6 +59,13 @@ func (m *GetRunnerRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetRunnerRequest proto.InternalMessageInfo +func (m *GetRunnerRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The request's data for the `List` API. type ListRunnerRequest struct { // Filter used to filter runners. @@ -102,7 +109,7 @@ func (m *ListRunnerRequest) GetFilter() *ListRunnerRequest_Filter { // Filter contains filtering criteria. type ListRunnerRequest_Filter struct { // Filter by instance hash. - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" validate:"hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" validate:"hash"` // Filter by owner Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" validate:"accaddress"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -134,6 +141,13 @@ func (m *ListRunnerRequest_Filter) XXX_DiscardUnknown() { var xxx_messageInfo_ListRunnerRequest_Filter proto.InternalMessageInfo +func (m *ListRunnerRequest_Filter) GetInstanceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.InstanceHash + } + return nil +} + func (m *ListRunnerRequest_Filter) GetOwner() string { if m != nil { return m.Owner @@ -184,7 +198,7 @@ func (m *ListRunnerResponse) GetRunners() []*runner.Runner { // The request's data for the `Create` API. type CreateRunnerRequest struct { // Service's hash to start the runner with. - ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=serviceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash" validate:"hash"` + ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=serviceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash,omitempty" validate:"hash"` // Environmental variables to start the runner with. Env []string `protobuf:"bytes,2,rep,name=env,proto3" json:"env,omitempty" validate:"unique,dive,env"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -216,6 +230,13 @@ func (m *CreateRunnerRequest) XXX_DiscardUnknown() { var xxx_messageInfo_CreateRunnerRequest proto.InternalMessageInfo +func (m *CreateRunnerRequest) GetServiceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ServiceHash + } + return nil +} + func (m *CreateRunnerRequest) GetEnv() []string { if m != nil { return m.Env @@ -226,7 +247,7 @@ func (m *CreateRunnerRequest) GetEnv() []string { // The response's data for the `Create` API. type CreateRunnerResponse struct { // The runner's hash created. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -256,10 +277,17 @@ func (m *CreateRunnerResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateRunnerResponse proto.InternalMessageInfo +func (m *CreateRunnerResponse) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The request's data for the `Delete` API. type DeleteRunnerRequest struct { // Runner's hash - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` // If true, any persistent data (volumes) that belongs to the runner's container and its dependencies will also be deleted. DeleteData bool `protobuf:"varint,2,opt,name=deleteData,proto3" json:"deleteData,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -291,6 +319,13 @@ func (m *DeleteRunnerRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteRunnerRequest proto.InternalMessageInfo +func (m *DeleteRunnerRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + func (m *DeleteRunnerRequest) GetDeleteData() bool { if m != nil { return m.DeleteData @@ -343,41 +378,40 @@ func init() { func init() { proto.RegisterFile("protobuf/api/runner.proto", fileDescriptor_66b76d1ada2874b2) } var fileDescriptor_66b76d1ada2874b2 = []byte{ - // 536 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x8d, 0x93, 0x36, 0xb4, 0x93, 0x4a, 0xc0, 0xa6, 0xa0, 0xd4, 0x85, 0x24, 0xda, 0x53, 0x24, - 0x82, 0x8d, 0xd2, 0x03, 0x52, 0x6f, 0xa4, 0x55, 0x53, 0x24, 0x24, 0x24, 0x5f, 0x90, 0xb8, 0xa0, - 0x4d, 0x3c, 0x49, 0x16, 0xa5, 0x6b, 0x67, 0x77, 0x9d, 0x8a, 0x5f, 0x41, 0x5c, 0xf9, 0x00, 0xfe, - 0x82, 0x6f, 0xe0, 0x90, 0x8f, 0xc8, 0x85, 0x2b, 0xf2, 0x6e, 0x5a, 0xdb, 0x21, 0x70, 0xa8, 0x04, - 0xb7, 0x78, 0xe6, 0xcd, 0x9b, 0x79, 0x33, 0x6f, 0x03, 0x47, 0xb1, 0x8c, 0x74, 0x34, 0x4c, 0xc6, - 0x3e, 0x8b, 0xb9, 0x2f, 0x13, 0x21, 0x50, 0x7a, 0x26, 0x46, 0xf6, 0xae, 0x50, 0x4d, 0x3c, 0x16, - 0x73, 0x97, 0x4e, 0xa2, 0x49, 0xe4, 0xdf, 0x22, 0xd3, 0x2f, 0xf3, 0x61, 0x7e, 0x59, 0xb4, 0x7b, - 0x7c, 0x9b, 0xd6, 0x9f, 0x62, 0x54, 0x05, 0x2a, 0x7a, 0x0d, 0x0f, 0x06, 0xa8, 0x03, 0x13, 0x0a, - 0x70, 0x9e, 0xa0, 0xd2, 0x64, 0x04, 0x3b, 0x53, 0xa6, 0xa6, 0x0d, 0xa7, 0xed, 0x74, 0x0e, 0xfa, - 0x6f, 0xbf, 0x2f, 0x5b, 0xa5, 0x1f, 0xcb, 0xd6, 0xb3, 0x09, 0xd7, 0xd3, 0x64, 0xe8, 0x8d, 0xa2, - 0x2b, 0x3f, 0xed, 0xff, 0x7c, 0x1c, 0x25, 0x22, 0x64, 0x9a, 0x47, 0xc2, 0x47, 0x31, 0xe1, 0x02, - 0xfd, 0xb4, 0xca, 0xbb, 0x64, 0x6a, 0xba, 0x5a, 0xb6, 0x1a, 0x0b, 0x36, 0xe3, 0x21, 0xd3, 0x78, - 0x4a, 0x25, 0xce, 0x13, 0x2e, 0x31, 0xec, 0xa6, 0x79, 0x1a, 0x18, 0x72, 0xfa, 0xd3, 0x81, 0x87, - 0x6f, 0xb8, 0xda, 0x68, 0x7d, 0x0a, 0xd5, 0x31, 0x9f, 0x69, 0x94, 0xa6, 0x79, 0xad, 0x47, 0xbd, - 0x1b, 0xa9, 0xde, 0x6f, 0x60, 0xef, 0xc2, 0x20, 0x83, 0x75, 0x85, 0xfb, 0xd5, 0x81, 0xaa, 0x0d, - 0x91, 0x8f, 0x70, 0xc0, 0x85, 0xd2, 0x4c, 0x8c, 0xf0, 0x32, 0x53, 0x72, 0x71, 0x37, 0x25, 0xf7, - 0x33, 0x25, 0x56, 0x40, 0x81, 0x9b, 0xf8, 0xb0, 0x1b, 0x5d, 0x0b, 0x94, 0x8d, 0x72, 0xdb, 0xe9, - 0xec, 0xf7, 0x8f, 0x56, 0xcb, 0xd6, 0xa3, 0xac, 0x82, 0x8d, 0x46, 0x2c, 0x0c, 0x25, 0x2a, 0x45, - 0x03, 0x8b, 0xa3, 0xef, 0x80, 0xe4, 0xb5, 0xa8, 0x38, 0x12, 0x0a, 0xc9, 0x2b, 0xb8, 0x67, 0x0f, - 0xa3, 0x1a, 0x4e, 0xbb, 0xd2, 0xa9, 0xf5, 0x88, 0x95, 0x6e, 0x6e, 0xe6, 0x59, 0x70, 0xbf, 0x5e, - 0x1c, 0x27, 0xe4, 0x0b, 0xa4, 0xc1, 0x4d, 0x1d, 0xfd, 0xe6, 0x40, 0xfd, 0x4c, 0x22, 0xd3, 0x58, - 0x5c, 0xea, 0x14, 0x6a, 0x0a, 0xe5, 0x82, 0xff, 0x93, 0x65, 0xe4, 0xa9, 0xc9, 0x0b, 0xa8, 0xa0, - 0x58, 0x34, 0xca, 0xed, 0x4a, 0x67, 0xbf, 0xdf, 0x5c, 0x2d, 0x5b, 0x6e, 0x06, 0x4f, 0x04, 0x9f, - 0x27, 0xd8, 0x4d, 0x67, 0xee, 0xa2, 0x58, 0xd0, 0x20, 0x85, 0xd2, 0x0f, 0x70, 0x58, 0x1c, 0x79, - 0xbd, 0x8e, 0x41, 0xc1, 0x83, 0x27, 0x77, 0x18, 0x76, 0xed, 0xb3, 0xcf, 0x0e, 0xd4, 0xcf, 0x71, - 0x86, 0x9b, 0x4b, 0xf9, 0x1f, 0x26, 0x27, 0x4d, 0x80, 0xd0, 0xf4, 0x3e, 0x67, 0x9a, 0x19, 0x83, - 0xec, 0x05, 0xb9, 0x08, 0x7d, 0x0c, 0x87, 0xc5, 0xd9, 0xac, 0xfa, 0xde, 0x97, 0x32, 0x54, 0x6d, - 0x88, 0xbc, 0x84, 0xca, 0x00, 0x35, 0x71, 0xb3, 0x87, 0xb0, 0xf9, 0x5e, 0xdd, 0x2d, 0x4e, 0xa1, - 0x25, 0x72, 0x06, 0x3b, 0xa9, 0xcd, 0xc8, 0xf1, 0x5f, 0x9e, 0x90, 0xfb, 0x64, 0x7b, 0xd2, 0x8e, - 0x41, 0x4b, 0xe4, 0x35, 0x54, 0xed, 0x79, 0xc8, 0xd3, 0x0c, 0xb9, 0xc5, 0x63, 0x6e, 0xf3, 0x4f, - 0xe9, 0x3c, 0x95, 0xd5, 0x9a, 0xa7, 0xda, 0x72, 0x99, 0x3c, 0xd5, 0xb6, 0xe5, 0xd0, 0x52, 0x7f, - 0xf7, 0x7d, 0x85, 0xc5, 0x7c, 0x58, 0x35, 0x7f, 0x61, 0x27, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x69, 0x03, 0xfd, 0xe7, 0x2a, 0x05, 0x00, 0x00, + // 525 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0x8d, 0x13, 0x1a, 0xda, 0x49, 0x25, 0x60, 0x53, 0x50, 0xea, 0x42, 0x12, 0xed, 0x29, 0x12, + 0xc1, 0x46, 0xe1, 0x80, 0xd4, 0x1b, 0x6e, 0x45, 0x8b, 0xe0, 0xe4, 0x0b, 0x12, 0x1c, 0xd0, 0x26, + 0x9e, 0x24, 0x2b, 0xa5, 0x6b, 0x67, 0x77, 0x1d, 0xc4, 0x8f, 0x70, 0xe2, 0xc2, 0x07, 0xf0, 0x4b, + 0xf9, 0x88, 0x70, 0xe3, 0x84, 0xbc, 0xdb, 0xd6, 0x76, 0x30, 0x1c, 0x2a, 0x7a, 0x8b, 0x67, 0xdf, + 0xbe, 0x79, 0x6f, 0xe6, 0x6d, 0xe0, 0x30, 0x91, 0xb1, 0x8e, 0xc7, 0xe9, 0xd4, 0x67, 0x09, 0xf7, + 0x65, 0x2a, 0x04, 0x4a, 0xcf, 0xd4, 0xc8, 0xee, 0x05, 0xaa, 0x99, 0xc7, 0x12, 0xee, 0xd2, 0x59, + 0x3c, 0x8b, 0xfd, 0x6b, 0x64, 0xf6, 0x65, 0x3e, 0xcc, 0x2f, 0x8b, 0x76, 0x8f, 0xae, 0x8f, 0xf5, + 0x97, 0x04, 0x55, 0x89, 0x8a, 0x2a, 0xb8, 0x7f, 0x86, 0x3a, 0x34, 0xa5, 0x10, 0x97, 0x29, 0x2a, + 0x4d, 0x3e, 0xc1, 0x9d, 0x39, 0x53, 0xf3, 0x8e, 0xd3, 0x77, 0x06, 0xfb, 0xc1, 0xdb, 0xcd, 0xba, + 0xd7, 0x59, 0xb1, 0x05, 0x8f, 0x98, 0xc6, 0x63, 0x2a, 0x71, 0x99, 0x72, 0x89, 0xd1, 0x30, 0x83, + 0xd0, 0x5f, 0xeb, 0xde, 0xd3, 0x19, 0xd7, 0xf3, 0x74, 0xec, 0x4d, 0xe2, 0x0b, 0x3f, 0xd3, 0xf5, + 0x6c, 0x1a, 0xa7, 0x22, 0x62, 0x9a, 0xc7, 0xc2, 0x47, 0x31, 0xe3, 0x02, 0xfd, 0x0c, 0xea, 0x9d, + 0x33, 0x35, 0x0f, 0x0d, 0x31, 0xfd, 0xe9, 0xc0, 0x83, 0x77, 0x5c, 0x6d, 0xb5, 0x3d, 0x86, 0xe6, + 0x94, 0x2f, 0x34, 0x4a, 0xd3, 0xb8, 0x35, 0xa2, 0xde, 0x95, 0x4d, 0xef, 0x0f, 0xb0, 0xf7, 0xda, + 0x20, 0xc3, 0xcb, 0x1b, 0xee, 0x77, 0x07, 0x9a, 0xb6, 0x44, 0xa6, 0xb0, 0xcf, 0x85, 0xd2, 0x4c, + 0x4c, 0xf0, 0x3c, 0x77, 0x11, 0x6c, 0xd6, 0xbd, 0x7b, 0xb9, 0x8b, 0x1b, 0x89, 0x2f, 0xf1, 0x12, + 0x1f, 0x76, 0xe2, 0xcf, 0x02, 0x65, 0xa7, 0xde, 0x77, 0x06, 0x7b, 0xc1, 0xe1, 0x66, 0xdd, 0x7b, + 0x98, 0x37, 0x60, 0x93, 0x09, 0x8b, 0x22, 0x89, 0x4a, 0xd1, 0xd0, 0xe2, 0xe8, 0x7b, 0x20, 0x45, + 0x1f, 0x2a, 0x89, 0x85, 0x42, 0xf2, 0x0a, 0xee, 0xda, 0x85, 0xa8, 0x8e, 0xd3, 0x6f, 0x0c, 0x5a, + 0x23, 0x62, 0x6d, 0x9b, 0x5d, 0x79, 0x16, 0x1c, 0xb4, 0xcb, 0xea, 0x23, 0xbe, 0x42, 0x1a, 0x5e, + 0xdd, 0xa3, 0x3f, 0x1c, 0x68, 0x9f, 0x48, 0x64, 0x1a, 0xcb, 0x03, 0x8d, 0xa0, 0xa5, 0x50, 0xae, + 0xf8, 0x7f, 0x1f, 0x44, 0x91, 0x96, 0x3c, 0x87, 0x06, 0x8a, 0x55, 0xa7, 0xde, 0x6f, 0x0c, 0xf6, + 0x82, 0xee, 0x66, 0xdd, 0x73, 0x73, 0xf6, 0x54, 0xf0, 0x65, 0x8a, 0xc3, 0x4c, 0xef, 0x10, 0xc5, + 0x8a, 0x86, 0x19, 0x94, 0x7e, 0x84, 0x83, 0xb2, 0xdc, 0xcb, 0x51, 0x9c, 0x94, 0x72, 0xe7, 0xdf, + 0x2c, 0x5b, 0x5f, 0x1d, 0x68, 0x9f, 0xe2, 0x02, 0xb7, 0x87, 0x71, 0xdb, 0xa1, 0x26, 0x5d, 0x80, + 0xc8, 0xf4, 0x3d, 0x65, 0x9a, 0x99, 0x50, 0xec, 0x86, 0x85, 0x0a, 0x7d, 0x04, 0x07, 0x65, 0x5d, + 0xd6, 0xf5, 0xe8, 0x5b, 0x1d, 0x9a, 0xb6, 0x44, 0x5e, 0x42, 0xe3, 0x0c, 0x35, 0x71, 0xf3, 0xe0, + 0x6f, 0xbf, 0x4d, 0xb7, 0x22, 0x1d, 0xb4, 0x96, 0x4d, 0x2e, 0x8b, 0x16, 0x39, 0xfa, 0xc7, 0x93, + 0x71, 0x1f, 0x57, 0x1f, 0x5a, 0x19, 0xb4, 0x46, 0xde, 0x40, 0xd3, 0xae, 0x85, 0x3c, 0xc9, 0x91, + 0x15, 0xb9, 0x72, 0xbb, 0x7f, 0x3b, 0x2e, 0x52, 0x59, 0xaf, 0x45, 0xaa, 0x8a, 0xad, 0x14, 0xa9, + 0xaa, 0x86, 0x43, 0x6b, 0xc1, 0xce, 0x87, 0x06, 0x4b, 0xf8, 0xb8, 0x69, 0xfe, 0xae, 0x5e, 0xfc, + 0x0e, 0x00, 0x00, 0xff, 0xff, 0x45, 0xa6, 0xa2, 0x21, 0x16, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protobuf/api/runner.proto b/protobuf/api/runner.proto index dfebd662d..b56268b76 100644 --- a/protobuf/api/runner.proto +++ b/protobuf/api/runner.proto @@ -31,8 +31,7 @@ service Runner { message GetRunnerRequest { bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -43,8 +42,7 @@ message ListRunnerRequest { // Filter by instance hash. bytes instanceHash = 1 [ (gogoproto.moretags) = 'validate:"hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Filter by owner @@ -70,8 +68,7 @@ message CreateRunnerRequest { // Service's hash to start the runner with. bytes serviceHash = 1 [ (gogoproto.moretags) = 'validate:"hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Environmental variables to start the runner with. @@ -84,8 +81,7 @@ message CreateRunnerRequest { message CreateRunnerResponse { // The runner's hash created. bytes hash = 1 [ - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -94,8 +90,7 @@ message DeleteRunnerRequest { // Runner's hash bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // If true, any persistent data (volumes) that belongs to the runner's container and its dependencies will also be deleted. diff --git a/protobuf/api/service.pb.go b/protobuf/api/service.pb.go index 69c4c5107..7fc0d265f 100644 --- a/protobuf/api/service.pb.go +++ b/protobuf/api/service.pb.go @@ -142,7 +142,7 @@ func (m *CreateServiceRequest) GetSource() string { // The response's data for the `Create` API. type CreateServiceResponse struct { // The service's hash created. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -172,10 +172,17 @@ func (m *CreateServiceResponse) XXX_DiscardUnknown() { var xxx_messageInfo_CreateServiceResponse proto.InternalMessageInfo +func (m *CreateServiceResponse) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The request's data for the `Get` API. type GetServiceRequest struct { // The service's hash to fetch. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -205,6 +212,13 @@ func (m *GetServiceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetServiceRequest proto.InternalMessageInfo +func (m *GetServiceRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The request's data for the `List` API. type ListServiceRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -279,7 +293,7 @@ func (m *ListServiceResponse) GetServices() []*service.Service { // The request's data for the `List` API. type ExistsServiceRequest struct { // The service's hash of the existing service. This hash is nil if exists is fals. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -309,6 +323,13 @@ func (m *ExistsServiceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ExistsServiceRequest proto.InternalMessageInfo +func (m *ExistsServiceRequest) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + // The response's data for the `Exists` API. type ExistsServiceResponse struct { // True if a service already exists, false otherwise. @@ -352,7 +373,7 @@ func (m *ExistsServiceResponse) GetExists() bool { // The request's data for the `Hash` API. type HashServiceResponse struct { // Hash of the service calculated. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -382,6 +403,13 @@ func (m *HashServiceResponse) XXX_DiscardUnknown() { var xxx_messageInfo_HashServiceResponse proto.InternalMessageInfo +func (m *HashServiceResponse) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + func init() { proto.RegisterType((*CreateServiceRequest)(nil), "mesg.api.CreateServiceRequest") proto.RegisterType((*CreateServiceResponse)(nil), "mesg.api.CreateServiceResponse") @@ -396,50 +424,49 @@ func init() { func init() { proto.RegisterFile("protobuf/api/service.proto", fileDescriptor_0615fe53b372bcb1) } var fileDescriptor_0615fe53b372bcb1 = []byte{ - // 675 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x95, 0xdf, 0x4e, 0xdb, 0x4a, - 0x10, 0xc6, 0x13, 0xf2, 0x87, 0x30, 0x70, 0x74, 0x74, 0x36, 0x70, 0x64, 0x02, 0xc5, 0x74, 0xaf, - 0x90, 0x1a, 0x1c, 0x15, 0x24, 0xa4, 0xd2, 0xf6, 0x26, 0x80, 0xa8, 0x04, 0x12, 0x92, 0xdb, 0xab, - 0x56, 0xaa, 0x58, 0xec, 0x21, 0x59, 0x51, 0x7b, 0x8d, 0x77, 0x1d, 0x11, 0xf5, 0xa9, 0xfa, 0x16, - 0x7d, 0x86, 0x5e, 0xf8, 0x11, 0x7a, 0x91, 0x27, 0xa8, 0xbc, 0x71, 0x63, 0x3b, 0x18, 0x51, 0x55, - 0xaa, 0x7a, 0x97, 0xdd, 0x9d, 0xef, 0x37, 0x3b, 0xf3, 0xcd, 0xc6, 0xd0, 0x09, 0x42, 0xa1, 0xc4, - 0x55, 0x74, 0xdd, 0x63, 0x01, 0xef, 0x49, 0x0c, 0x47, 0xdc, 0x41, 0x4b, 0x6f, 0x92, 0x96, 0x87, - 0x72, 0x60, 0xb1, 0x80, 0x77, 0xe8, 0x40, 0x0c, 0x44, 0x6f, 0x16, 0x9a, 0xac, 0xf4, 0x42, 0xff, - 0x9a, 0x46, 0x77, 0x36, 0x67, 0xc7, 0x6a, 0x1c, 0xa0, 0x2c, 0xb2, 0xe8, 0x97, 0x06, 0xac, 0x1e, - 0x85, 0xc8, 0x14, 0xbe, 0x9d, 0xee, 0xdb, 0x78, 0x1b, 0xa1, 0x54, 0xe4, 0x08, 0x6a, 0x92, 0xbb, - 0x46, 0x75, 0xbb, 0xba, 0xb3, 0xd4, 0x7f, 0x3e, 0x89, 0xcd, 0xdd, 0x11, 0xfb, 0xc4, 0x5d, 0xa6, - 0xf0, 0x90, 0x0a, 0x8f, 0x2b, 0xf4, 0x02, 0x35, 0xee, 0x06, 0x21, 0xf7, 0x15, 0x93, 0x0e, 0xe7, - 0x5d, 0x8f, 0xdd, 0xbd, 0x3e, 0xd8, 0xef, 0xba, 0xc2, 0x63, 0xdc, 0xa7, 0x76, 0xa2, 0x26, 0x07, - 0x50, 0xf7, 0x99, 0x87, 0xc6, 0x82, 0xa6, 0xd0, 0x49, 0x6c, 0x6e, 0x65, 0x94, 0x10, 0x6f, 0x23, - 0x1e, 0xa2, 0x9b, 0x83, 0x50, 0x5b, 0xc7, 0x93, 0x97, 0xb0, 0xec, 0xa2, 0x74, 0x42, 0x1e, 0x28, - 0x2e, 0x7c, 0xa3, 0xa6, 0xe5, 0xeb, 0x93, 0xd8, 0x5c, 0xcb, 0xe4, 0x79, 0x55, 0x3e, 0x9a, 0xb8, - 0xf0, 0x8f, 0x23, 0xfc, 0x6b, 0x3e, 0x88, 0x42, 0xa6, 0xe5, 0xf5, 0xed, 0xea, 0xce, 0xf2, 0xde, - 0x53, 0x4b, 0xb7, 0x4d, 0x37, 0xc1, 0x4a, 0x8b, 0xb5, 0x8e, 0xf2, 0x81, 0xfd, 0x8d, 0xaf, 0xb1, - 0x59, 0x99, 0xc4, 0x66, 0xfb, 0xfe, 0x25, 0xa9, 0x5d, 0x84, 0x92, 0x73, 0x68, 0x28, 0x26, 0x6f, - 0xa4, 0xd1, 0xd8, 0xae, 0xed, 0x2c, 0xef, 0x19, 0x65, 0xf4, 0x77, 0x4c, 0xde, 0xf4, 0x37, 0x27, - 0xb1, 0x69, 0x64, 0x40, 0x97, 0x8f, 0xb0, 0x9b, 0x51, 0xa7, 0x10, 0x72, 0x01, 0x4d, 0x1c, 0xa1, - 0xaf, 0xa4, 0xd1, 0xd4, 0xb8, 0xf5, 0x32, 0xdc, 0x49, 0x12, 0xf1, 0x08, 0x2f, 0xc5, 0x90, 0x4b, - 0x58, 0x71, 0x31, 0x40, 0xdf, 0x45, 0xdf, 0xe1, 0x28, 0x8d, 0x45, 0x8d, 0xdd, 0x2a, 0xc3, 0x1e, - 0xff, 0x8c, 0x1b, 0x3f, 0xc2, 0x2e, 0x10, 0xc9, 0x2b, 0x80, 0x10, 0x03, 0x21, 0xb9, 0x12, 0xe1, - 0xd8, 0x68, 0x69, 0x8b, 0xe6, 0xf4, 0xd9, 0x9c, 0x44, 0x21, 0xa7, 0x76, 0x2e, 0x9e, 0x1c, 0x42, - 0x53, 0x8a, 0x28, 0x74, 0xd0, 0x58, 0xfa, 0xe5, 0xd9, 0x48, 0x15, 0xf4, 0x12, 0xd6, 0xe6, 0x46, - 0x56, 0x06, 0xc2, 0x97, 0x48, 0x4e, 0xa1, 0x3e, 0x64, 0x72, 0xa8, 0x87, 0x76, 0xa5, 0xbf, 0x9f, - 0xb8, 0xf9, 0x2d, 0x36, 0x9f, 0x0d, 0xb8, 0x1a, 0x46, 0x57, 0x96, 0x23, 0xbc, 0x5e, 0x52, 0xfe, - 0xee, 0xb5, 0x88, 0x7c, 0x57, 0xbb, 0xd8, 0x43, 0x7f, 0xc0, 0x7d, 0xec, 0x25, 0x2a, 0xeb, 0x0d, - 0x93, 0x43, 0x5b, 0x03, 0xe8, 0x1d, 0xfc, 0x77, 0x8a, 0x6a, 0xee, 0x45, 0x38, 0x05, 0xfa, 0xc5, - 0x6f, 0xd0, 0x8b, 0xdd, 0x99, 0xd5, 0xa8, 0x53, 0xa6, 0x99, 0x57, 0x81, 0x9c, 0x73, 0x39, 0x97, - 0x9a, 0x7e, 0x80, 0x76, 0x61, 0x37, 0xad, 0xf7, 0x18, 0x5a, 0xe9, 0x6b, 0x96, 0x46, 0x55, 0x1b, - 0xdc, 0x2e, 0x31, 0xb8, 0xdf, 0x9e, 0xc4, 0xe6, 0xbf, 0x45, 0x57, 0xa9, 0x3d, 0x53, 0xd2, 0xcf, - 0xb0, 0x7a, 0x72, 0xc7, 0xa5, 0x92, 0x7f, 0xa3, 0xde, 0x1e, 0xac, 0xcd, 0x25, 0x4f, 0x6b, 0xfb, - 0x1f, 0x9a, 0xa8, 0x0f, 0x74, 0xfe, 0x96, 0x9d, 0xae, 0xe8, 0x47, 0x68, 0x27, 0xe8, 0x3f, 0x65, - 0xfd, 0xde, 0xf7, 0x05, 0x58, 0x4c, 0xe1, 0xe4, 0x0c, 0x9a, 0xd3, 0x41, 0x23, 0xe9, 0xc3, 0x61, - 0x01, 0xb7, 0xca, 0xfe, 0x2d, 0x3b, 0xe6, 0x83, 0xe7, 0xd3, 0xfb, 0xd1, 0x0a, 0x79, 0x01, 0xb5, - 0x53, 0x54, 0x64, 0x23, 0x8b, 0xbc, 0x37, 0x62, 0x9d, 0x32, 0xfb, 0x68, 0x85, 0x9c, 0x40, 0x3d, - 0xb1, 0x9f, 0x6c, 0x66, 0xda, 0xfb, 0x43, 0xd2, 0x79, 0xf2, 0xc0, 0xe9, 0xec, 0x06, 0x67, 0xd0, - 0x9c, 0xf6, 0x3a, 0x5f, 0x4e, 0x99, 0xf5, 0xf9, 0x72, 0x4a, 0xdd, 0xa1, 0x95, 0xa4, 0xe1, 0x49, - 0xd7, 0x1e, 0xed, 0x4c, 0xee, 0x56, 0x25, 0xbe, 0xd1, 0x4a, 0xbf, 0xf1, 0xbe, 0xc6, 0x02, 0x7e, - 0xd5, 0xd4, 0xdf, 0xa3, 0xfd, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x82, 0x34, 0x66, 0x96, 0xf9, - 0x06, 0x00, 0x00, + // 668 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xdf, 0x4e, 0x13, 0x41, + 0x14, 0xc6, 0x5b, 0xfa, 0x87, 0x72, 0xc0, 0x18, 0xa7, 0x60, 0x96, 0x82, 0x2c, 0xce, 0x15, 0x89, + 0x65, 0x37, 0x42, 0x42, 0x22, 0xea, 0x4d, 0x0b, 0xc1, 0x04, 0x12, 0x93, 0xd5, 0x2b, 0x34, 0xd1, + 0xa1, 0x7b, 0x68, 0x27, 0xd8, 0x9d, 0x65, 0x67, 0xb6, 0xd2, 0xc7, 0xf2, 0x2d, 0x7c, 0x8a, 0x7d, + 0x04, 0x2f, 0x7a, 0xe9, 0x95, 0xd9, 0xe9, 0xda, 0xdd, 0x2d, 0x4b, 0x30, 0x26, 0x7a, 0xd7, 0x99, + 0x39, 0xdf, 0x6f, 0xce, 0x39, 0xdf, 0x99, 0x2e, 0xb4, 0xfc, 0x40, 0x28, 0x71, 0x11, 0x5e, 0xda, + 0xcc, 0xe7, 0xb6, 0xc4, 0x60, 0xc4, 0x7b, 0x68, 0xe9, 0x4d, 0xd2, 0x18, 0xa2, 0xec, 0x5b, 0xcc, + 0xe7, 0x2d, 0xda, 0x17, 0x7d, 0x61, 0xcf, 0x42, 0xe3, 0x95, 0x5e, 0xe8, 0x5f, 0xd3, 0xe8, 0xd6, + 0xe6, 0xec, 0x58, 0x8d, 0x7d, 0x94, 0x79, 0x16, 0xfd, 0x56, 0x83, 0xd5, 0x6e, 0x80, 0x4c, 0xe1, + 0xbb, 0xe9, 0xbe, 0x83, 0xd7, 0x21, 0x4a, 0x45, 0xba, 0x50, 0x91, 0xdc, 0x35, 0xca, 0xdb, 0xe5, + 0x9d, 0xa5, 0xce, 0xf3, 0x49, 0x64, 0xee, 0x8e, 0xd8, 0x17, 0xee, 0x32, 0x85, 0x87, 0x54, 0x0c, + 0xb9, 0xc2, 0xa1, 0xaf, 0xc6, 0x6d, 0x3f, 0xe0, 0x9e, 0x62, 0xb2, 0xc7, 0x79, 0x7b, 0xc8, 0x6e, + 0x5e, 0x1f, 0xec, 0xb7, 0x5d, 0x31, 0x64, 0xdc, 0xa3, 0x4e, 0xac, 0x26, 0x07, 0x50, 0xf5, 0xd8, + 0x10, 0x8d, 0x05, 0x4d, 0xa1, 0x93, 0xc8, 0xdc, 0x4a, 0x29, 0x01, 0x5e, 0x87, 0x3c, 0x40, 0x37, + 0x03, 0xa1, 0x8e, 0x8e, 0x27, 0x2f, 0x61, 0xd9, 0x45, 0xd9, 0x0b, 0xb8, 0xaf, 0xb8, 0xf0, 0x8c, + 0x8a, 0x96, 0xaf, 0x4f, 0x22, 0x73, 0x2d, 0x95, 0x67, 0x55, 0xd9, 0x68, 0xe2, 0xc2, 0x83, 0x9e, + 0xf0, 0x2e, 0x79, 0x3f, 0x0c, 0x98, 0x96, 0x57, 0xb7, 0xcb, 0x3b, 0xcb, 0x7b, 0x4f, 0x2d, 0xdd, + 0x36, 0xdd, 0x04, 0x2b, 0x29, 0xd6, 0xea, 0x66, 0x03, 0x3b, 0x1b, 0xdf, 0x23, 0xb3, 0x34, 0x89, + 0xcc, 0xe6, 0xed, 0x24, 0xa9, 0x93, 0x87, 0x92, 0x33, 0xa8, 0x29, 0x26, 0xaf, 0xa4, 0x51, 0xdb, + 0xae, 0xec, 0x2c, 0xef, 0x19, 0x45, 0xf4, 0xf7, 0x4c, 0x5e, 0x75, 0x36, 0x27, 0x91, 0x69, 0xa4, + 0x40, 0x97, 0x8f, 0xb0, 0x9d, 0x52, 0xa7, 0x10, 0xf2, 0x16, 0xea, 0x38, 0x42, 0x4f, 0x49, 0xa3, + 0xae, 0x71, 0xeb, 0x45, 0xb8, 0xe3, 0x38, 0xe2, 0x1e, 0x5e, 0x82, 0x21, 0x9f, 0x61, 0xc5, 0x45, + 0x1f, 0x3d, 0x17, 0xbd, 0x1e, 0x47, 0x69, 0x2c, 0x6a, 0xec, 0x56, 0x11, 0xf6, 0xe8, 0x77, 0xdc, + 0xf8, 0x1e, 0x76, 0x8e, 0x48, 0x5e, 0x01, 0x04, 0xe8, 0x0b, 0xc9, 0x95, 0x08, 0xc6, 0x46, 0x43, + 0x5b, 0x34, 0xa7, 0x4f, 0xe7, 0x24, 0x0c, 0x38, 0x75, 0x32, 0xf1, 0xe4, 0x10, 0xea, 0x52, 0x84, + 0x41, 0x0f, 0x8d, 0xa5, 0x3f, 0x9e, 0x8d, 0x44, 0x41, 0x3f, 0xc2, 0xda, 0xdc, 0xc8, 0x4a, 0x5f, + 0x78, 0x12, 0x49, 0x17, 0xaa, 0x03, 0x26, 0x07, 0x7a, 0x68, 0x57, 0x3a, 0xf6, 0xcf, 0xc8, 0x7c, + 0xd6, 0xe7, 0x6a, 0x10, 0x5e, 0x58, 0x3d, 0x31, 0xb4, 0xe3, 0xd2, 0x77, 0x2f, 0x45, 0xe8, 0xb9, + 0xda, 0x41, 0x1b, 0xbd, 0x3e, 0xf7, 0xd0, 0x8e, 0x15, 0xd6, 0x1b, 0x26, 0x07, 0x8e, 0x16, 0x53, + 0x05, 0x8f, 0x4e, 0x50, 0xcd, 0xbd, 0x86, 0x4f, 0x39, 0xf2, 0x69, 0xbe, 0xcc, 0x59, 0xb2, 0x5a, + 0xff, 0x77, 0xb7, 0xae, 0x02, 0x39, 0xe3, 0x72, 0xee, 0x5a, 0xfa, 0x01, 0x9a, 0xb9, 0xdd, 0xa4, + 0xce, 0x23, 0x68, 0x24, 0xaf, 0x58, 0x1a, 0x65, 0x6d, 0x6c, 0xb3, 0xc0, 0xd8, 0x4e, 0x73, 0x12, + 0x99, 0x0f, 0xf3, 0x6e, 0x52, 0x67, 0xa6, 0xa4, 0x5f, 0x61, 0xf5, 0xf8, 0x86, 0x4b, 0x25, 0xff, + 0x77, 0xad, 0x36, 0xac, 0xcd, 0x5d, 0x9c, 0xd4, 0xf5, 0x18, 0xea, 0xa8, 0x0f, 0xf4, 0xdd, 0x0d, + 0x27, 0x59, 0xd1, 0x73, 0x68, 0xc6, 0xf2, 0x7f, 0x61, 0xf7, 0xde, 0x8f, 0x05, 0x58, 0x4c, 0xc0, + 0xe4, 0x14, 0xea, 0xd3, 0xc1, 0x22, 0xc9, 0x43, 0x61, 0x3e, 0xb7, 0x8a, 0xfe, 0x1d, 0x5b, 0xe6, + 0x9d, 0xe7, 0xd3, 0xdc, 0x68, 0x89, 0xbc, 0x80, 0xca, 0x09, 0x2a, 0xb2, 0x91, 0x46, 0xde, 0x1a, + 0xab, 0x56, 0x91, 0x6d, 0xb4, 0x44, 0x8e, 0xa1, 0x1a, 0xdb, 0x4e, 0x36, 0x53, 0xed, 0xed, 0xe1, + 0x68, 0x3d, 0xb9, 0xe3, 0x74, 0x96, 0xc1, 0x29, 0xd4, 0xa7, 0x7d, 0xce, 0x96, 0x53, 0x64, 0x79, + 0xb6, 0x9c, 0x42, 0x67, 0x68, 0x89, 0x9c, 0x40, 0x35, 0xee, 0xda, 0xbd, 0x9d, 0xc9, 0x64, 0x55, + 0xe0, 0x19, 0x2d, 0x75, 0x6a, 0xe7, 0x15, 0xe6, 0xf3, 0x8b, 0xba, 0xfe, 0xfe, 0xec, 0xff, 0x0a, + 0x00, 0x00, 0xff, 0xff, 0x75, 0xab, 0xd8, 0x9d, 0xe9, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/protobuf/api/service.proto b/protobuf/api/service.proto index 8c99c237f..cb432dc3d 100644 --- a/protobuf/api/service.proto +++ b/protobuf/api/service.proto @@ -83,8 +83,7 @@ message CreateServiceRequest { message CreateServiceResponse { // The service's hash created. bytes hash = 1 [ - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -93,8 +92,7 @@ message GetServiceRequest { // The service's hash to fetch. bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -114,8 +112,7 @@ message ExistsServiceRequest { // The service's hash of the existing service. This hash is nil if exists is fals. bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -129,7 +126,6 @@ message ExistsServiceResponse { message HashServiceResponse { // Hash of the service calculated. bytes hash = 1 [ - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } diff --git a/protobuf/types/event.proto b/protobuf/types/event.proto index f085fa38c..5862af9a3 100644 --- a/protobuf/types/event.proto +++ b/protobuf/types/event.proto @@ -13,15 +13,13 @@ message Event { // Hash is a unique hash to identify event. bytes hash = 1 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // instanceHash is hash of instance that can proceed an execution. bytes instanceHash = 2 [ (gogoproto.moretags) = 'hash:"name:2" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // key is the key of the event. diff --git a/protobuf/types/execution.proto b/protobuf/types/execution.proto index 46473fcfb..21f427187 100644 --- a/protobuf/types/execution.proto +++ b/protobuf/types/execution.proto @@ -35,8 +35,7 @@ message Execution { // Hash is a unique hash to identify execution. bytes hash = 1 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // parentHash is the unique hash of parent execution. @@ -44,15 +43,13 @@ message Execution { // dependency execution considered as the parent. bytes parentHash = 2 [ (gogoproto.moretags) = 'hash:"name:2" validate:"required_without=EventHash,omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // eventHash is unique event hash. bytes eventHash = 3 [ (gogoproto.moretags) = 'hash:"name:3" validate:"required_without=ParentHash,omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Status is the current status of execution. @@ -63,8 +60,7 @@ message Execution { // instanceHash is hash of the instance that can proceed an execution bytes instanceHash = 5 [ (gogoproto.moretags) = 'hash:"name:5" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // taskKey is the key of the task of this execution. @@ -95,8 +91,7 @@ message Execution { // processHash is the unique hash of the process associated to this execution. bytes processHash = 11 [ (gogoproto.moretags) = 'hash:"name:11" validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // node key of the process. @@ -107,8 +102,7 @@ message Execution { // runner that should execute this execution. bytes executorHash = 13 [ (gogoproto.moretags) = 'hash:"name:13" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // price of running the exeuction. @@ -126,8 +120,7 @@ message Execution { // Emitter's hash. bytes runnerHash = 1 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Block height when this emitter proposed the execution. diff --git a/protobuf/types/instance.proto b/protobuf/types/instance.proto index e4ebaaf80..34fc5b709 100644 --- a/protobuf/types/instance.proto +++ b/protobuf/types/instance.proto @@ -12,19 +12,16 @@ option (gogoproto.equal_all) = true; message Instance { bytes hash = 1 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; bytes serviceHash = 2 [ (gogoproto.moretags) = 'hash:"name:2" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; bytes envHash = 3 [ (gogoproto.moretags) = 'hash:"name:3" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } diff --git a/protobuf/types/ownership.proto b/protobuf/types/ownership.proto index da61def0c..f286197be 100644 --- a/protobuf/types/ownership.proto +++ b/protobuf/types/ownership.proto @@ -15,8 +15,7 @@ message Ownership { // Service's hash. bytes hash = 1 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // The owner of the resource. @@ -28,8 +27,7 @@ message Ownership { // Resource's hash. bytes resourceHash = 3 [ (gogoproto.moretags) = 'hash:"name:3" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; enum Resource { diff --git a/protobuf/types/process.proto b/protobuf/types/process.proto index bba8945de..0132ea7ef 100644 --- a/protobuf/types/process.proto +++ b/protobuf/types/process.proto @@ -17,8 +17,7 @@ message Process { // Hash of the instance that triggers the process. bytes instanceHash = 2 [ (gogoproto.moretags) = 'hash:"name:2" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Key of the task that triggers the process. @@ -31,8 +30,7 @@ message Process { // Hash of the instance that triggers the process. bytes instanceHash = 2 [ (gogoproto.moretags) = 'hash:"name:2" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Key of the event that triggers the process. @@ -45,8 +43,7 @@ message Process { // Hash of the instance to execute. bytes instanceHash = 2 [ (gogoproto.moretags) = 'hash:"name:2" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Task of the instance to execute. @@ -235,8 +232,7 @@ message Process { // Process's hash bytes hash = 1 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Process's name diff --git a/protobuf/types/runner.proto b/protobuf/types/runner.proto index 2d0d01529..21c5fe52f 100644 --- a/protobuf/types/runner.proto +++ b/protobuf/types/runner.proto @@ -13,8 +13,7 @@ message Runner { // Runner's hash bytes hash = 1 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // owner of the engine of this runner @@ -25,8 +24,7 @@ message Runner { // instanceHash is hash of the instance that runner will handle bytes instanceHash = 3 [ (gogoproto.moretags) = 'hash:"name:3" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // The address of the runner. diff --git a/protobuf/types/service.proto b/protobuf/types/service.proto index ccacebe01..a40895aa3 100644 --- a/protobuf/types/service.proto +++ b/protobuf/types/service.proto @@ -179,8 +179,7 @@ message Service { // Service's hash. bytes hash = 10 [ (gogoproto.moretags) = 'hash:"-" validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Service's sid. diff --git a/runner/runner.pb.go b/runner/runner.pb.go index ff344541b..f79433bcb 100644 --- a/runner/runner.pb.go +++ b/runner/runner.pb.go @@ -27,11 +27,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Runner represents one node service's instance. type Runner struct { // Runner's hash - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" hash:"-" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" hash:"-" validate:"required,hash"` // owner of the engine of this runner Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty" hash:"name:2" validate:"required"` // instanceHash is hash of the instance that runner will handle - InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=instanceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash" hash:"name:3" validate:"required,hash"` + InstanceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=instanceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"instanceHash,omitempty" hash:"name:3" validate:"required,hash"` // The address of the runner. Address github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,4,opt,name=address,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"address,omitempty" hash:"-" validate:"required,accaddress"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -70,28 +70,27 @@ func init() { func init() { proto.RegisterFile("runner.proto", fileDescriptor_48eceea7e2abc593) } var fileDescriptor_48eceea7e2abc593 = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xb1, 0x4e, 0xf3, 0x30, - 0x14, 0x85, 0x9b, 0xbf, 0xfd, 0x8b, 0xb0, 0x3a, 0x65, 0x8a, 0x18, 0x9a, 0x62, 0x09, 0xa8, 0x04, - 0x49, 0xa4, 0x76, 0x2b, 0x53, 0x3b, 0x31, 0x67, 0x42, 0x08, 0x06, 0xd7, 0xbe, 0x4d, 0x2c, 0x1a, - 0xbb, 0xd8, 0x4e, 0x11, 0x23, 0x6f, 0xc3, 0xc6, 0x6b, 0xf4, 0x19, 0x18, 0x22, 0xc1, 0x23, 0x74, - 0x64, 0x42, 0x76, 0x8a, 0x28, 0x12, 0x2a, 0x12, 0x93, 0x7d, 0x6d, 0x9f, 0xf3, 0x9d, 0xab, 0x6b, - 0xd4, 0x51, 0xa5, 0x10, 0xa0, 0xe2, 0x85, 0x92, 0x46, 0xfa, 0xa8, 0x00, 0x9d, 0xc5, 0xe6, 0x61, - 0x01, 0xfa, 0x00, 0x67, 0x32, 0x93, 0x89, 0x3b, 0x9f, 0x96, 0xb3, 0xc4, 0x56, 0xae, 0x70, 0xbb, - 0xfa, 0x3d, 0x7e, 0x6e, 0xa2, 0x76, 0xea, 0x0c, 0xfc, 0x39, 0x6a, 0xe5, 0x44, 0xe7, 0x81, 0xd7, - 0xf3, 0xfa, 0x9d, 0xc9, 0xe5, 0xaa, 0x0a, 0x1b, 0x2f, 0x55, 0x78, 0x9a, 0x71, 0x93, 0x97, 0xd3, - 0x98, 0xca, 0x22, 0xb1, 0xde, 0xd1, 0x4c, 0x96, 0x82, 0x11, 0xc3, 0xa5, 0x48, 0x40, 0x64, 0x5c, - 0x40, 0x62, 0x55, 0xf1, 0x05, 0xd1, 0xf9, 0xba, 0x0a, 0x0f, 0x6d, 0x31, 0xc2, 0x11, 0xee, 0x2d, - 0xc9, 0x9c, 0x33, 0x62, 0x60, 0x84, 0x15, 0xdc, 0x95, 0x5c, 0x01, 0x3b, 0xb3, 0x77, 0x38, 0x75, - 0x14, 0xff, 0x1c, 0xfd, 0x97, 0xf7, 0x02, 0x54, 0xf0, 0xaf, 0xe7, 0xf5, 0xf7, 0x27, 0x47, 0x5f, - 0x5a, 0x41, 0x0a, 0x18, 0x0d, 0x7e, 0x32, 0xc0, 0x69, 0xad, 0xf1, 0x1f, 0x3d, 0xd4, 0xe1, 0x42, - 0x1b, 0x22, 0x28, 0x58, 0x70, 0xd0, 0x74, 0x99, 0x6f, 0xfe, 0x96, 0xf9, 0x78, 0x8b, 0x3b, 0xdc, - 0x11, 0xfc, 0x1b, 0xd2, 0x5f, 0xa2, 0x3d, 0xc2, 0x98, 0x02, 0xad, 0x83, 0x96, 0xa3, 0x5f, 0xaf, - 0xab, 0xf0, 0x64, 0x57, 0xfb, 0x84, 0xd2, 0x8d, 0x02, 0xbf, 0x57, 0x61, 0xb4, 0x15, 0x92, 0x4a, - 0x5d, 0x48, 0xbd, 0x59, 0x22, 0xcd, 0x6e, 0x13, 0x37, 0xc1, 0x78, 0x4c, 0xe9, 0xb8, 0x56, 0xa4, - 0x9f, 0xb0, 0xc9, 0x60, 0xf5, 0xda, 0x6d, 0x3c, 0xbd, 0x75, 0xbd, 0xab, 0xfe, 0xef, 0x6d, 0xd6, - 0x7f, 0x63, 0xda, 0x76, 0xc3, 0x1e, 0x7e, 0x04, 0x00, 0x00, 0xff, 0xff, 0x81, 0xe2, 0x9d, 0x6e, - 0x2c, 0x02, 0x00, 0x00, + // 315 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x31, 0x4e, 0xc3, 0x30, + 0x14, 0x86, 0x09, 0x2d, 0x45, 0x58, 0x9d, 0x32, 0x45, 0x0c, 0x4d, 0xb1, 0x04, 0x54, 0x82, 0xc4, + 0x52, 0xbb, 0x95, 0xa9, 0x9d, 0x98, 0x23, 0x16, 0x10, 0x8b, 0x6b, 0xbf, 0x26, 0x16, 0xc4, 0x2e, + 0xb6, 0x53, 0xc4, 0xc0, 0x75, 0x10, 0x47, 0xe1, 0x14, 0x91, 0xe0, 0x08, 0x1d, 0x99, 0x90, 0x9d, + 0x22, 0x8a, 0x84, 0x60, 0x61, 0xb2, 0x9f, 0xfd, 0xfe, 0xff, 0xfb, 0xe5, 0x67, 0xd4, 0xd5, 0x95, + 0x94, 0xa0, 0xd3, 0x85, 0x56, 0x56, 0x85, 0xa8, 0x04, 0x93, 0xa7, 0xf6, 0x61, 0x01, 0x66, 0x1f, + 0xe7, 0x2a, 0x57, 0xc4, 0x9f, 0xcf, 0xaa, 0x39, 0x71, 0x95, 0x2f, 0xfc, 0xae, 0xe9, 0xc7, 0x4f, + 0x2d, 0xd4, 0xc9, 0xbc, 0x41, 0x58, 0xa0, 0x76, 0x41, 0x4d, 0x11, 0x05, 0xfd, 0x60, 0xd0, 0x9d, + 0x5e, 0xac, 0xea, 0xf8, 0xc0, 0xd5, 0x63, 0x9c, 0xe0, 0xfe, 0x92, 0xde, 0x0a, 0x4e, 0x2d, 0x8c, + 0xb1, 0x86, 0xbb, 0x4a, 0x68, 0xe0, 0xa7, 0xee, 0x0e, 0xbf, 0xd7, 0xf1, 0x49, 0x2e, 0x6c, 0x51, + 0xcd, 0x52, 0xa6, 0x4a, 0xe2, 0xe0, 0xc9, 0x5c, 0x55, 0x92, 0x53, 0x2b, 0x94, 0x24, 0x20, 0x73, + 0x21, 0x81, 0xb8, 0xd6, 0xf4, 0x9c, 0x9a, 0x22, 0xf3, 0x84, 0xf0, 0x0c, 0xed, 0xa8, 0x7b, 0x09, + 0x3a, 0xda, 0xee, 0x07, 0x83, 0xbd, 0xe9, 0xe1, 0x17, 0x4a, 0xd2, 0x12, 0xc6, 0xc3, 0x9f, 0x78, + 0x38, 0x6b, 0x34, 0xe1, 0x23, 0xea, 0x0a, 0x69, 0x2c, 0x95, 0x0c, 0x9c, 0x65, 0xd4, 0xf2, 0x71, + 0x2f, 0x57, 0x75, 0x7c, 0xb4, 0xe1, 0x31, 0xfa, 0xbf, 0xcc, 0xdf, 0x70, 0xe1, 0x12, 0xed, 0x52, + 0xce, 0x35, 0x18, 0x13, 0xb5, 0x3d, 0xf9, 0x7a, 0x55, 0xc7, 0xc7, 0xbf, 0x3d, 0x14, 0x65, 0x6c, + 0xad, 0x70, 0xe8, 0x64, 0x03, 0xcd, 0x94, 0x29, 0x95, 0x59, 0x2f, 0x89, 0xe1, 0x37, 0xc4, 0x0f, + 0x2e, 0x9d, 0x30, 0x36, 0x69, 0x14, 0xd9, 0x27, 0x6c, 0x3a, 0x7c, 0x79, 0xed, 0x6d, 0x3d, 0xbf, + 0xf5, 0x82, 0xab, 0xc1, 0xdf, 0xe1, 0x9b, 0x2f, 0x31, 0xeb, 0xf8, 0x19, 0x8f, 0x3e, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x26, 0x68, 0x89, 0x70, 0x23, 0x02, 0x00, 0x00, } func (this *Runner) Equal(that interface{}) bool { @@ -113,13 +112,13 @@ func (this *Runner) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.Hash.Equal(that1.Hash) { + if !bytes.Equal(this.Hash, that1.Hash) { return false } if this.Owner != that1.Owner { return false } - if !this.InstanceHash.Equal(that1.InstanceHash) { + if !bytes.Equal(this.InstanceHash, that1.InstanceHash) { return false } if !bytes.Equal(this.Address, that1.Address) { diff --git a/service/service.pb.go b/service/service.pb.go index 00f4d3bff..f72579e90 100644 --- a/service/service.pb.go +++ b/service/service.pb.go @@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Service represents the service's type. type Service struct { // Service's hash. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,10,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" hash:"-" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,10,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" hash:"-" validate:"required,hash"` // Service's sid. Sid string `protobuf:"bytes,12,opt,name=sid,proto3" json:"sid,omitempty" hash:"name:12" validate:"required,printascii,max=63,domain"` // Service's name. @@ -304,70 +304,70 @@ func init() { func init() { proto.RegisterFile("service.proto", fileDescriptor_a0b84a42fa06f626) } var fileDescriptor_a0b84a42fa06f626 = []byte{ - // 1005 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x97, 0xcf, 0x6e, 0xe3, 0x44, - 0x1c, 0xc7, 0x37, 0xb5, 0x93, 0x34, 0xd3, 0x06, 0x89, 0x39, 0xcd, 0x46, 0xa2, 0xf6, 0x1a, 0x89, - 0xcd, 0x42, 0xfe, 0x6c, 0x93, 0x6e, 0xd9, 0x76, 0xb5, 0x40, 0xc3, 0x52, 0xb1, 0x48, 0xfc, 0x73, - 0x41, 0xa0, 0x15, 0x7b, 0x98, 0xd8, 0xd3, 0x74, 0x48, 0x3c, 0xe3, 0x9d, 0xb1, 0x23, 0xf2, 0x10, - 0xbc, 0x00, 0x4f, 0xc0, 0x99, 0x47, 0xe0, 0xb4, 0x12, 0x6f, 0xc0, 0xc1, 0x12, 0x3c, 0x82, 0x8f, - 0x1c, 0x10, 0xf2, 0x38, 0x69, 0x9d, 0xc6, 0x49, 0xba, 0xa5, 0x17, 0x38, 0x35, 0x6e, 0xe6, 0xfb, - 0xf9, 0x7a, 0x7e, 0xbf, 0xef, 0x6f, 0x1c, 0x83, 0xaa, 0x24, 0x62, 0x4c, 0x1d, 0xd2, 0xf2, 0x05, - 0x0f, 0x38, 0x04, 0x1e, 0x91, 0x83, 0x56, 0x30, 0xf1, 0x89, 0xac, 0x59, 0x03, 0x3e, 0xe0, 0x6d, - 0xf5, 0xff, 0x7e, 0x78, 0xda, 0x4e, 0xae, 0xd4, 0x85, 0xfa, 0x94, 0xae, 0xb7, 0xfe, 0xbe, 0x0d, - 0xca, 0x27, 0x29, 0x01, 0x8e, 0x80, 0x7e, 0x86, 0xe5, 0x19, 0x02, 0x66, 0xa1, 0xbe, 0xdd, 0xfb, - 0xf6, 0x65, 0x64, 0xdc, 0xfa, 0x3d, 0x32, 0xde, 0x19, 0xd0, 0xe0, 0x2c, 0xec, 0xb7, 0x1c, 0xee, - 0xb5, 0x13, 0x78, 0xf3, 0x94, 0x87, 0xcc, 0xc5, 0x01, 0xe5, 0xac, 0x4d, 0xd8, 0x80, 0x32, 0xd2, - 0x4e, 0x54, 0xad, 0x8f, 0xb1, 0x3c, 0x8b, 0x23, 0xe3, 0x4e, 0x72, 0x71, 0x68, 0x35, 0x2d, 0x73, - 0x8c, 0x47, 0xd4, 0xc5, 0x01, 0x39, 0xb4, 0x04, 0x79, 0x11, 0x52, 0x41, 0xdc, 0x46, 0xf2, 0x9d, - 0x65, 0x2b, 0x17, 0xf8, 0x25, 0xd0, 0x24, 0x75, 0xd1, 0xb6, 0x59, 0xa8, 0x57, 0x7a, 0xef, 0xc7, - 0x91, 0xf1, 0x28, 0x55, 0x32, 0xec, 0x91, 0xc3, 0xdd, 0x4e, 0xae, 0xde, 0x17, 0x94, 0x05, 0x58, - 0x3a, 0x94, 0x36, 0x3c, 0xfc, 0xc3, 0xe3, 0xfd, 0x6e, 0xc3, 0xe5, 0x1e, 0xa6, 0xcc, 0xb2, 0x13, - 0x16, 0x7c, 0x02, 0xf4, 0x44, 0x8d, 0x0a, 0x8a, 0x79, 0x3f, 0x8e, 0x8c, 0x46, 0x96, 0xb9, 0x06, - 0x69, 0xd9, 0x4a, 0x0d, 0x9f, 0x82, 0x2d, 0x97, 0x48, 0x47, 0x50, 0x3f, 0xd9, 0x23, 0xda, 0x50, - 0xb0, 0xbb, 0x71, 0x64, 0xbc, 0x99, 0x81, 0xcd, 0xdd, 0x5f, 0x96, 0x91, 0xd5, 0x42, 0x01, 0xaa, - 0x0e, 0x67, 0xa7, 0x74, 0x10, 0x0a, 0x55, 0x30, 0xb4, 0x69, 0x16, 0xea, 0x5b, 0x9d, 0x3b, 0xad, - 0x8b, 0x2e, 0xb5, 0xa6, 0xd5, 0x6f, 0x7d, 0x98, 0x5d, 0xd8, 0xbb, 0x97, 0x54, 0xff, 0xa2, 0x9c, - 0xca, 0xf3, 0x61, 0xde, 0x06, 0x2c, 0x7b, 0xde, 0x02, 0x3e, 0x03, 0xc5, 0x00, 0xcb, 0xa1, 0x44, - 0x45, 0x53, 0xab, 0x6f, 0x75, 0x50, 0x9e, 0xd7, 0x57, 0x58, 0x0e, 0x7b, 0x6f, 0xc7, 0x91, 0xf1, - 0x56, 0x06, 0xff, 0x20, 0x8b, 0x77, 0xe9, 0x98, 0x34, 0x2e, 0x3c, 0x52, 0x24, 0x7c, 0x0e, 0x4a, - 0x64, 0x4c, 0x58, 0x20, 0x51, 0x49, 0xc1, 0x6f, 0xe7, 0xc1, 0x3f, 0x4a, 0x56, 0x2c, 0xd0, 0xf7, - 0x57, 0xd0, 0xa7, 0x50, 0xc8, 0xc0, 0xb6, 0x4b, 0x7c, 0xc2, 0x5c, 0xc2, 0x1c, 0x4a, 0x24, 0x2a, - 0x2b, 0x93, 0x9d, 0x3c, 0x93, 0x27, 0xb3, 0x75, 0x93, 0x05, 0xa7, 0x77, 0x57, 0x38, 0xcd, 0xf1, - 0xe1, 0x27, 0x00, 0x08, 0xe2, 0x73, 0x49, 0x03, 0x2e, 0x26, 0xa8, 0xa2, 0x1a, 0x7d, 0x99, 0x76, - 0x90, 0xa5, 0x71, 0x8f, 0x06, 0xc4, 0xf3, 0x83, 0x49, 0x23, 0x14, 0xd4, 0xb2, 0x33, 0x6a, 0xf8, - 0x14, 0x94, 0x24, 0x0f, 0x85, 0x43, 0x50, 0x55, 0x71, 0x76, 0xe3, 0xc8, 0x68, 0x66, 0xd3, 0xd7, - 0x5d, 0x1b, 0xbf, 0x29, 0x00, 0x8e, 0x41, 0x19, 0xbb, 0xae, 0x20, 0x52, 0xa2, 0xd7, 0xd4, 0x28, - 0x7e, 0x17, 0x47, 0xc6, 0xdd, 0x55, 0x73, 0x85, 0x1d, 0x67, 0xaa, 0xb0, 0xfe, 0x8a, 0x8c, 0x66, - 0x66, 0x62, 0x1d, 0x2e, 0x3d, 0x2e, 0xa7, 0x7f, 0x9a, 0xd2, 0x1d, 0xb6, 0xd3, 0x3a, 0x1e, 0x39, - 0xce, 0x51, 0xaa, 0xb0, 0x67, 0x66, 0xb5, 0x5f, 0x36, 0x40, 0x51, 0x35, 0x0f, 0xf6, 0x80, 0x36, - 0x24, 0x13, 0xa4, 0xe7, 0xce, 0xd1, 0xde, 0xda, 0x8d, 0x24, 0x62, 0xf8, 0x68, 0x6e, 0x18, 0x2f, - 0xcf, 0xcf, 0xee, 0xb2, 0xf9, 0xb9, 0xf1, 0x19, 0x7c, 0x0e, 0x74, 0x17, 0x07, 0x18, 0x69, 0x2a, - 0x4c, 0x6f, 0xe4, 0x85, 0xe9, 0x0b, 0x2c, 0xb0, 0x47, 0x02, 0x22, 0x16, 0xba, 0xdf, 0x5d, 0x91, - 0x25, 0x85, 0xad, 0xfd, 0xa4, 0x01, 0x3d, 0x19, 0xa7, 0x59, 0xcd, 0x36, 0x73, 0x6b, 0xf6, 0xf0, - 0xbf, 0x55, 0x33, 0x0c, 0x4a, 0x94, 0xf9, 0xe1, 0xf9, 0x9c, 0xbf, 0x62, 0xd5, 0x56, 0xce, 0x7a, - 0x0a, 0x86, 0x0e, 0x28, 0xf3, 0x30, 0x50, 0x1e, 0xe5, 0xeb, 0x78, 0xac, 0x9a, 0xf2, 0x19, 0xb9, - 0xf6, 0xa3, 0x0e, 0x2a, 0xe7, 0x88, 0xff, 0x55, 0x87, 0x86, 0x40, 0x4f, 0x2a, 0x85, 0x34, 0xc5, - 0xf8, 0x26, 0x8e, 0x8c, 0x93, 0x65, 0xb1, 0xcd, 0x7b, 0x7a, 0x72, 0x46, 0xf8, 0xe9, 0xe3, 0x93, - 0x40, 0x50, 0x36, 0x30, 0x3f, 0x0b, 0xbd, 0x3e, 0x11, 0x66, 0x8f, 0xf3, 0x11, 0xc1, 0xcc, 0xfc, - 0xbc, 0xff, 0x3d, 0x71, 0x02, 0xf3, 0x88, 0x4d, 0x2c, 0x5b, 0x99, 0xc0, 0x26, 0xd8, 0xe4, 0xca, - 0x16, 0x8f, 0xd4, 0x99, 0xb0, 0xd9, 0x7b, 0x3d, 0x8e, 0x8c, 0xea, 0xdc, 0x99, 0x60, 0x9f, 0x2f, - 0x49, 0x96, 0x0b, 0xe2, 0x13, 0x1c, 0x10, 0x57, 0x1d, 0xaa, 0x8b, 0xcb, 0x0f, 0x2c, 0xfb, 0x7c, - 0x09, 0xa4, 0xa0, 0xc4, 0x95, 0x25, 0x02, 0x57, 0x09, 0x42, 0x27, 0x8e, 0x8c, 0x56, 0xb6, 0xe6, - 0xf7, 0xb3, 0x9b, 0x0d, 0x19, 0x7d, 0x11, 0x92, 0xc6, 0xe5, 0xd0, 0xa5, 0x06, 0xb5, 0x5f, 0x35, - 0x50, 0x9d, 0x7b, 0xce, 0xc2, 0x4f, 0x41, 0x79, 0xcc, 0x47, 0xa1, 0x47, 0x24, 0x2a, 0x98, 0x5a, - 0xbd, 0xd2, 0xeb, 0xc6, 0x91, 0xd1, 0x5e, 0xd6, 0xd2, 0x2c, 0x3d, 0xdb, 0x9a, 0x19, 0x03, 0x7e, - 0x0d, 0xb6, 0xa6, 0x1f, 0x8f, 0x05, 0xf7, 0xd0, 0x46, 0x2e, 0xb2, 0x73, 0x15, 0x64, 0x96, 0x03, - 0x8f, 0x41, 0xd1, 0xe7, 0x22, 0x90, 0xea, 0x10, 0x5b, 0xcc, 0x6e, 0x77, 0x29, 0x90, 0x8b, 0xc0, - 0xc3, 0xbe, 0x65, 0xa7, 0x72, 0xf8, 0x01, 0xd0, 0xb1, 0x18, 0x48, 0xa4, 0x2b, 0x4c, 0x23, 0x8e, - 0x8c, 0xfa, 0xca, 0x1f, 0x00, 0x73, 0x11, 0x4e, 0x94, 0xf0, 0x08, 0x94, 0x1d, 0xee, 0x79, 0x98, - 0xb9, 0xa8, 0x98, 0x1b, 0xdf, 0xbd, 0x65, 0xf1, 0x9d, 0xe9, 0xe0, 0x7b, 0x40, 0x23, 0x6c, 0xac, - 0x4e, 0x96, 0xc5, 0x7b, 0xd8, 0x5f, 0xb6, 0x15, 0xc2, 0xc6, 0x96, 0x9d, 0x08, 0x6b, 0xbf, 0xe9, - 0x00, 0x5c, 0x3c, 0xfe, 0x6f, 0x64, 0xaa, 0x8f, 0x41, 0x91, 0x7a, 0x78, 0x70, 0xfd, 0x5f, 0x8e, - 0xa9, 0x3c, 0x9b, 0xa6, 0x7f, 0xd1, 0xfa, 0x65, 0x69, 0xd2, 0x72, 0x91, 0xdd, 0xeb, 0xa7, 0x49, - 0xcf, 0x4d, 0xd3, 0xde, 0xab, 0xa6, 0xe9, 0x0a, 0x9d, 0xbc, 0x6e, 0x9a, 0x1e, 0x5c, 0x35, 0x4d, - 0x95, 0xdc, 0x7b, 0x38, 0x58, 0x9b, 0xa6, 0x5e, 0xf7, 0xe5, 0x1f, 0x3b, 0xb7, 0x7e, 0xfe, 0x73, - 0xa7, 0xf0, 0xec, 0xde, 0xfa, 0x17, 0x9d, 0xe9, 0xbb, 0x56, 0xbf, 0xa4, 0x5e, 0x9e, 0xba, 0xff, - 0x04, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x5a, 0xdf, 0xf3, 0x7d, 0x0d, 0x00, 0x00, + // 1000 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x97, 0xdd, 0x6e, 0xdb, 0x36, + 0x14, 0xc7, 0xeb, 0x48, 0xb6, 0x63, 0x26, 0x1e, 0x30, 0x5e, 0xb1, 0x06, 0x16, 0xa9, 0x1a, 0xb0, + 0xba, 0x9b, 0x3f, 0x1a, 0x3b, 0xcd, 0x9a, 0x14, 0xdd, 0x16, 0xaf, 0x0b, 0xd6, 0x01, 0xfb, 0x52, + 0x3a, 0x0c, 0x28, 0xd6, 0x0b, 0x5a, 0x62, 0x6c, 0xce, 0x11, 0xa9, 0x92, 0x92, 0x31, 0x3f, 0xc4, + 0x5e, 0x60, 0x4f, 0xb0, 0xeb, 0x3d, 0xc2, 0xae, 0x0a, 0xec, 0x1d, 0x04, 0x6c, 0x8f, 0xa0, 0xcb, + 0x5e, 0x0d, 0xa2, 0xec, 0x44, 0x8e, 0x65, 0x3b, 0xcd, 0x72, 0xb3, 0x5e, 0x45, 0x8a, 0xcf, 0xf9, + 0xfd, 0xc9, 0x73, 0xfe, 0x87, 0x92, 0x40, 0x55, 0x12, 0x31, 0xa6, 0x0e, 0x69, 0xf9, 0x82, 0x07, + 0x1c, 0x02, 0x8f, 0xc8, 0x41, 0x2b, 0x98, 0xf8, 0x44, 0xd6, 0xac, 0x01, 0x1f, 0xf0, 0xb6, 0xfa, + 0x7f, 0x3f, 0x3c, 0x6d, 0x27, 0x77, 0xea, 0x46, 0x5d, 0xa5, 0xf1, 0xd6, 0xeb, 0xdb, 0xa0, 0x7c, + 0x92, 0x12, 0xe0, 0x10, 0xe8, 0x43, 0x2c, 0x87, 0x08, 0x98, 0x85, 0xfa, 0x76, 0xef, 0x59, 0x1c, + 0x19, 0x77, 0x92, 0xfb, 0x43, 0xab, 0x69, 0x99, 0x63, 0x7c, 0x46, 0x5d, 0x1c, 0x90, 0x43, 0x4b, + 0x90, 0x97, 0x21, 0x15, 0xc4, 0x6d, 0x24, 0xbf, 0x59, 0xaf, 0x23, 0xe3, 0xa3, 0x01, 0x0d, 0x86, + 0x61, 0xbf, 0xe5, 0x70, 0xaf, 0x9d, 0xa8, 0x37, 0x4f, 0x79, 0xc8, 0x5c, 0x1c, 0x50, 0xce, 0xda, + 0x84, 0x0d, 0x28, 0x23, 0xed, 0x24, 0xb4, 0xf5, 0x25, 0x96, 0x43, 0x5b, 0x29, 0xc0, 0xef, 0x81, + 0x26, 0xa9, 0x8b, 0xb6, 0xcd, 0x42, 0xbd, 0xd2, 0xfb, 0x34, 0x8e, 0x8c, 0x47, 0xa9, 0x10, 0xc3, + 0x1e, 0x39, 0xdc, 0xed, 0xe4, 0xca, 0xf9, 0x82, 0xb2, 0x00, 0x4b, 0x87, 0xd2, 0x86, 0x87, 0x7f, + 0x79, 0xbc, 0xdf, 0x6d, 0xb8, 0xdc, 0xc3, 0x94, 0x59, 0x76, 0xc2, 0x82, 0x4f, 0x80, 0x9e, 0x64, + 0xa3, 0x82, 0x62, 0xde, 0x8f, 0x23, 0xa3, 0x91, 0x65, 0xae, 0x41, 0x5a, 0xb6, 0xca, 0x86, 0x4f, + 0xc1, 0x96, 0x4b, 0xa4, 0x23, 0xa8, 0x9f, 0x2c, 0x1f, 0x6d, 0x28, 0xd8, 0xdd, 0x38, 0x32, 0xde, + 0xcf, 0xc0, 0xe6, 0xd6, 0x97, 0x65, 0x64, 0x73, 0xa1, 0x00, 0x55, 0x87, 0xb3, 0x53, 0x3a, 0x08, + 0x85, 0xaa, 0x05, 0xda, 0x34, 0x0b, 0xf5, 0xad, 0xce, 0x9d, 0xd6, 0x45, 0x87, 0x5a, 0xd3, 0xca, + 0xb7, 0x3e, 0xcf, 0x06, 0xf6, 0xee, 0xbd, 0x8a, 0x8c, 0x5b, 0x17, 0xd5, 0x57, 0x9a, 0x0f, 0xf3, + 0x36, 0x60, 0xd9, 0xf3, 0x12, 0xf0, 0x39, 0x28, 0x06, 0x58, 0x8e, 0x24, 0x2a, 0x9a, 0x5a, 0x7d, + 0xab, 0x83, 0xf2, 0xb4, 0x9e, 0x61, 0x39, 0xea, 0x7d, 0x18, 0x47, 0xc6, 0x07, 0x19, 0xfc, 0x83, + 0x2c, 0xde, 0xa5, 0x63, 0xd2, 0xb8, 0xd0, 0x48, 0x91, 0xf0, 0x05, 0x28, 0x91, 0x31, 0x61, 0x81, + 0x44, 0x25, 0x05, 0xbf, 0x9d, 0x07, 0xff, 0x22, 0x89, 0x58, 0xa0, 0xef, 0xaf, 0xa0, 0x4f, 0xa1, + 0x90, 0x81, 0x6d, 0x97, 0xf8, 0x84, 0xb9, 0x84, 0x39, 0x94, 0x48, 0x54, 0x56, 0x22, 0x3b, 0x79, + 0x22, 0x4f, 0x66, 0x71, 0x93, 0x05, 0xa5, 0x8f, 0x57, 0x28, 0xcd, 0xf1, 0xe1, 0x57, 0x00, 0x08, + 0xe2, 0x73, 0x49, 0x03, 0x2e, 0x26, 0xa8, 0xa2, 0x1a, 0x7d, 0x99, 0x76, 0x90, 0xa5, 0x71, 0x8f, + 0x06, 0xc4, 0xf3, 0x83, 0x49, 0x23, 0x14, 0xd4, 0xb2, 0x33, 0xd9, 0xf0, 0x29, 0x28, 0x49, 0x1e, + 0x0a, 0x87, 0xa0, 0xaa, 0xe2, 0xec, 0xc6, 0x91, 0xd1, 0xcc, 0xba, 0xaf, 0xbb, 0xd6, 0x7e, 0x53, + 0x00, 0x1c, 0x83, 0x32, 0x76, 0x5d, 0x41, 0xa4, 0x44, 0xef, 0xa8, 0x31, 0xfc, 0x29, 0x8e, 0x8c, + 0xbb, 0xab, 0xc6, 0x10, 0x3b, 0xce, 0x34, 0x23, 0x19, 0xc6, 0x66, 0x66, 0x18, 0x1d, 0x2e, 0x3d, + 0x2e, 0xa7, 0x7f, 0x9a, 0xd2, 0x1d, 0xb5, 0xd3, 0x3a, 0x1e, 0x39, 0xce, 0x51, 0x9a, 0x61, 0xcf, + 0xc4, 0x6a, 0x7f, 0x6c, 0x80, 0xa2, 0x6a, 0x1e, 0xec, 0x01, 0x6d, 0x44, 0x26, 0x48, 0xcf, 0x9d, + 0xa3, 0xbd, 0xb5, 0x1b, 0x49, 0x92, 0xe1, 0xa3, 0xb9, 0x61, 0xbc, 0x3c, 0x3f, 0xbb, 0xcb, 0xe6, + 0xe7, 0xc6, 0x67, 0xf0, 0x05, 0xd0, 0x5d, 0x1c, 0x60, 0xa4, 0x29, 0x33, 0xbd, 0x97, 0x67, 0xa6, + 0xef, 0xb0, 0xc0, 0x1e, 0x09, 0x88, 0x58, 0xe8, 0x7e, 0x77, 0x85, 0x97, 0x14, 0xb6, 0xf6, 0x9b, + 0x06, 0xf4, 0x64, 0x9c, 0x66, 0x35, 0xdb, 0xcc, 0xad, 0xd9, 0xc3, 0xff, 0x57, 0xcd, 0x30, 0x28, + 0x51, 0xe6, 0x87, 0xe7, 0x73, 0xfe, 0x86, 0x55, 0x5b, 0x39, 0xeb, 0x29, 0x18, 0x3a, 0xa0, 0xcc, + 0xc3, 0x40, 0x69, 0x94, 0xaf, 0xa3, 0xb1, 0x6a, 0xca, 0x67, 0xe4, 0xda, 0xaf, 0x3a, 0xa8, 0x9c, + 0x23, 0xde, 0xaa, 0x0e, 0x8d, 0x80, 0x9e, 0x54, 0x0a, 0x69, 0x8a, 0xf1, 0x63, 0x1c, 0x19, 0x27, + 0xcb, 0x6c, 0x9b, 0xf7, 0xf4, 0xe4, 0x8c, 0xf0, 0xd3, 0xc7, 0x27, 0x81, 0xa0, 0x6c, 0x60, 0x7e, + 0x13, 0x7a, 0x7d, 0x22, 0xcc, 0x1e, 0xe7, 0x67, 0x04, 0x33, 0xf3, 0xdb, 0xfe, 0xcf, 0xc4, 0x09, + 0xcc, 0x23, 0x36, 0xb1, 0x6c, 0x25, 0x02, 0x9b, 0x60, 0x93, 0x2b, 0x59, 0x7c, 0xa6, 0xce, 0x84, + 0xcd, 0xde, 0xbb, 0x71, 0x64, 0x54, 0xe7, 0xce, 0x04, 0xfb, 0x3c, 0x24, 0x09, 0x17, 0xc4, 0x27, + 0x38, 0x20, 0xae, 0x3a, 0x54, 0x17, 0xc3, 0x0f, 0x2c, 0xfb, 0x3c, 0x04, 0x52, 0x50, 0xe2, 0x4a, + 0x12, 0x81, 0xab, 0x18, 0xa1, 0x13, 0x47, 0x46, 0x2b, 0x5b, 0xf3, 0xfb, 0xd9, 0xcd, 0x86, 0x8c, + 0xbe, 0x0c, 0x49, 0xe3, 0xb2, 0xe9, 0x52, 0x81, 0xda, 0x9f, 0x1a, 0xa8, 0xce, 0x3d, 0x67, 0xe1, + 0xd7, 0xa0, 0x3c, 0xe6, 0x67, 0xa1, 0x47, 0x24, 0x2a, 0x98, 0x5a, 0xbd, 0xd2, 0xeb, 0xc6, 0x91, + 0xd1, 0x5e, 0xd6, 0xd2, 0x2c, 0x3d, 0xdb, 0x9a, 0x19, 0x03, 0xfe, 0x00, 0xb6, 0xa6, 0x97, 0xc7, + 0x82, 0x7b, 0x68, 0x23, 0x17, 0xd9, 0xb9, 0x0a, 0x32, 0xcb, 0x81, 0xc7, 0xa0, 0xe8, 0x73, 0x11, + 0x48, 0x75, 0x88, 0x2d, 0x7a, 0xb7, 0xbb, 0x14, 0xc8, 0x45, 0xe0, 0x61, 0xdf, 0xb2, 0xd3, 0x74, + 0xf8, 0x19, 0xd0, 0xb1, 0x18, 0x48, 0xa4, 0x2b, 0x4c, 0x23, 0x8e, 0x8c, 0xfa, 0xca, 0x17, 0x80, + 0x39, 0x0b, 0x27, 0x99, 0xf0, 0x08, 0x94, 0x1d, 0xee, 0x79, 0x98, 0xb9, 0xa8, 0x98, 0x6b, 0xdf, + 0xbd, 0x65, 0xf6, 0x9d, 0xe5, 0xc1, 0x4f, 0x80, 0x46, 0xd8, 0x58, 0x9d, 0x2c, 0x8b, 0x6b, 0xd8, + 0x5f, 0xb6, 0x15, 0xc2, 0xc6, 0x96, 0x9d, 0x24, 0xd6, 0xfe, 0xd2, 0x01, 0xb8, 0x78, 0xfc, 0xdf, + 0xc8, 0x54, 0x1f, 0x83, 0x22, 0xf5, 0xf0, 0xe0, 0xfa, 0x6f, 0x8e, 0x69, 0x7a, 0xd6, 0x4d, 0xff, + 0xa1, 0xf5, 0xcb, 0xdc, 0xa4, 0xe5, 0x22, 0xbb, 0xd7, 0x77, 0x93, 0x9e, 0xeb, 0xa6, 0xbd, 0x37, + 0x75, 0xd3, 0x15, 0x3a, 0x79, 0x5d, 0x37, 0x3d, 0xb8, 0xaa, 0x9b, 0x2a, 0xb9, 0x6b, 0x38, 0x58, + 0xeb, 0xa6, 0x5e, 0xf7, 0xd5, 0xdf, 0x3b, 0xb7, 0x7e, 0xff, 0x67, 0xa7, 0xf0, 0xfc, 0xde, 0xfa, + 0x6f, 0x98, 0xe9, 0x77, 0x56, 0xbf, 0xa4, 0x3e, 0x9c, 0xba, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, + 0x91, 0xe6, 0x6a, 0x10, 0x79, 0x0d, 0x00, 0x00, } func (this *Service) Equal(that interface{}) bool { @@ -389,7 +389,7 @@ func (this *Service) Equal(that interface{}) bool { } else if this == nil { return false } - if !this.Hash.Equal(that1.Hash) { + if !bytes.Equal(this.Hash, that1.Hash) { return false } if this.Sid != that1.Sid { diff --git a/x/execution/internal/types/msg.pb.go b/x/execution/internal/types/msg.pb.go index 7db0edc9c..af0001142 100644 --- a/x/execution/internal/types/msg.pb.go +++ b/x/execution/internal/types/msg.pb.go @@ -33,11 +33,11 @@ type MsgCreate struct { Inputs *types.Struct `protobuf:"bytes,3,opt,name=inputs,proto3" json:"inputs,omitempty"` // tags the execution. Tags []string `protobuf:"bytes,4,rep,name=tags,proto3" json:"tags,omitempty" validate:"dive,printascii"` - ParentHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=parentHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"parentHash" validate:"required_without=EventHash,omitempty,hash"` - EventHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,6,opt,name=eventHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"eventHash" validate:"required_without=ParentHash,omitempty,hash"` - ProcessHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,7,opt,name=processHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"processHash" validate:"omitempty,hash"` + ParentHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,5,opt,name=parentHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"parentHash,omitempty" validate:"required_without=EventHash,omitempty,hash"` + EventHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,6,opt,name=eventHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"eventHash,omitempty" validate:"required_without=ParentHash,omitempty,hash"` + ProcessHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,7,opt,name=processHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"processHash,omitempty" validate:"omitempty,hash"` NodeKey string `protobuf:"bytes,8,opt,name=nodeKey,proto3" json:"nodeKey,omitempty"` - ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,9,opt,name=executorHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash" validate:"required,hash"` + ExecutorHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,9,opt,name=executorHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"executorHash,omitempty" validate:"required,hash"` // price of running the execution. Price string `protobuf:"bytes,10,opt,name=price,proto3" json:"price,omitempty" validate:"coinsPositiveZero"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -97,6 +97,27 @@ func (m *MsgCreate) GetTags() []string { return nil } +func (m *MsgCreate) GetParentHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ParentHash + } + return nil +} + +func (m *MsgCreate) GetEventHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.EventHash + } + return nil +} + +func (m *MsgCreate) GetProcessHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ProcessHash + } + return nil +} + func (m *MsgCreate) GetNodeKey() string { if m != nil { return m.NodeKey @@ -104,6 +125,13 @@ func (m *MsgCreate) GetNodeKey() string { return "" } +func (m *MsgCreate) GetExecutorHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ExecutorHash + } + return nil +} + func (m *MsgCreate) GetPrice() string { if m != nil { return m.Price @@ -116,7 +144,7 @@ type MsgUpdate struct { // The execution's executor. Executor github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=executor,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"executor,omitempty" validate:"required,accaddress"` // Hash represents execution. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` // result pass to execution // // Types that are valid to be assigned to Result: @@ -180,6 +208,13 @@ func (m *MsgUpdate) GetExecutor() github_com_cosmos_cosmos_sdk_types.AccAddress return nil } +func (m *MsgUpdate) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + func (m *MsgUpdate) GetOutputs() *types.Struct { if x, ok := m.GetResult().(*MsgUpdate_Outputs); ok { return x.Outputs @@ -212,42 +247,42 @@ func init() { } var fileDescriptor_6c59efd9270dae25 = []byte{ - // 584 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xeb, 0x36, 0x75, 0x9a, 0x6d, 0x4f, 0x2b, 0x40, 0x26, 0xa0, 0x3a, 0xb2, 0x38, 0x44, - 0x22, 0xb1, 0x45, 0xf9, 0x73, 0x40, 0x05, 0xa9, 0x41, 0x48, 0x91, 0x10, 0x22, 0x72, 0xc5, 0xa5, - 0x17, 0xb4, 0x59, 0x4f, 0x9d, 0x55, 0xe2, 0x5d, 0xb3, 0xbb, 0x0e, 0xcd, 0x2b, 0xc0, 0xfb, 0xf0, - 0x0c, 0x3c, 0x03, 0x07, 0xbf, 0x02, 0x52, 0x8e, 0x9c, 0x90, 0xd7, 0x71, 0x92, 0x52, 0x4a, 0xa5, - 0x48, 0x3d, 0xd9, 0xa3, 0xfd, 0x66, 0x7f, 0xdf, 0x8c, 0x67, 0x8c, 0x1e, 0x5d, 0x04, 0x70, 0x01, - 0x34, 0xd3, 0x4c, 0xf0, 0x80, 0x71, 0x0d, 0x92, 0x93, 0x49, 0xa0, 0x67, 0x29, 0xa8, 0x20, 0x51, - 0xb1, 0x9f, 0x4a, 0xa1, 0x05, 0xbe, 0x93, 0x80, 0x8a, 0xfd, 0xa5, 0xd0, 0x37, 0xe7, 0x4d, 0x2f, - 0x16, 0xb1, 0x08, 0x8c, 0x62, 0x98, 0x9d, 0x07, 0x45, 0x64, 0x02, 0xf3, 0x56, 0x66, 0x36, 0x1f, - 0x2c, 0x8f, 0xcb, 0x3b, 0x95, 0x96, 0x19, 0xd5, 0xe5, 0xa1, 0xf7, 0xcb, 0x46, 0x8d, 0xf7, 0x2a, - 0x7e, 0x23, 0x81, 0x68, 0xc0, 0x63, 0x64, 0x2b, 0x16, 0x73, 0x90, 0x8e, 0xd5, 0xb2, 0xda, 0x07, - 0xbd, 0xd3, 0x79, 0xee, 0x1e, 0x4e, 0xc9, 0x84, 0x45, 0x44, 0xc3, 0x4b, 0x4f, 0xc2, 0xe7, 0x8c, - 0x49, 0x88, 0x3a, 0x84, 0x52, 0x12, 0x45, 0x12, 0x94, 0xf2, 0x7e, 0xe7, 0x6e, 0x37, 0x66, 0x7a, - 0x94, 0x0d, 0x7d, 0x2a, 0x92, 0x80, 0x0a, 0x95, 0x08, 0xb5, 0x78, 0x74, 0x55, 0x34, 0x2e, 0xa1, - 0xfe, 0x09, 0xa5, 0x27, 0x65, 0x46, 0xb8, 0x40, 0xe0, 0x63, 0x54, 0xd7, 0x44, 0x8d, 0xdf, 0xc1, - 0xcc, 0xd9, 0x6e, 0x59, 0xed, 0x46, 0xcf, 0xbb, 0x86, 0x96, 0x4a, 0xc6, 0x35, 0x51, 0x94, 0x31, - 0x2f, 0xac, 0x52, 0x70, 0x17, 0xd9, 0x8c, 0xa7, 0x99, 0x56, 0xce, 0x4e, 0xcb, 0x6a, 0xef, 0x1f, - 0xdd, 0xf5, 0x4d, 0x83, 0xaa, 0x5a, 0xfd, 0x53, 0x53, 0x65, 0xb8, 0x10, 0xe1, 0x23, 0x54, 0xd3, - 0x24, 0x56, 0x4e, 0xad, 0xb5, 0xd3, 0x6e, 0xf4, 0x0e, 0xe7, 0xb9, 0xdb, 0x5c, 0x91, 0x22, 0x36, - 0x85, 0x4b, 0x14, 0xa3, 0xc5, 0xdf, 0x2c, 0x84, 0x52, 0x22, 0x81, 0xeb, 0x3e, 0x51, 0x23, 0x67, - 0xd7, 0xb4, 0x64, 0xfc, 0x23, 0x77, 0xb7, 0x7e, 0xe6, 0xee, 0xe3, 0xb5, 0xa2, 0x0b, 0x72, 0xf7, - 0x5c, 0x64, 0x3c, 0x22, 0xe6, 0x23, 0x02, 0x8f, 0x19, 0x87, 0x60, 0x44, 0xd4, 0xc8, 0x2f, 0x52, - 0xe7, 0xb9, 0xfb, 0xec, 0x6a, 0x5d, 0x9f, 0xbe, 0x30, 0x3d, 0x12, 0x99, 0x7e, 0xf5, 0x76, 0xba, - 0x40, 0x74, 0x44, 0xc2, 0x34, 0x24, 0xa9, 0x9e, 0x75, 0x8a, 0x5c, 0x2f, 0x5c, 0xc3, 0xe3, 0xaf, - 0x16, 0x6a, 0x40, 0xa5, 0x74, 0x6c, 0x63, 0x66, 0xb2, 0x99, 0x99, 0xe7, 0xff, 0x31, 0x33, 0x58, - 0x12, 0xaf, 0xb8, 0x59, 0xe1, 0xb1, 0x44, 0xfb, 0xa9, 0x14, 0x14, 0x94, 0x32, 0x6e, 0xea, 0xc6, - 0xcd, 0x60, 0x33, 0x37, 0xf7, 0x57, 0x6e, 0xfe, 0x26, 0xae, 0x43, 0xb0, 0x83, 0xea, 0x5c, 0x44, - 0x50, 0xcc, 0xcb, 0x5e, 0x31, 0x2f, 0x61, 0x15, 0x62, 0x85, 0x0e, 0xca, 0xc5, 0x10, 0xd2, 0xd8, - 0x69, 0x18, 0x3b, 0x1f, 0x36, 0xb3, 0xe3, 0xfc, 0x63, 0x02, 0x4b, 0x37, 0x97, 0x20, 0xf8, 0x05, - 0xda, 0x4d, 0x25, 0xa3, 0xe0, 0x20, 0x33, 0xbc, 0xad, 0x79, 0xee, 0x3e, 0x5c, 0xa5, 0x52, 0xc1, - 0xb8, 0x1a, 0x08, 0xc5, 0x34, 0x9b, 0xc2, 0x19, 0x48, 0xe1, 0x85, 0xa5, 0xdc, 0xfb, 0xbe, 0x6d, - 0x36, 0xee, 0x63, 0x5a, 0x08, 0xb1, 0x40, 0x7b, 0xd5, 0xad, 0xb7, 0xb9, 0x73, 0x4b, 0x08, 0xa6, - 0xa8, 0x56, 0x54, 0x63, 0x56, 0xee, 0x16, 0x7a, 0x64, 0x2e, 0xc7, 0x4f, 0x50, 0x5d, 0x64, 0xfa, - 0xc6, 0xed, 0xec, 0x6f, 0x85, 0x95, 0x0e, 0xdf, 0x43, 0xbb, 0x20, 0xa5, 0x90, 0x4e, 0xad, 0x68, - 0x67, 0x7f, 0x2b, 0x2c, 0xc3, 0xde, 0x1e, 0xb2, 0x25, 0xa8, 0x6c, 0xa2, 0x7b, 0xaf, 0xcf, 0x8e, - 0x6f, 0x76, 0x79, 0xfd, 0xbf, 0x74, 0x68, 0x1b, 0xfa, 0xd3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x40, 0xba, 0xf2, 0xbd, 0x70, 0x05, 0x00, 0x00, + // 578 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xc7, 0xeb, 0x36, 0x75, 0x9a, 0x6d, 0x4f, 0xab, 0xdf, 0x0f, 0x99, 0x82, 0xea, 0xc8, 0xe2, + 0x10, 0x89, 0xc4, 0x16, 0xe5, 0xcf, 0x01, 0x15, 0xa4, 0x06, 0x21, 0x45, 0x2a, 0x48, 0x95, 0x2b, + 0x2e, 0xbd, 0x54, 0x9b, 0xf5, 0xd4, 0x5e, 0x25, 0xde, 0x35, 0xbb, 0xeb, 0xd0, 0xbc, 0x00, 0xbc, + 0x0f, 0x0f, 0x64, 0xde, 0xc1, 0x47, 0x4e, 0xc8, 0xeb, 0x38, 0x49, 0x05, 0xa5, 0x12, 0x85, 0x93, + 0x3d, 0xda, 0xef, 0xcc, 0xe7, 0xbb, 0xe3, 0x19, 0xa3, 0x47, 0x57, 0x01, 0x5c, 0x01, 0xcd, 0x35, + 0x13, 0x3c, 0x60, 0x5c, 0x83, 0xe4, 0x64, 0x1a, 0xe8, 0x79, 0x06, 0x2a, 0x48, 0x55, 0xec, 0x67, + 0x52, 0x68, 0x81, 0xff, 0x4b, 0x41, 0xc5, 0xfe, 0x52, 0xe8, 0x9b, 0xf3, 0x7d, 0x2f, 0x16, 0xb1, + 0x08, 0x8c, 0x62, 0x9c, 0x5f, 0x06, 0x55, 0x64, 0x02, 0xf3, 0x56, 0x67, 0xee, 0x3f, 0x58, 0x1e, + 0xd7, 0x35, 0x95, 0x96, 0x39, 0xd5, 0xf5, 0xa1, 0xf7, 0xcd, 0x46, 0x9d, 0xf7, 0x2a, 0x7e, 0x23, + 0x81, 0x68, 0xc0, 0x13, 0x64, 0x2b, 0x16, 0x73, 0x90, 0x8e, 0xd5, 0xb5, 0x7a, 0x7b, 0xc3, 0xb3, + 0xb2, 0x70, 0x0f, 0x66, 0x64, 0xca, 0x22, 0xa2, 0xe1, 0xa5, 0x27, 0xe1, 0x63, 0xce, 0x24, 0x44, + 0x7d, 0x42, 0x29, 0x89, 0x22, 0x09, 0x4a, 0x79, 0xdf, 0x0b, 0x77, 0x10, 0x33, 0x9d, 0xe4, 0x63, + 0x9f, 0x8a, 0x34, 0xa0, 0x42, 0xa5, 0x42, 0x2d, 0x1e, 0x03, 0x15, 0x4d, 0x6a, 0xa8, 0x7f, 0x4c, + 0xe9, 0x71, 0x9d, 0x11, 0x2e, 0x10, 0xf8, 0x08, 0xb5, 0x35, 0x51, 0x93, 0x13, 0x98, 0x3b, 0x9b, + 0x5d, 0xab, 0xd7, 0x19, 0x7a, 0x37, 0xd0, 0x32, 0xc9, 0xb8, 0x26, 0x8a, 0x32, 0xe6, 0x85, 0x4d, + 0x0a, 0x1e, 0x20, 0x9b, 0xf1, 0x2c, 0xd7, 0xca, 0xd9, 0xea, 0x5a, 0xbd, 0xdd, 0xc3, 0xff, 0x7d, + 0xd3, 0xa0, 0xe6, 0xae, 0xfe, 0x99, 0xb9, 0x65, 0xb8, 0x10, 0xe1, 0x43, 0xd4, 0xd2, 0x24, 0x56, + 0x4e, 0xab, 0xbb, 0xd5, 0xeb, 0x0c, 0x0f, 0xca, 0xc2, 0xdd, 0x5f, 0x91, 0x22, 0x36, 0x83, 0x6b, + 0x14, 0xa3, 0xc5, 0x5f, 0x2c, 0x84, 0x32, 0x22, 0x81, 0xeb, 0x11, 0x51, 0x89, 0xb3, 0x6d, 0x5a, + 0x12, 0x97, 0x85, 0xfb, 0xec, 0x67, 0x93, 0x17, 0x9f, 0x98, 0x4e, 0x44, 0xae, 0x5f, 0xbd, 0x9d, + 0x2d, 0xf4, 0x7d, 0x91, 0x32, 0x0d, 0x69, 0xa6, 0xe7, 0xfd, 0x84, 0xa8, 0xa4, 0x6a, 0xd4, 0xe3, + 0xb5, 0x46, 0x55, 0x6e, 0x07, 0x97, 0x22, 0xe7, 0x11, 0x31, 0x1f, 0x1e, 0x78, 0xcc, 0x38, 0x04, + 0x95, 0xd4, 0xaf, 0xd2, 0xc3, 0x35, 0x34, 0xfe, 0x6c, 0xa1, 0x0e, 0x34, 0x85, 0x1d, 0xdb, 0x18, + 0x49, 0xca, 0xc2, 0x7d, 0xfe, 0x1b, 0x23, 0xa7, 0xcb, 0xf4, 0xbb, 0x3a, 0x59, 0xa1, 0x31, 0x47, + 0xbb, 0x99, 0x14, 0x14, 0x94, 0x32, 0x4e, 0xda, 0xc6, 0xc9, 0xbb, 0xb2, 0x70, 0xef, 0xaf, 0x9c, + 0xdc, 0x91, 0xb6, 0x0e, 0xc0, 0x0e, 0x6a, 0x73, 0x11, 0x41, 0x35, 0x23, 0x3b, 0xd5, 0x8c, 0x84, + 0x4d, 0x88, 0x05, 0xda, 0xab, 0x97, 0x41, 0x48, 0x63, 0xa5, 0x63, 0xac, 0x9c, 0x94, 0x85, 0xeb, + 0xfc, 0x62, 0x84, 0xfe, 0xc8, 0xc9, 0x35, 0x00, 0x7e, 0x81, 0xb6, 0x33, 0xc9, 0x28, 0x38, 0xc8, + 0x0c, 0x6b, 0xb7, 0x2c, 0xdc, 0x87, 0x2b, 0x12, 0x15, 0x8c, 0xab, 0x53, 0xa1, 0x98, 0x66, 0x33, + 0x38, 0x07, 0x29, 0xbc, 0xb0, 0x96, 0x7b, 0x5f, 0x37, 0xcd, 0x86, 0x7d, 0xc8, 0x2a, 0x21, 0x16, + 0x68, 0xa7, 0xa9, 0xfa, 0x2f, 0x77, 0x6c, 0x09, 0xc1, 0x17, 0xa8, 0x55, 0xdd, 0xc8, 0xac, 0xd8, + 0x5f, 0xee, 0x8f, 0x29, 0x8c, 0x9f, 0xa0, 0xb6, 0xc8, 0xf5, 0xad, 0x9b, 0x38, 0xda, 0x08, 0x1b, + 0x1d, 0xbe, 0x87, 0xb6, 0x41, 0x4a, 0x21, 0x9d, 0x56, 0xd5, 0xca, 0xd1, 0x46, 0x58, 0x87, 0xc3, + 0x1d, 0x64, 0x4b, 0x50, 0xf9, 0x54, 0x0f, 0x5f, 0x9f, 0x1f, 0xdd, 0xee, 0xe4, 0xe6, 0xff, 0xe6, + 0xd8, 0x36, 0xf4, 0xa7, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x07, 0x1d, 0x85, 0xd5, 0x5c, 0x05, + 0x00, 0x00, } diff --git a/x/execution/internal/types/msg.proto b/x/execution/internal/types/msg.proto index 871abf1d3..8909513a2 100644 --- a/x/execution/internal/types/msg.proto +++ b/x/execution/internal/types/msg.proto @@ -28,28 +28,24 @@ message MsgCreate { bytes parentHash = 5 [ (gogoproto.moretags) = 'validate:"required_without=EventHash,omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; bytes eventHash = 6 [ (gogoproto.moretags) = 'validate:"required_without=ParentHash,omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; bytes processHash = 7 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; string nodeKey = 8; bytes executorHash = 9 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // price of running the execution. @@ -69,8 +65,7 @@ message MsgUpdate { // Hash represents execution. bytes hash = 2 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // result pass to execution diff --git a/x/ownership/internal/types/msg.pb.go b/x/ownership/internal/types/msg.pb.go index 69f54f54d..e2eb7dbdc 100644 --- a/x/ownership/internal/types/msg.pb.go +++ b/x/ownership/internal/types/msg.pb.go @@ -28,7 +28,7 @@ type MsgWithdraw struct { // The ownership's owner. Owner github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=owner,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"owner,omitempty" validate:"required,accaddress"` // Hash of the ressource to withdraw from. - ResourceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=resourceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"resourceHash" validate:"required,hash"` + ResourceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=resourceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"resourceHash,omitempty" validate:"required,hash"` // amount to withdraw Amount string `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount,omitempty" validate:"required,coinsPositiveZero"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -67,6 +67,13 @@ func (m *MsgWithdraw) GetOwner() github_com_cosmos_cosmos_sdk_types.AccAddress { return nil } +func (m *MsgWithdraw) GetResourceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ResourceHash + } + return nil +} + func (m *MsgWithdraw) GetAmount() string { if m != nil { return m.Amount @@ -83,25 +90,25 @@ func init() { } var fileDescriptor_875fd6c128efe9e4 = []byte{ - // 318 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xc1, 0x4a, 0x3b, 0x31, - 0x10, 0xc6, 0xff, 0xed, 0x1f, 0x0b, 0xae, 0x3d, 0x2d, 0x1e, 0x16, 0x0f, 0x6e, 0x59, 0x14, 0x2a, - 0xda, 0xcd, 0xc1, 0x9b, 0x88, 0xd0, 0x9e, 0xbc, 0x88, 0x52, 0x0f, 0x42, 0x6f, 0x69, 0x32, 0xcd, - 0x06, 0xbb, 0x99, 0x9a, 0xc9, 0xb6, 0xfa, 0x56, 0x3e, 0x86, 0xcf, 0xe0, 0x21, 0x0f, 0xd1, 0xa3, - 0x27, 0xd9, 0x6c, 0x11, 0x85, 0x8a, 0xa7, 0x64, 0x98, 0xf9, 0x7d, 0xdf, 0x97, 0x4c, 0x74, 0xf4, - 0xcc, 0x70, 0x65, 0xc0, 0x52, 0xa1, 0x17, 0x4c, 0x1b, 0x07, 0xd6, 0xf0, 0x39, 0x73, 0x2f, 0x0b, - 0x20, 0x56, 0x92, 0xca, 0x17, 0x16, 0x1d, 0xc6, 0xfb, 0x25, 0x90, 0xca, 0xbf, 0x06, 0xf3, 0xd0, - 0x3f, 0xc8, 0x14, 0x2a, 0x64, 0x61, 0x62, 0x5a, 0xcd, 0x58, 0x5d, 0x85, 0x22, 0xdc, 0x1a, 0x32, - 0x7b, 0x6d, 0x47, 0x7b, 0x37, 0xa4, 0x1e, 0xb4, 0x2b, 0xa4, 0xe5, 0xab, 0x58, 0x47, 0x3b, 0x41, - 0x26, 0x69, 0xf5, 0x5a, 0xfd, 0xee, 0xe8, 0x7e, 0xed, 0xd3, 0xc3, 0x25, 0x9f, 0x6b, 0xc9, 0x1d, - 0x5c, 0x64, 0x16, 0x9e, 0x2a, 0x6d, 0x41, 0x9e, 0x71, 0x21, 0xb8, 0x94, 0x16, 0x88, 0xb2, 0x0f, - 0x9f, 0x0e, 0x94, 0x76, 0x45, 0x35, 0xcd, 0x05, 0x96, 0x4c, 0x20, 0x95, 0x48, 0x9b, 0x63, 0x40, - 0xf2, 0xb1, 0x09, 0x9b, 0x0f, 0x85, 0x18, 0x36, 0xc4, 0xb8, 0x71, 0x88, 0x29, 0xea, 0x5a, 0x20, - 0xac, 0xac, 0x80, 0x6b, 0x4e, 0x45, 0xd2, 0x0e, 0x8e, 0xb7, 0x6f, 0x3e, 0xfd, 0xf7, 0xee, 0xd3, - 0xd3, 0x6f, 0x9a, 0xf5, 0xeb, 0x06, 0x33, 0xac, 0x8c, 0xe4, 0x4e, 0xa3, 0x61, 0x60, 0x94, 0x36, - 0xc0, 0x0a, 0x4e, 0x45, 0x5e, 0xa3, 0x6b, 0x9f, 0x26, 0x5b, 0x42, 0xd6, 0xfd, 0x6c, 0xfc, 0xc3, - 0x24, 0x1e, 0x46, 0x1d, 0x5e, 0x62, 0x65, 0x5c, 0xf2, 0xbf, 0xd7, 0xea, 0xef, 0x8e, 0x4e, 0xd6, - 0x3e, 0x3d, 0xde, 0xc2, 0x0a, 0xd4, 0x86, 0xee, 0x90, 0xb4, 0xd3, 0x4b, 0x98, 0x80, 0xc5, 0x6c, - 0xbc, 0x01, 0x47, 0x57, 0x93, 0xcb, 0xbf, 0xb3, 0xfd, 0xbe, 0xb6, 0x69, 0x27, 0xfc, 0xfc, 0xf9, - 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x85, 0x35, 0x80, 0xdb, 0x01, 0x00, 0x00, + // 307 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xc1, 0x4b, 0xc3, 0x30, + 0x14, 0xc6, 0xd9, 0xc4, 0x81, 0x75, 0xa7, 0xe2, 0xa1, 0x78, 0xb0, 0xa3, 0x28, 0x4c, 0x74, 0xcd, + 0xc1, 0x9b, 0x88, 0xb0, 0x9d, 0x04, 0x11, 0x64, 0x1e, 0x84, 0xdd, 0xb2, 0xe4, 0x2d, 0x0d, 0xae, + 0x79, 0x33, 0x2f, 0xd9, 0xf4, 0x7f, 0xf2, 0x6f, 0xea, 0x1f, 0xd1, 0xa3, 0x27, 0x69, 0x3a, 0x44, + 0x61, 0xe2, 0x29, 0xf9, 0xc8, 0xf7, 0x7d, 0xbf, 0x24, 0x2f, 0x3a, 0x7d, 0x63, 0xb8, 0x31, 0x60, + 0xa9, 0xd0, 0x2b, 0xa6, 0x8d, 0x03, 0x6b, 0xf8, 0x92, 0xb9, 0xf7, 0x15, 0x10, 0x2b, 0x49, 0xe5, + 0x2b, 0x8b, 0x0e, 0xe3, 0xa3, 0x12, 0x48, 0xe5, 0xdf, 0xc6, 0x3c, 0x9c, 0x1f, 0x67, 0x0a, 0x15, + 0xb2, 0xe0, 0x98, 0xfb, 0x05, 0x6b, 0x54, 0x10, 0x61, 0xd7, 0x26, 0xb3, 0x8f, 0x6e, 0x74, 0xf8, + 0x40, 0xea, 0x59, 0xbb, 0x42, 0x5a, 0xbe, 0x89, 0x75, 0xb4, 0x1f, 0x6a, 0x92, 0xce, 0xa0, 0x33, + 0xec, 0x4f, 0x9e, 0xea, 0x2a, 0x3d, 0x59, 0xf3, 0xa5, 0x96, 0xdc, 0xc1, 0x75, 0x66, 0xe1, 0xd5, + 0x6b, 0x0b, 0xf2, 0x92, 0x0b, 0xc1, 0xa5, 0xb4, 0x40, 0x94, 0x7d, 0x56, 0xe9, 0x48, 0x69, 0x57, + 0xf8, 0x79, 0x2e, 0xb0, 0x64, 0x02, 0xa9, 0x44, 0xda, 0x2e, 0x23, 0x92, 0x2f, 0xed, 0x65, 0xf3, + 0xb1, 0x10, 0xe3, 0x36, 0x31, 0x6d, 0x09, 0x31, 0x46, 0x7d, 0x0b, 0x84, 0xde, 0x0a, 0xb8, 0xe3, + 0x54, 0x24, 0xdd, 0x40, 0xbc, 0xaf, 0xab, 0x34, 0xd9, 0x41, 0x2c, 0x38, 0x15, 0x0d, 0xeb, 0xe2, + 0x07, 0xab, 0x79, 0xf5, 0x68, 0x81, 0xde, 0x48, 0xee, 0x34, 0x1a, 0x06, 0x46, 0x69, 0x03, 0xac, + 0xb1, 0xe6, 0x4d, 0xe5, 0xf4, 0x17, 0x20, 0x1e, 0x47, 0x3d, 0x5e, 0xa2, 0x37, 0x2e, 0xd9, 0x1b, + 0x74, 0x86, 0x07, 0x93, 0xf3, 0xba, 0x4a, 0xcf, 0x76, 0xa0, 0x04, 0x6a, 0x43, 0x8f, 0x48, 0xda, + 0xe9, 0x35, 0xcc, 0xc0, 0x62, 0x36, 0xdd, 0x06, 0x27, 0xb7, 0xb3, 0x9b, 0xff, 0xf9, 0x7f, 0x8f, + 0x6c, 0xde, 0x0b, 0xbf, 0x7e, 0xf5, 0x15, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x13, 0xa3, 0xab, 0xd7, + 0x01, 0x00, 0x00, } diff --git a/x/ownership/internal/types/msg.proto b/x/ownership/internal/types/msg.proto index 5dbab5176..836adc115 100644 --- a/x/ownership/internal/types/msg.proto +++ b/x/ownership/internal/types/msg.proto @@ -16,8 +16,7 @@ message MsgWithdraw { // Hash of the ressource to withdraw from. bytes resourceHash = 2 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // amount to withdraw diff --git a/x/process/internal/types/msg.pb.go b/x/process/internal/types/msg.pb.go index b03f46757..0a636e802 100644 --- a/x/process/internal/types/msg.pb.go +++ b/x/process/internal/types/msg.pb.go @@ -94,7 +94,7 @@ func (m *MsgCreate) GetOwner() github_com_cosmos_cosmos_sdk_types.AccAddress { // The message to delete a Process. type MsgDelete struct { // The process's hash to delete. - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,1,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` // The process's owner. Owner github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=owner,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"owner,omitempty" validate:"required,accaddress"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -126,6 +126,13 @@ func (m *MsgDelete) XXX_DiscardUnknown() { var xxx_messageInfo_MsgDelete proto.InternalMessageInfo +func (m *MsgDelete) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + func (m *MsgDelete) GetOwner() github_com_cosmos_cosmos_sdk_types.AccAddress { if m != nil { return m.Owner @@ -141,29 +148,29 @@ func init() { func init() { proto.RegisterFile("x/process/internal/types/msg.proto", fileDescriptor_808972a653e2953a) } var fileDescriptor_808972a653e2953a = []byte{ - // 382 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x92, 0xcd, 0x6a, 0xe3, 0x30, - 0x14, 0x85, 0xc7, 0xf9, 0x19, 0x88, 0x27, 0x30, 0xe0, 0xd9, 0x98, 0x30, 0x8c, 0x83, 0x56, 0x81, - 0x99, 0x58, 0x30, 0x03, 0xb3, 0x08, 0xb3, 0x89, 0x33, 0x85, 0x6e, 0xfa, 0x83, 0xbb, 0xeb, 0x4e, - 0x91, 0x6e, 0x64, 0xd1, 0x58, 0x72, 0x25, 0x39, 0x6d, 0xdf, 0xac, 0x8f, 0xd0, 0x67, 0x68, 0xc1, - 0x0f, 0x91, 0x65, 0x57, 0xc5, 0x72, 0xda, 0x74, 0x51, 0xd3, 0x55, 0x57, 0x96, 0x7c, 0x74, 0xbe, - 0x7b, 0xcf, 0xe5, 0xfa, 0xe8, 0x1a, 0x17, 0x5a, 0x51, 0x30, 0x06, 0x0b, 0x69, 0x41, 0x4b, 0xb2, - 0xc6, 0xf6, 0xa6, 0x00, 0x83, 0x73, 0xc3, 0xe3, 0x42, 0x2b, 0xab, 0x82, 0x20, 0x87, 0xe6, 0x5c, - 0x3f, 0x8b, 0x9d, 0x3a, 0x42, 0x5c, 0x71, 0x85, 0x9d, 0xbe, 0x2c, 0x57, 0xb8, 0xbe, 0xb9, 0x8b, - 0x3b, 0x35, 0xbe, 0xd1, 0xf7, 0x17, 0xb9, 0x21, 0x3e, 0x13, 0xdc, 0x6f, 0x74, 0xdb, 0xf1, 0x07, - 0x47, 0x86, 0x2f, 0x34, 0x10, 0x0b, 0xc1, 0x5f, 0xbf, 0x27, 0x49, 0x0e, 0xa1, 0x37, 0xf6, 0x26, - 0x83, 0x04, 0x6d, 0xab, 0xe8, 0xc7, 0x86, 0xac, 0x05, 0x23, 0x16, 0x66, 0x48, 0xc3, 0x65, 0x29, - 0x34, 0xb0, 0x5f, 0x85, 0x16, 0xd2, 0x12, 0x43, 0x85, 0x40, 0xa9, 0x7b, 0x1f, 0x2c, 0xfc, 0xbe, - 0x54, 0x0c, 0x4c, 0xd8, 0x19, 0x77, 0x27, 0x5f, 0x7e, 0x87, 0xb1, 0xeb, 0xd5, 0xd5, 0x8b, 0x4f, - 0x77, 0xf5, 0x8e, 0x15, 0x83, 0xe4, 0xdb, 0xb6, 0x8a, 0xbe, 0xee, 0x91, 0x4c, 0x6c, 0x00, 0xa5, - 0x8d, 0xb7, 0x86, 0x00, 0xe3, 0x60, 0xc2, 0x6e, 0x3b, 0xe4, 0x80, 0xf1, 0x36, 0x88, 0xf3, 0x06, - 0xc2, 0xef, 0xab, 0x2b, 0x09, 0x3a, 0xec, 0x8d, 0xbd, 0xc9, 0x30, 0x39, 0x6b, 0x89, 0x40, 0x28, - 0x25, 0x8c, 0x69, 0x30, 0x06, 0x3d, 0x56, 0xd1, 0x94, 0x0b, 0x9b, 0x95, 0xcb, 0x98, 0xaa, 0x1c, - 0x53, 0x65, 0x72, 0x65, 0x76, 0x9f, 0xa9, 0x61, 0x17, 0xcd, 0xd8, 0xe2, 0x39, 0xa5, 0xf3, 0xc6, - 0x91, 0x36, 0x15, 0xd0, 0x83, 0xe7, 0x46, 0xf7, 0x1f, 0xd6, 0x60, 0x21, 0xa0, 0x7e, 0x2f, 0x23, - 0x26, 0x73, 0xa3, 0x1b, 0x26, 0x27, 0x77, 0x55, 0xf4, 0xe9, 0xbe, 0x8a, 0x7e, 0xbe, 0x22, 0xd7, - 0x71, 0xa6, 0x2b, 0x55, 0x4a, 0x46, 0xac, 0x50, 0x12, 0x83, 0xe4, 0x42, 0x02, 0xae, 0x5d, 0xf1, - 0x21, 0x31, 0xd9, 0xb6, 0x8a, 0xc2, 0x37, 0x5a, 0xad, 0x75, 0x94, 0x3a, 0xf8, 0x3e, 0x5d, 0xe7, - 0xa3, 0xd3, 0x25, 0xff, 0xce, 0x67, 0xef, 0xf7, 0xde, 0xb6, 0xb6, 0xcb, 0xcf, 0x6e, 0xbb, 0xfe, - 0x3c, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xbc, 0x99, 0x76, 0xd9, 0x02, 0x00, 0x00, + // 374 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x52, 0x4f, 0x4b, 0xe3, 0x40, + 0x14, 0x27, 0xfd, 0xb3, 0xd0, 0x6c, 0x61, 0x21, 0x7b, 0x09, 0x65, 0xd9, 0x94, 0x39, 0x15, 0x76, + 0x9b, 0x81, 0x5d, 0xf0, 0x50, 0xbc, 0x34, 0x55, 0x10, 0x44, 0x91, 0x78, 0xf3, 0x22, 0xd3, 0x99, + 0xd7, 0xc9, 0x60, 0x33, 0x13, 0x67, 0x26, 0x55, 0xbf, 0x99, 0xdf, 0xc4, 0x5b, 0x3e, 0x44, 0x8f, + 0x9e, 0x24, 0x93, 0x6a, 0x3d, 0x18, 0x3c, 0x79, 0xca, 0xbc, 0xbc, 0xdf, 0x9f, 0xf7, 0x7b, 0x3c, + 0x1f, 0xdd, 0xe3, 0x42, 0x2b, 0x0a, 0xc6, 0x60, 0x21, 0x2d, 0x68, 0x49, 0xd6, 0xd8, 0x3e, 0x14, + 0x60, 0x70, 0x6e, 0x78, 0x5c, 0x68, 0x65, 0x55, 0x10, 0xe4, 0xd0, 0xbc, 0x6b, 0x58, 0xec, 0xba, + 0x23, 0xc4, 0x15, 0x57, 0xd8, 0xf5, 0x97, 0xe5, 0x0a, 0xd7, 0x95, 0x2b, 0xdc, 0xab, 0xe1, 0x8d, + 0x7e, 0xbd, 0xb5, 0x1b, 0xc5, 0x57, 0x05, 0xf7, 0x1b, 0x3d, 0x76, 0xfc, 0xc1, 0x99, 0xe1, 0x0b, + 0x0d, 0xc4, 0x42, 0x70, 0xe0, 0xf7, 0x24, 0xc9, 0x21, 0xf4, 0xc6, 0xde, 0x64, 0x90, 0xa0, 0x6d, + 0x15, 0xfd, 0xde, 0x90, 0xb5, 0x60, 0xc4, 0xc2, 0x0c, 0x69, 0xb8, 0x2d, 0x85, 0x06, 0xf6, 0xb7, + 0xd0, 0x42, 0x5a, 0x62, 0xa8, 0x10, 0x28, 0x75, 0xf8, 0x60, 0xe1, 0xf7, 0xa5, 0x62, 0x60, 0xc2, + 0xce, 0xb8, 0x3b, 0xf9, 0xfe, 0x2f, 0x8c, 0xdd, 0xac, 0xce, 0x2f, 0xbe, 0xd8, 0xf9, 0x9d, 0x2b, + 0x06, 0xc9, 0xcf, 0x6d, 0x15, 0xfd, 0xd8, 0x4b, 0x32, 0xb1, 0x01, 0x94, 0x36, 0xdc, 0x5a, 0x04, + 0x18, 0x07, 0x13, 0x76, 0xdb, 0x45, 0x8e, 0x19, 0x6f, 0x13, 0x71, 0xdc, 0x40, 0xf8, 0x7d, 0x75, + 0x27, 0x41, 0x87, 0xbd, 0xb1, 0x37, 0x19, 0x26, 0x97, 0x2d, 0x11, 0x08, 0xa5, 0x84, 0x31, 0x0d, + 0xc6, 0xa0, 0xe7, 0x2a, 0x9a, 0x72, 0x61, 0xb3, 0x72, 0x19, 0x53, 0x95, 0x63, 0xaa, 0x4c, 0xae, + 0xcc, 0xee, 0x33, 0x35, 0xec, 0xa6, 0x59, 0x5b, 0x3c, 0xa7, 0x74, 0xde, 0x30, 0xd2, 0xc6, 0x01, + 0x3d, 0x79, 0x6e, 0x75, 0x47, 0xb0, 0x06, 0x0b, 0xc1, 0xb5, 0xdf, 0xcb, 0x88, 0xc9, 0xdc, 0xea, + 0x86, 0xc9, 0xe9, 0xb6, 0x8a, 0xc2, 0x0f, 0x7c, 0x6b, 0x48, 0xed, 0xf8, 0xe7, 0x9d, 0x63, 0x1d, + 0x73, 0xba, 0x52, 0xa5, 0x64, 0xc4, 0x0a, 0x25, 0x31, 0x48, 0x2e, 0x24, 0xe0, 0x1a, 0x1a, 0x9f, + 0x10, 0x93, 0xa5, 0x4e, 0x78, 0x9f, 0xac, 0xf3, 0xd5, 0xc9, 0x92, 0xc3, 0xab, 0xd9, 0xe7, 0xf3, + 0xb5, 0x9d, 0xec, 0xf2, 0x9b, 0xbb, 0xac, 0xff, 0x2f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x5e, + 0x87, 0x3a, 0xd5, 0x02, 0x00, 0x00, } diff --git a/x/process/internal/types/msg.proto b/x/process/internal/types/msg.proto index 7b393b086..54da16036 100644 --- a/x/process/internal/types/msg.proto +++ b/x/process/internal/types/msg.proto @@ -35,8 +35,7 @@ message MsgDelete { // The process's hash to delete. bytes hash = 1 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // The process's owner. diff --git a/x/runner/internal/types/msg.pb.go b/x/runner/internal/types/msg.pb.go index 3d05d9f5f..6ccd3734f 100644 --- a/x/runner/internal/types/msg.pb.go +++ b/x/runner/internal/types/msg.pb.go @@ -28,9 +28,9 @@ type MsgCreate struct { // The Runner's owner. Owner github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=owner,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"owner,omitempty" validate:"required,accaddress"` // Service's hash to start the runner with. - ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=serviceHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash" validate:"required,hash"` + ServiceHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=serviceHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"serviceHash,omitempty" validate:"required,hash"` // Environmental variables to start the runner with. - EnvHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=envHash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"envHash" validate:"omitempty,hash"` + EnvHash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,3,opt,name=envHash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"envHash,omitempty" validate:"omitempty,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -67,12 +67,26 @@ func (m *MsgCreate) GetOwner() github_com_cosmos_cosmos_sdk_types.AccAddress { return nil } +func (m *MsgCreate) GetServiceHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.ServiceHash + } + return nil +} + +func (m *MsgCreate) GetEnvHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.EnvHash + } + return nil +} + // The message to delete a Runner. type MsgDelete struct { // The Runner's owner. Owner github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=owner,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"owner,omitempty" validate:"required,accaddress"` // Runner's hash - Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=hash,proto3,customtype=github.com/mesg-foundation/engine/hash.Hash" json:"hash" validate:"required,hash"` + Hash github_com_mesg_foundation_engine_hash.Hash `protobuf:"bytes,2,opt,name=hash,proto3,casttype=github.com/mesg-foundation/engine/hash.Hash" json:"hash,omitempty" validate:"required,hash"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -109,6 +123,13 @@ func (m *MsgDelete) GetOwner() github_com_cosmos_cosmos_sdk_types.AccAddress { return nil } +func (m *MsgDelete) GetHash() github_com_mesg_foundation_engine_hash.Hash { + if m != nil { + return m.Hash + } + return nil +} + func init() { proto.RegisterType((*MsgCreate)(nil), "mesg.runner.types.MsgCreate") proto.RegisterType((*MsgDelete)(nil), "mesg.runner.types.MsgDelete") @@ -117,26 +138,25 @@ func init() { func init() { proto.RegisterFile("x/runner/internal/types/msg.proto", fileDescriptor_0041db5ef7393ba5) } var fileDescriptor_0041db5ef7393ba5 = []byte{ - // 323 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x92, 0xbf, 0x4e, 0xc3, 0x30, - 0x10, 0xc6, 0x69, 0xf9, 0x27, 0x02, 0x0b, 0x99, 0x0a, 0x03, 0x81, 0x4c, 0x48, 0x50, 0x7b, 0x60, - 0x02, 0xa6, 0x16, 0x06, 0x16, 0x04, 0x2a, 0x1b, 0x9b, 0x6b, 0x5f, 0x1d, 0x43, 0x6d, 0xb7, 0x3e, - 0x27, 0xd0, 0x37, 0xe4, 0x05, 0x58, 0x40, 0xca, 0x43, 0x74, 0x64, 0x42, 0x71, 0x8a, 0xe8, 0x00, - 0x42, 0x42, 0x82, 0xc9, 0x3e, 0x9d, 0xbf, 0xef, 0x77, 0xfe, 0x74, 0xd1, 0xde, 0x23, 0x75, 0xb9, - 0x31, 0xe0, 0xa8, 0x32, 0x1e, 0x9c, 0x61, 0x43, 0xea, 0x27, 0x23, 0x40, 0xaa, 0x51, 0x92, 0x91, - 0xb3, 0xde, 0xc6, 0x9b, 0x1a, 0x50, 0x92, 0xfa, 0x15, 0x09, 0xcd, 0xed, 0x54, 0x5a, 0x69, 0x69, - 0x68, 0xf7, 0xf3, 0x01, 0xad, 0xaa, 0x50, 0x84, 0x5b, 0x2d, 0x4b, 0x9f, 0x9b, 0xd1, 0xda, 0x25, - 0xca, 0x33, 0x07, 0xcc, 0x43, 0xac, 0xa2, 0x65, 0xfb, 0x60, 0xc0, 0xb5, 0x1a, 0xbb, 0x8d, 0xfd, - 0x8d, 0xee, 0xcd, 0xb4, 0x4c, 0x76, 0x0a, 0x36, 0x54, 0x82, 0x79, 0x38, 0x49, 0x1d, 0x8c, 0x73, - 0xe5, 0x40, 0x1c, 0x32, 0xce, 0x99, 0x10, 0x0e, 0x10, 0xd3, 0xb7, 0x32, 0x69, 0x4b, 0xe5, 0xb3, - 0xbc, 0x4f, 0xb8, 0xd5, 0x94, 0x5b, 0xd4, 0x16, 0x67, 0x47, 0x1b, 0xc5, 0x7d, 0x3d, 0x27, 0xe9, - 0x70, 0xde, 0xa9, 0x15, 0xbd, 0x9a, 0x10, 0x8f, 0xa3, 0x75, 0x04, 0x57, 0x28, 0x0e, 0x17, 0x0c, - 0xb3, 0x56, 0x33, 0x00, 0xaf, 0x9e, 0xca, 0x64, 0xe1, 0xa5, 0x4c, 0x0e, 0xe6, 0x2c, 0xab, 0x7f, - 0xb5, 0x07, 0x36, 0x37, 0x82, 0x79, 0x65, 0x0d, 0x05, 0x23, 0x95, 0x01, 0x9a, 0x31, 0xcc, 0x48, - 0x25, 0x9d, 0x96, 0x49, 0xeb, 0x8b, 0x19, 0xab, 0x7e, 0xda, 0x9b, 0x67, 0xc4, 0x77, 0xd1, 0x2a, - 0x98, 0x22, 0xe0, 0x16, 0x03, 0xee, 0xfa, 0x77, 0xb8, 0xad, 0x4f, 0x9c, 0xd5, 0xca, 0x83, 0x1e, - 0xf9, 0xc9, 0x8c, 0xf7, 0x01, 0x48, 0x5f, 0x1b, 0x21, 0xd7, 0x73, 0x18, 0xc2, 0xff, 0xe6, 0xca, - 0xa3, 0xa5, 0xec, 0x0f, 0x03, 0x0d, 0xe6, 0xdd, 0xd3, 0xdb, 0xe3, 0x9f, 0x0d, 0xbf, 0xd9, 0xd9, - 0xfe, 0x4a, 0xd8, 0xbc, 0xa3, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, 0xbe, 0x4b, 0xad, 0xd5, - 0x02, 0x00, 0x00, + // 317 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x92, 0x31, 0x4f, 0xfb, 0x30, + 0x10, 0xc5, 0xd5, 0xfe, 0xff, 0x80, 0x30, 0x2c, 0x64, 0x2a, 0x0c, 0x04, 0x32, 0x21, 0x41, 0xed, + 0x81, 0x09, 0x98, 0x5a, 0x18, 0x90, 0x80, 0xa5, 0x6c, 0x2c, 0xc8, 0xb5, 0xaf, 0x8e, 0x45, 0x6d, + 0x17, 0x9f, 0x13, 0xe8, 0x87, 0x64, 0x66, 0xcb, 0x87, 0xc8, 0xc8, 0x84, 0xe2, 0x80, 0xe8, 0x00, + 0x42, 0x42, 0x82, 0xc9, 0x3e, 0xdd, 0xbd, 0xf7, 0xb3, 0x9f, 0x8e, 0xec, 0x3e, 0x32, 0x5f, 0x58, + 0x0b, 0x9e, 0x69, 0x1b, 0xc0, 0x5b, 0x3e, 0x65, 0x61, 0x3e, 0x03, 0x64, 0x06, 0x15, 0x9d, 0x79, + 0x17, 0x5c, 0xb2, 0x61, 0x00, 0x15, 0x6d, 0xa7, 0x68, 0x6c, 0x6e, 0x65, 0xca, 0x29, 0xc7, 0x62, + 0x7b, 0x5c, 0x4c, 0x58, 0x53, 0xc5, 0x22, 0xde, 0x5a, 0x59, 0xf6, 0xd4, 0x25, 0xab, 0x57, 0xa8, + 0x4e, 0x3d, 0xf0, 0x00, 0x89, 0x26, 0x4b, 0xee, 0xc1, 0x82, 0xef, 0x75, 0x76, 0x3a, 0x7b, 0xeb, + 0xc3, 0xeb, 0xba, 0x4a, 0xb7, 0x4b, 0x3e, 0xd5, 0x92, 0x07, 0x38, 0xce, 0x3c, 0xdc, 0x17, 0xda, + 0x83, 0x3c, 0xe0, 0x42, 0x70, 0x29, 0x3d, 0x20, 0x66, 0x2f, 0x55, 0xda, 0x57, 0x3a, 0xe4, 0xc5, + 0x98, 0x0a, 0x67, 0x98, 0x70, 0x68, 0x1c, 0xbe, 0x1d, 0x7d, 0x94, 0x77, 0xed, 0x3b, 0xe9, 0x40, + 0x88, 0x41, 0xab, 0x18, 0xb5, 0x84, 0xc4, 0x90, 0x35, 0x04, 0x5f, 0x6a, 0x01, 0xe7, 0x1c, 0xf3, + 0x5e, 0x37, 0x02, 0x2f, 0xea, 0x2a, 0xed, 0x7d, 0x02, 0xcc, 0x39, 0xe6, 0x0d, 0x6a, 0x7f, 0x01, + 0xd5, 0xfc, 0xb7, 0x3f, 0x71, 0x85, 0x95, 0x3c, 0x68, 0x67, 0x19, 0x58, 0xa5, 0x2d, 0xb0, 0x66, + 0x94, 0x36, 0x96, 0xa3, 0x45, 0xff, 0x64, 0x42, 0x56, 0xc0, 0x96, 0x11, 0xf5, 0x2f, 0xa2, 0x2e, + 0xeb, 0x2a, 0xdd, 0xfc, 0x40, 0x39, 0xa3, 0x03, 0x98, 0x59, 0x98, 0xff, 0x8c, 0xf5, 0x6e, 0x9e, + 0x3d, 0x77, 0x62, 0x9e, 0x67, 0x30, 0x85, 0xbf, 0xcd, 0xf3, 0x96, 0xfc, 0xcf, 0x7f, 0x29, 0xc8, + 0x68, 0x3c, 0x3c, 0xb9, 0x39, 0xfa, 0x5e, 0xf4, 0xc5, 0x9e, 0x8e, 0x97, 0xe3, 0xb6, 0x1d, 0xbe, + 0x06, 0x00, 0x00, 0xff, 0xff, 0x80, 0xc0, 0x64, 0x2b, 0xc9, 0x02, 0x00, 0x00, } diff --git a/x/runner/internal/types/msg.proto b/x/runner/internal/types/msg.proto index 8c2ef3543..853500838 100644 --- a/x/runner/internal/types/msg.proto +++ b/x/runner/internal/types/msg.proto @@ -16,15 +16,13 @@ message MsgCreate { // Service's hash to start the runner with. bytes serviceHash = 2 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; // Environmental variables to start the runner with. bytes envHash = 3 [ (gogoproto.moretags) = 'validate:"omitempty,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; } @@ -40,7 +38,6 @@ message MsgDelete { // Runner's hash bytes hash = 2 [ (gogoproto.moretags) = 'validate:"required,hash"', - (gogoproto.customtype) = "github.com/mesg-foundation/engine/hash.Hash", - (gogoproto.nullable) = false + (gogoproto.casttype) = "github.com/mesg-foundation/engine/hash.Hash" ]; }