From d20e5b83aa94b37e66fd7a13d6d1764a03d5ba09 Mon Sep 17 00:00:00 2001 From: pathornteng Date: Wed, 17 Apr 2019 15:51:06 +0700 Subject: [PATCH 1/3] default deployer protobuf --- .../deployer_whitelist.pb.go | 240 ++++++++++++++---- .../deployer_whitelist.proto | 16 ++ 2 files changed, 212 insertions(+), 44 deletions(-) diff --git a/builtin/types/deployer_whitelist/deployer_whitelist.pb.go b/builtin/types/deployer_whitelist/deployer_whitelist.pb.go index 15ef178a..9247a4c4 100644 --- a/builtin/types/deployer_whitelist/deployer_whitelist.pb.go +++ b/builtin/types/deployer_whitelist/deployer_whitelist.pb.go @@ -45,22 +45,24 @@ func (x Flags) String() string { return proto.EnumName(Flags_name, int32(x)) } func (Flags) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{0} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{0} } type InitRequest struct { - Owner *types.Address `protobuf:"bytes,1,opt,name=owner" json:"owner,omitempty"` - Deployers []*Deployer `protobuf:"bytes,2,rep,name=deployers" json:"deployers,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Owner *types.Address `protobuf:"bytes,1,opt,name=owner" json:"owner,omitempty"` + Deployers []*Deployer `protobuf:"bytes,2,rep,name=deployers" json:"deployers,omitempty"` + // default deployer flags + Flags uint32 `protobuf:"varint,3,opt,name=flags,proto3" json:"flags,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *InitRequest) Reset() { *m = InitRequest{} } func (m *InitRequest) String() string { return proto.CompactTextString(m) } func (*InitRequest) ProtoMessage() {} func (*InitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{0} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{0} } func (m *InitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitRequest.Unmarshal(m, b) @@ -94,6 +96,13 @@ func (m *InitRequest) GetDeployers() []*Deployer { return nil } +func (m *InitRequest) GetFlags() uint32 { + if m != nil { + return m.Flags + } + return 0 +} + type Deployer struct { Address *types.Address `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` Flags uint32 `protobuf:"varint,2,opt,name=flags,proto3" json:"flags,omitempty"` @@ -106,7 +115,7 @@ func (m *Deployer) Reset() { *m = Deployer{} } func (m *Deployer) String() string { return proto.CompactTextString(m) } func (*Deployer) ProtoMessage() {} func (*Deployer) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{1} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{1} } func (m *Deployer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Deployer.Unmarshal(m, b) @@ -152,7 +161,7 @@ func (m *AddDeployerRequest) Reset() { *m = AddDeployerRequest{} } func (m *AddDeployerRequest) String() string { return proto.CompactTextString(m) } func (*AddDeployerRequest) ProtoMessage() {} func (*AddDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{2} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{2} } func (m *AddDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddDeployerRequest.Unmarshal(m, b) @@ -196,7 +205,7 @@ func (m *AddDeployerResponse) Reset() { *m = AddDeployerResponse{} } func (m *AddDeployerResponse) String() string { return proto.CompactTextString(m) } func (*AddDeployerResponse) ProtoMessage() {} func (*AddDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{3} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{3} } func (m *AddDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddDeployerResponse.Unmarshal(m, b) @@ -227,7 +236,7 @@ func (m *GetDeployerRequest) Reset() { *m = GetDeployerRequest{} } func (m *GetDeployerRequest) String() string { return proto.CompactTextString(m) } func (*GetDeployerRequest) ProtoMessage() {} func (*GetDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{4} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{4} } func (m *GetDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDeployerRequest.Unmarshal(m, b) @@ -265,7 +274,7 @@ func (m *GetDeployerResponse) Reset() { *m = GetDeployerResponse{} } func (m *GetDeployerResponse) String() string { return proto.CompactTextString(m) } func (*GetDeployerResponse) ProtoMessage() {} func (*GetDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{5} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{5} } func (m *GetDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDeployerResponse.Unmarshal(m, b) @@ -303,7 +312,7 @@ func (m *RemoveDeployerRequest) Reset() { *m = RemoveDeployerRequest{} } func (m *RemoveDeployerRequest) String() string { return proto.CompactTextString(m) } func (*RemoveDeployerRequest) ProtoMessage() {} func (*RemoveDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{6} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{6} } func (m *RemoveDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveDeployerRequest.Unmarshal(m, b) @@ -340,7 +349,7 @@ func (m *RemoveDeployerResponse) Reset() { *m = RemoveDeployerResponse{} func (m *RemoveDeployerResponse) String() string { return proto.CompactTextString(m) } func (*RemoveDeployerResponse) ProtoMessage() {} func (*RemoveDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{7} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{7} } func (m *RemoveDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveDeployerResponse.Unmarshal(m, b) @@ -370,7 +379,7 @@ func (m *ListDeployersRequest) Reset() { *m = ListDeployersRequest{} } func (m *ListDeployersRequest) String() string { return proto.CompactTextString(m) } func (*ListDeployersRequest) ProtoMessage() {} func (*ListDeployersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{8} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{8} } func (m *ListDeployersRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListDeployersRequest.Unmarshal(m, b) @@ -401,7 +410,7 @@ func (m *ListDeployersResponse) Reset() { *m = ListDeployersResponse{} } func (m *ListDeployersResponse) String() string { return proto.CompactTextString(m) } func (*ListDeployersResponse) ProtoMessage() {} func (*ListDeployersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_bdfae164aae1c99c, []int{9} + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{9} } func (m *ListDeployersResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListDeployersResponse.Unmarshal(m, b) @@ -428,6 +437,142 @@ func (m *ListDeployersResponse) GetDeployers() []*Deployer { return nil } +type SetDefaultDeployerRequest struct { + Flags uint32 `protobuf:"varint,1,opt,name=flags,proto3" json:"flags,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetDefaultDeployerRequest) Reset() { *m = SetDefaultDeployerRequest{} } +func (m *SetDefaultDeployerRequest) String() string { return proto.CompactTextString(m) } +func (*SetDefaultDeployerRequest) ProtoMessage() {} +func (*SetDefaultDeployerRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{10} +} +func (m *SetDefaultDeployerRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetDefaultDeployerRequest.Unmarshal(m, b) +} +func (m *SetDefaultDeployerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetDefaultDeployerRequest.Marshal(b, m, deterministic) +} +func (dst *SetDefaultDeployerRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetDefaultDeployerRequest.Merge(dst, src) +} +func (m *SetDefaultDeployerRequest) XXX_Size() int { + return xxx_messageInfo_SetDefaultDeployerRequest.Size(m) +} +func (m *SetDefaultDeployerRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetDefaultDeployerRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SetDefaultDeployerRequest proto.InternalMessageInfo + +func (m *SetDefaultDeployerRequest) GetFlags() uint32 { + if m != nil { + return m.Flags + } + return 0 +} + +type SetDefaultDeployerResponse struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetDefaultDeployerResponse) Reset() { *m = SetDefaultDeployerResponse{} } +func (m *SetDefaultDeployerResponse) String() string { return proto.CompactTextString(m) } +func (*SetDefaultDeployerResponse) ProtoMessage() {} +func (*SetDefaultDeployerResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{11} +} +func (m *SetDefaultDeployerResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetDefaultDeployerResponse.Unmarshal(m, b) +} +func (m *SetDefaultDeployerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetDefaultDeployerResponse.Marshal(b, m, deterministic) +} +func (dst *SetDefaultDeployerResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetDefaultDeployerResponse.Merge(dst, src) +} +func (m *SetDefaultDeployerResponse) XXX_Size() int { + return xxx_messageInfo_SetDefaultDeployerResponse.Size(m) +} +func (m *SetDefaultDeployerResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SetDefaultDeployerResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_SetDefaultDeployerResponse proto.InternalMessageInfo + +type GetDefaultDeployerRequest struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetDefaultDeployerRequest) Reset() { *m = GetDefaultDeployerRequest{} } +func (m *GetDefaultDeployerRequest) String() string { return proto.CompactTextString(m) } +func (*GetDefaultDeployerRequest) ProtoMessage() {} +func (*GetDefaultDeployerRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{12} +} +func (m *GetDefaultDeployerRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetDefaultDeployerRequest.Unmarshal(m, b) +} +func (m *GetDefaultDeployerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetDefaultDeployerRequest.Marshal(b, m, deterministic) +} +func (dst *GetDefaultDeployerRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetDefaultDeployerRequest.Merge(dst, src) +} +func (m *GetDefaultDeployerRequest) XXX_Size() int { + return xxx_messageInfo_GetDefaultDeployerRequest.Size(m) +} +func (m *GetDefaultDeployerRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetDefaultDeployerRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_GetDefaultDeployerRequest proto.InternalMessageInfo + +type GetDefaultDeployerResponse struct { + Deployer *Deployer `protobuf:"bytes,1,opt,name=deployer" json:"deployer,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetDefaultDeployerResponse) Reset() { *m = GetDefaultDeployerResponse{} } +func (m *GetDefaultDeployerResponse) String() string { return proto.CompactTextString(m) } +func (*GetDefaultDeployerResponse) ProtoMessage() {} +func (*GetDefaultDeployerResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{13} +} +func (m *GetDefaultDeployerResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetDefaultDeployerResponse.Unmarshal(m, b) +} +func (m *GetDefaultDeployerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetDefaultDeployerResponse.Marshal(b, m, deterministic) +} +func (dst *GetDefaultDeployerResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetDefaultDeployerResponse.Merge(dst, src) +} +func (m *GetDefaultDeployerResponse) XXX_Size() int { + return xxx_messageInfo_GetDefaultDeployerResponse.Size(m) +} +func (m *GetDefaultDeployerResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetDefaultDeployerResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_GetDefaultDeployerResponse proto.InternalMessageInfo + +func (m *GetDefaultDeployerResponse) GetDeployer() *Deployer { + if m != nil { + return m.Deployer + } + return nil +} + func init() { proto.RegisterType((*InitRequest)(nil), "deployer_whitelist.InitRequest") proto.RegisterType((*Deployer)(nil), "deployer_whitelist.Deployer") @@ -439,36 +584,43 @@ func init() { proto.RegisterType((*RemoveDeployerResponse)(nil), "deployer_whitelist.RemoveDeployerResponse") proto.RegisterType((*ListDeployersRequest)(nil), "deployer_whitelist.ListDeployersRequest") proto.RegisterType((*ListDeployersResponse)(nil), "deployer_whitelist.ListDeployersResponse") + proto.RegisterType((*SetDefaultDeployerRequest)(nil), "deployer_whitelist.SetDefaultDeployerRequest") + proto.RegisterType((*SetDefaultDeployerResponse)(nil), "deployer_whitelist.SetDefaultDeployerResponse") + proto.RegisterType((*GetDefaultDeployerRequest)(nil), "deployer_whitelist.GetDefaultDeployerRequest") + proto.RegisterType((*GetDefaultDeployerResponse)(nil), "deployer_whitelist.GetDefaultDeployerResponse") proto.RegisterEnum("deployer_whitelist.Flags", Flags_name, Flags_value) } func init() { - proto.RegisterFile("github.com/loomnetwork/go-loom/builtin/types/deployer_whitelist/deployer_whitelist.proto", fileDescriptor_deployer_whitelist_bdfae164aae1c99c) -} - -var fileDescriptor_deployer_whitelist_bdfae164aae1c99c = []byte{ - // 362 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xef, 0x4b, 0xfa, 0x50, - 0x14, 0xc6, 0xbf, 0xf3, 0xe7, 0x3c, 0x7e, 0x85, 0x71, 0xfd, 0x81, 0x44, 0x84, 0xdc, 0x57, 0x12, - 0xb5, 0x95, 0xbd, 0x89, 0xde, 0x19, 0x9a, 0x08, 0xe9, 0x60, 0x45, 0xf8, 0x2e, 0xb4, 0x9d, 0xf4, - 0xd2, 0xdc, 0x5d, 0xbb, 0xd7, 0xc4, 0xff, 0x3e, 0xe6, 0x36, 0x63, 0x6a, 0x45, 0xf8, 0x66, 0x70, - 0x9e, 0x73, 0xf8, 0x3c, 0xcf, 0xd9, 0x3d, 0x30, 0x9a, 0x32, 0x39, 0x5b, 0x4c, 0xf4, 0x17, 0x3e, - 0x37, 0x1c, 0xce, 0xe7, 0x2e, 0xca, 0x25, 0xf7, 0xdf, 0x8c, 0x29, 0x3f, 0x0f, 0x4a, 0x63, 0xb2, - 0x60, 0x8e, 0x64, 0xae, 0x21, 0x57, 0x1e, 0x0a, 0xc3, 0x46, 0xcf, 0xe1, 0x2b, 0xf4, 0x9f, 0x97, - 0x33, 0x26, 0xd1, 0x61, 0x42, 0xee, 0x91, 0x74, 0xcf, 0xe7, 0x92, 0x13, 0xb2, 0xdb, 0x39, 0xba, - 0xf8, 0xc5, 0x2d, 0x74, 0x59, 0x7f, 0x43, 0x0a, 0x65, 0x50, 0xec, 0xbb, 0x4c, 0x5a, 0xf8, 0xbe, - 0x40, 0x21, 0xc9, 0x09, 0x64, 0xf9, 0xd2, 0x45, 0xbf, 0xae, 0x34, 0x94, 0x66, 0xb1, 0xa5, 0xea, - 0x6d, 0xdb, 0xf6, 0x51, 0x08, 0x2b, 0x94, 0xc9, 0x0d, 0x14, 0x62, 0x5b, 0x51, 0x4f, 0x35, 0xd2, - 0xcd, 0x62, 0xeb, 0x58, 0xdf, 0x13, 0xb1, 0x13, 0x49, 0xd6, 0xd7, 0x38, 0xed, 0x80, 0x1a, 0xcb, - 0x84, 0x42, 0x7e, 0x1c, 0x92, 0x77, 0x9c, 0xe2, 0x06, 0xa9, 0x40, 0xf6, 0xd5, 0x19, 0x4f, 0x03, - 0x1f, 0xa5, 0x59, 0xb2, 0xc2, 0x82, 0x8e, 0x80, 0xb4, 0x6d, 0x7b, 0xc3, 0x8f, 0x72, 0x9f, 0xc1, - 0xff, 0xd8, 0x28, 0xe0, 0xec, 0x40, 0x13, 0xdd, 0x6f, 0xc8, 0x55, 0x28, 0x27, 0xc8, 0xc2, 0xe3, - 0xae, 0x40, 0x7a, 0x0b, 0xa4, 0x87, 0xf2, 0x20, 0x43, 0x6a, 0x42, 0x39, 0xc1, 0x08, 0xd1, 0xe4, - 0x1a, 0xd4, 0x78, 0x2c, 0x02, 0xfc, 0xfc, 0x33, 0x37, 0xd3, 0xb4, 0x0b, 0x55, 0x0b, 0xe7, 0xfc, - 0x03, 0x0f, 0xcb, 0x55, 0x87, 0xda, 0x36, 0x26, 0xda, 0xba, 0x06, 0x95, 0x7b, 0x26, 0x36, 0x91, - 0x45, 0xc4, 0xa7, 0x0f, 0x50, 0xdd, 0xd2, 0xa3, 0x5d, 0x12, 0x97, 0xa1, 0xfc, 0xe9, 0x32, 0x4e, - 0x2f, 0x21, 0x7b, 0x17, 0x3c, 0x01, 0x51, 0x21, 0x33, 0x34, 0x87, 0x5d, 0xed, 0x1f, 0xc9, 0x41, - 0xaa, 0x67, 0x6a, 0x0a, 0xc9, 0x43, 0xba, 0xfb, 0x34, 0xd0, 0x52, 0xa4, 0x04, 0x85, 0x41, 0xbf, - 0x67, 0xb5, 0x1f, 0xfb, 0xe6, 0x50, 0xcb, 0x4c, 0x72, 0xeb, 0xf3, 0xbd, 0xfa, 0x0c, 0x00, 0x00, - 0xff, 0xff, 0xf9, 0xf1, 0x97, 0x84, 0x60, 0x03, 0x00, 0x00, + proto.RegisterFile("github.com/loomnetwork/go-loom/builtin/types/deployer_whitelist/deployer_whitelist.proto", fileDescriptor_deployer_whitelist_336d387baa83ab6c) +} + +var fileDescriptor_deployer_whitelist_336d387baa83ab6c = []byte{ + // 411 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0xcf, 0xd2, 0x40, + 0x10, 0xc6, 0x6d, 0x79, 0x79, 0xdf, 0x32, 0x48, 0xd2, 0x2c, 0x1f, 0x29, 0x48, 0x0c, 0xd9, 0x13, + 0x31, 0xda, 0x0a, 0x5e, 0x8c, 0x37, 0x0c, 0xd8, 0x90, 0x08, 0x4d, 0x8a, 0x21, 0xdc, 0x0c, 0xd8, + 0x05, 0x1a, 0x4b, 0xb7, 0x76, 0xb7, 0x12, 0x4e, 0xfe, 0xeb, 0xa6, 0xf4, 0x03, 0x4a, 0x41, 0xa3, + 0x5c, 0x9a, 0xec, 0xcc, 0xec, 0xef, 0x79, 0x66, 0x66, 0x0b, 0x8b, 0x8d, 0xcd, 0xb7, 0xc1, 0x4a, + 0xfd, 0x46, 0x77, 0x9a, 0x43, 0xe9, 0xce, 0x25, 0x7c, 0x4f, 0xfd, 0xef, 0xda, 0x86, 0xbe, 0x09, + 0x8f, 0xda, 0x2a, 0xb0, 0x1d, 0x6e, 0xbb, 0x1a, 0x3f, 0x78, 0x84, 0x69, 0x16, 0xf1, 0x1c, 0x7a, + 0x20, 0xfe, 0xd7, 0xfd, 0xd6, 0xe6, 0xc4, 0xb1, 0x19, 0xbf, 0x12, 0x52, 0x3d, 0x9f, 0x72, 0x8a, + 0x50, 0x3e, 0xd3, 0x7a, 0xfb, 0x17, 0xb5, 0x48, 0xe5, 0xf8, 0x8d, 0x28, 0xf8, 0x17, 0x94, 0xc7, + 0xae, 0xcd, 0x4d, 0xf2, 0x23, 0x20, 0x8c, 0xa3, 0x97, 0x50, 0xa4, 0x7b, 0x97, 0xf8, 0x8a, 0xd0, + 0x11, 0xba, 0xe5, 0xbe, 0xa4, 0x0e, 0x2c, 0xcb, 0x27, 0x8c, 0x99, 0x51, 0x18, 0x7d, 0x80, 0x52, + 0x22, 0xcb, 0x14, 0xb1, 0x53, 0xe8, 0x96, 0xfb, 0x6d, 0xf5, 0x8a, 0xc5, 0x61, 0x1c, 0x32, 0x4f, + 0xe5, 0xa8, 0x06, 0xc5, 0xb5, 0xb3, 0xdc, 0x30, 0xa5, 0xd0, 0x11, 0xba, 0x15, 0x33, 0x3a, 0xe0, + 0x21, 0x48, 0x49, 0x31, 0xc2, 0xf0, 0xb4, 0x8c, 0xf4, 0x72, 0xfa, 0x49, 0xe2, 0x44, 0x11, 0xcf, + 0x29, 0x0b, 0x40, 0x03, 0xcb, 0x4a, 0x55, 0xe3, 0x6e, 0x5e, 0xc3, 0xf3, 0x44, 0x3e, 0xe4, 0xe4, + 0xa0, 0x99, 0xec, 0x0d, 0x72, 0x1d, 0xaa, 0x19, 0x32, 0xf3, 0xa8, 0xcb, 0x08, 0xfe, 0x08, 0x48, + 0x27, 0xfc, 0x2e, 0x41, 0x6c, 0x40, 0x35, 0xc3, 0x88, 0xd0, 0xe8, 0x3d, 0x48, 0x49, 0x59, 0x0c, + 0xf8, 0xf3, 0x88, 0xd3, 0x6a, 0x3c, 0x82, 0xba, 0x49, 0x76, 0xf4, 0x27, 0xb9, 0xcf, 0x97, 0x02, + 0x8d, 0x4b, 0x4c, 0xdc, 0x75, 0x03, 0x6a, 0x9f, 0x6d, 0x96, 0x5a, 0x66, 0x31, 0x1f, 0xcf, 0xa0, + 0x7e, 0x11, 0x8f, 0x7b, 0xc9, 0xbc, 0x17, 0xe1, 0x9f, 0xde, 0x0b, 0xee, 0x41, 0x73, 0x16, 0x8e, + 0x67, 0xbd, 0x0c, 0x9c, 0xdc, 0xa4, 0xd3, 0x65, 0x09, 0xe7, 0xcb, 0x6a, 0x43, 0xeb, 0xda, 0x95, + 0xd8, 0xfd, 0x0b, 0x68, 0xea, 0xb7, 0x80, 0x78, 0x0e, 0x2d, 0xfd, 0xe6, 0xd5, 0xff, 0xdf, 0xc9, + 0xab, 0x1e, 0x14, 0x3f, 0x85, 0xde, 0x90, 0x04, 0x0f, 0x53, 0x63, 0x3a, 0x92, 0x9f, 0xa1, 0x47, + 0x10, 0x75, 0x43, 0x16, 0xd0, 0x13, 0x14, 0x46, 0xf3, 0x89, 0x2c, 0xa2, 0x0a, 0x94, 0x26, 0x63, + 0xdd, 0x1c, 0x7c, 0x19, 0x1b, 0x53, 0xf9, 0x61, 0xf5, 0x78, 0xfc, 0x35, 0xdf, 0xfd, 0x0e, 0x00, + 0x00, 0xff, 0xff, 0x9c, 0x09, 0x1c, 0x00, 0x3c, 0x04, 0x00, 0x00, } diff --git a/builtin/types/deployer_whitelist/deployer_whitelist.proto b/builtin/types/deployer_whitelist/deployer_whitelist.proto index 00d3c64d..87e8d3a1 100644 --- a/builtin/types/deployer_whitelist/deployer_whitelist.proto +++ b/builtin/types/deployer_whitelist/deployer_whitelist.proto @@ -5,6 +5,8 @@ import "github.com/loomnetwork/go-loom/types/types.proto"; message InitRequest { Address owner = 1; repeated Deployer deployers = 2; + //default deployer flags + uint32 flags = 3; } enum Flags { @@ -48,4 +50,18 @@ message ListDeployersRequest { message ListDeployersResponse { repeated Deployer deployers = 1; +} + +message SetDefaultDeployerRequest { + uint32 flags = 1; +} + +message SetDefaultDeployerResponse { +} + +message GetDefaultDeployerRequest { +} + +message GetDefaultDeployerResponse { + Deployer deployer = 1; } \ No newline at end of file From bd36894631910290203480fe8e900983f66609d8 Mon Sep 17 00:00:00 2001 From: pathornteng Date: Thu, 18 Apr 2019 10:38:36 +0700 Subject: [PATCH 2/3] add override protobuf --- .../deployer_whitelist.pb.go | 290 ++++++++++-------- .../deployer_whitelist.proto | 15 +- 2 files changed, 179 insertions(+), 126 deletions(-) diff --git a/builtin/types/deployer_whitelist/deployer_whitelist.pb.go b/builtin/types/deployer_whitelist/deployer_whitelist.pb.go index 9247a4c4..b8c83850 100644 --- a/builtin/types/deployer_whitelist/deployer_whitelist.pb.go +++ b/builtin/types/deployer_whitelist/deployer_whitelist.pb.go @@ -45,7 +45,7 @@ func (x Flags) String() string { return proto.EnumName(Flags_name, int32(x)) } func (Flags) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{0} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{0} } type InitRequest struct { @@ -62,7 +62,7 @@ func (m *InitRequest) Reset() { *m = InitRequest{} } func (m *InitRequest) String() string { return proto.CompactTextString(m) } func (*InitRequest) ProtoMessage() {} func (*InitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{0} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{0} } func (m *InitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitRequest.Unmarshal(m, b) @@ -115,7 +115,7 @@ func (m *Deployer) Reset() { *m = Deployer{} } func (m *Deployer) String() string { return proto.CompactTextString(m) } func (*Deployer) ProtoMessage() {} func (*Deployer) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{1} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{1} } func (m *Deployer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Deployer.Unmarshal(m, b) @@ -161,7 +161,7 @@ func (m *AddDeployerRequest) Reset() { *m = AddDeployerRequest{} } func (m *AddDeployerRequest) String() string { return proto.CompactTextString(m) } func (*AddDeployerRequest) ProtoMessage() {} func (*AddDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{2} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{2} } func (m *AddDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddDeployerRequest.Unmarshal(m, b) @@ -205,7 +205,7 @@ func (m *AddDeployerResponse) Reset() { *m = AddDeployerResponse{} } func (m *AddDeployerResponse) String() string { return proto.CompactTextString(m) } func (*AddDeployerResponse) ProtoMessage() {} func (*AddDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{3} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{3} } func (m *AddDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddDeployerResponse.Unmarshal(m, b) @@ -236,7 +236,7 @@ func (m *GetDeployerRequest) Reset() { *m = GetDeployerRequest{} } func (m *GetDeployerRequest) String() string { return proto.CompactTextString(m) } func (*GetDeployerRequest) ProtoMessage() {} func (*GetDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{4} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{4} } func (m *GetDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDeployerRequest.Unmarshal(m, b) @@ -274,7 +274,7 @@ func (m *GetDeployerResponse) Reset() { *m = GetDeployerResponse{} } func (m *GetDeployerResponse) String() string { return proto.CompactTextString(m) } func (*GetDeployerResponse) ProtoMessage() {} func (*GetDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{5} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{5} } func (m *GetDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDeployerResponse.Unmarshal(m, b) @@ -312,7 +312,7 @@ func (m *RemoveDeployerRequest) Reset() { *m = RemoveDeployerRequest{} } func (m *RemoveDeployerRequest) String() string { return proto.CompactTextString(m) } func (*RemoveDeployerRequest) ProtoMessage() {} func (*RemoveDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{6} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{6} } func (m *RemoveDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveDeployerRequest.Unmarshal(m, b) @@ -349,7 +349,7 @@ func (m *RemoveDeployerResponse) Reset() { *m = RemoveDeployerResponse{} func (m *RemoveDeployerResponse) String() string { return proto.CompactTextString(m) } func (*RemoveDeployerResponse) ProtoMessage() {} func (*RemoveDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{7} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{7} } func (m *RemoveDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveDeployerResponse.Unmarshal(m, b) @@ -379,7 +379,7 @@ func (m *ListDeployersRequest) Reset() { *m = ListDeployersRequest{} } func (m *ListDeployersRequest) String() string { return proto.CompactTextString(m) } func (*ListDeployersRequest) ProtoMessage() {} func (*ListDeployersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{8} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{8} } func (m *ListDeployersRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListDeployersRequest.Unmarshal(m, b) @@ -410,7 +410,7 @@ func (m *ListDeployersResponse) Reset() { *m = ListDeployersResponse{} } func (m *ListDeployersResponse) String() string { return proto.CompactTextString(m) } func (*ListDeployersResponse) ProtoMessage() {} func (*ListDeployersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{9} + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{9} } func (m *ListDeployersResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListDeployersResponse.Unmarshal(m, b) @@ -437,142 +437,188 @@ func (m *ListDeployersResponse) GetDeployers() []*Deployer { return nil } -type SetDefaultDeployerRequest struct { +type SetOverrideRequest struct { Flags uint32 `protobuf:"varint,1,opt,name=flags,proto3" json:"flags,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *SetDefaultDeployerRequest) Reset() { *m = SetDefaultDeployerRequest{} } -func (m *SetDefaultDeployerRequest) String() string { return proto.CompactTextString(m) } -func (*SetDefaultDeployerRequest) ProtoMessage() {} -func (*SetDefaultDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{10} +func (m *SetOverrideRequest) Reset() { *m = SetOverrideRequest{} } +func (m *SetOverrideRequest) String() string { return proto.CompactTextString(m) } +func (*SetOverrideRequest) ProtoMessage() {} +func (*SetOverrideRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{10} } -func (m *SetDefaultDeployerRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetDefaultDeployerRequest.Unmarshal(m, b) +func (m *SetOverrideRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetOverrideRequest.Unmarshal(m, b) } -func (m *SetDefaultDeployerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetDefaultDeployerRequest.Marshal(b, m, deterministic) +func (m *SetOverrideRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetOverrideRequest.Marshal(b, m, deterministic) } -func (dst *SetDefaultDeployerRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetDefaultDeployerRequest.Merge(dst, src) +func (dst *SetOverrideRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetOverrideRequest.Merge(dst, src) } -func (m *SetDefaultDeployerRequest) XXX_Size() int { - return xxx_messageInfo_SetDefaultDeployerRequest.Size(m) +func (m *SetOverrideRequest) XXX_Size() int { + return xxx_messageInfo_SetOverrideRequest.Size(m) } -func (m *SetDefaultDeployerRequest) XXX_DiscardUnknown() { - xxx_messageInfo_SetDefaultDeployerRequest.DiscardUnknown(m) +func (m *SetOverrideRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SetOverrideRequest.DiscardUnknown(m) } -var xxx_messageInfo_SetDefaultDeployerRequest proto.InternalMessageInfo +var xxx_messageInfo_SetOverrideRequest proto.InternalMessageInfo -func (m *SetDefaultDeployerRequest) GetFlags() uint32 { +func (m *SetOverrideRequest) GetFlags() uint32 { if m != nil { return m.Flags } return 0 } -type SetDefaultDeployerResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +type SetOverrideResponse struct { + Override *Override `protobuf:"bytes,1,opt,name=override" json:"override,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } -func (m *SetDefaultDeployerResponse) Reset() { *m = SetDefaultDeployerResponse{} } -func (m *SetDefaultDeployerResponse) String() string { return proto.CompactTextString(m) } -func (*SetDefaultDeployerResponse) ProtoMessage() {} -func (*SetDefaultDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{11} +func (m *SetOverrideResponse) Reset() { *m = SetOverrideResponse{} } +func (m *SetOverrideResponse) String() string { return proto.CompactTextString(m) } +func (*SetOverrideResponse) ProtoMessage() {} +func (*SetOverrideResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{11} } -func (m *SetDefaultDeployerResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetDefaultDeployerResponse.Unmarshal(m, b) +func (m *SetOverrideResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetOverrideResponse.Unmarshal(m, b) } -func (m *SetDefaultDeployerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetDefaultDeployerResponse.Marshal(b, m, deterministic) +func (m *SetOverrideResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetOverrideResponse.Marshal(b, m, deterministic) } -func (dst *SetDefaultDeployerResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetDefaultDeployerResponse.Merge(dst, src) +func (dst *SetOverrideResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetOverrideResponse.Merge(dst, src) } -func (m *SetDefaultDeployerResponse) XXX_Size() int { - return xxx_messageInfo_SetDefaultDeployerResponse.Size(m) +func (m *SetOverrideResponse) XXX_Size() int { + return xxx_messageInfo_SetOverrideResponse.Size(m) } -func (m *SetDefaultDeployerResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SetDefaultDeployerResponse.DiscardUnknown(m) +func (m *SetOverrideResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SetOverrideResponse.DiscardUnknown(m) } -var xxx_messageInfo_SetDefaultDeployerResponse proto.InternalMessageInfo +var xxx_messageInfo_SetOverrideResponse proto.InternalMessageInfo -type GetDefaultDeployerRequest struct { +func (m *SetOverrideResponse) GetOverride() *Override { + if m != nil { + return m.Override + } + return nil +} + +type GetOverrideRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *GetDefaultDeployerRequest) Reset() { *m = GetDefaultDeployerRequest{} } -func (m *GetDefaultDeployerRequest) String() string { return proto.CompactTextString(m) } -func (*GetDefaultDeployerRequest) ProtoMessage() {} -func (*GetDefaultDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{12} +func (m *GetOverrideRequest) Reset() { *m = GetOverrideRequest{} } +func (m *GetOverrideRequest) String() string { return proto.CompactTextString(m) } +func (*GetOverrideRequest) ProtoMessage() {} +func (*GetOverrideRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{12} } -func (m *GetDefaultDeployerRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetDefaultDeployerRequest.Unmarshal(m, b) +func (m *GetOverrideRequest) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetOverrideRequest.Unmarshal(m, b) } -func (m *GetDefaultDeployerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetDefaultDeployerRequest.Marshal(b, m, deterministic) +func (m *GetOverrideRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetOverrideRequest.Marshal(b, m, deterministic) } -func (dst *GetDefaultDeployerRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetDefaultDeployerRequest.Merge(dst, src) +func (dst *GetOverrideRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetOverrideRequest.Merge(dst, src) } -func (m *GetDefaultDeployerRequest) XXX_Size() int { - return xxx_messageInfo_GetDefaultDeployerRequest.Size(m) +func (m *GetOverrideRequest) XXX_Size() int { + return xxx_messageInfo_GetOverrideRequest.Size(m) } -func (m *GetDefaultDeployerRequest) XXX_DiscardUnknown() { - xxx_messageInfo_GetDefaultDeployerRequest.DiscardUnknown(m) +func (m *GetOverrideRequest) XXX_DiscardUnknown() { + xxx_messageInfo_GetOverrideRequest.DiscardUnknown(m) } -var xxx_messageInfo_GetDefaultDeployerRequest proto.InternalMessageInfo +var xxx_messageInfo_GetOverrideRequest proto.InternalMessageInfo -type GetDefaultDeployerResponse struct { - Deployer *Deployer `protobuf:"bytes,1,opt,name=deployer" json:"deployer,omitempty"` +type GetOverrideResponse struct { + Override *Override `protobuf:"bytes,1,opt,name=override" json:"override,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` } -func (m *GetDefaultDeployerResponse) Reset() { *m = GetDefaultDeployerResponse{} } -func (m *GetDefaultDeployerResponse) String() string { return proto.CompactTextString(m) } -func (*GetDefaultDeployerResponse) ProtoMessage() {} -func (*GetDefaultDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_336d387baa83ab6c, []int{13} +func (m *GetOverrideResponse) Reset() { *m = GetOverrideResponse{} } +func (m *GetOverrideResponse) String() string { return proto.CompactTextString(m) } +func (*GetOverrideResponse) ProtoMessage() {} +func (*GetOverrideResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{13} } -func (m *GetDefaultDeployerResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_GetDefaultDeployerResponse.Unmarshal(m, b) +func (m *GetOverrideResponse) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetOverrideResponse.Unmarshal(m, b) } -func (m *GetDefaultDeployerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_GetDefaultDeployerResponse.Marshal(b, m, deterministic) +func (m *GetOverrideResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetOverrideResponse.Marshal(b, m, deterministic) } -func (dst *GetDefaultDeployerResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetDefaultDeployerResponse.Merge(dst, src) +func (dst *GetOverrideResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetOverrideResponse.Merge(dst, src) } -func (m *GetDefaultDeployerResponse) XXX_Size() int { - return xxx_messageInfo_GetDefaultDeployerResponse.Size(m) +func (m *GetOverrideResponse) XXX_Size() int { + return xxx_messageInfo_GetOverrideResponse.Size(m) } -func (m *GetDefaultDeployerResponse) XXX_DiscardUnknown() { - xxx_messageInfo_GetDefaultDeployerResponse.DiscardUnknown(m) +func (m *GetOverrideResponse) XXX_DiscardUnknown() { + xxx_messageInfo_GetOverrideResponse.DiscardUnknown(m) } -var xxx_messageInfo_GetDefaultDeployerResponse proto.InternalMessageInfo +var xxx_messageInfo_GetOverrideResponse proto.InternalMessageInfo -func (m *GetDefaultDeployerResponse) GetDeployer() *Deployer { +func (m *GetOverrideResponse) GetOverride() *Override { if m != nil { - return m.Deployer + return m.Override } return nil } +type Override struct { + Flags uint32 `protobuf:"varint,1,opt,name=flags,proto3" json:"flags,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Override) Reset() { *m = Override{} } +func (m *Override) String() string { return proto.CompactTextString(m) } +func (*Override) ProtoMessage() {} +func (*Override) Descriptor() ([]byte, []int) { + return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{14} +} +func (m *Override) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Override.Unmarshal(m, b) +} +func (m *Override) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Override.Marshal(b, m, deterministic) +} +func (dst *Override) XXX_Merge(src proto.Message) { + xxx_messageInfo_Override.Merge(dst, src) +} +func (m *Override) XXX_Size() int { + return xxx_messageInfo_Override.Size(m) +} +func (m *Override) XXX_DiscardUnknown() { + xxx_messageInfo_Override.DiscardUnknown(m) +} + +var xxx_messageInfo_Override proto.InternalMessageInfo + +func (m *Override) GetFlags() uint32 { + if m != nil { + return m.Flags + } + return 0 +} + func init() { proto.RegisterType((*InitRequest)(nil), "deployer_whitelist.InitRequest") proto.RegisterType((*Deployer)(nil), "deployer_whitelist.Deployer") @@ -584,43 +630,45 @@ func init() { proto.RegisterType((*RemoveDeployerResponse)(nil), "deployer_whitelist.RemoveDeployerResponse") proto.RegisterType((*ListDeployersRequest)(nil), "deployer_whitelist.ListDeployersRequest") proto.RegisterType((*ListDeployersResponse)(nil), "deployer_whitelist.ListDeployersResponse") - proto.RegisterType((*SetDefaultDeployerRequest)(nil), "deployer_whitelist.SetDefaultDeployerRequest") - proto.RegisterType((*SetDefaultDeployerResponse)(nil), "deployer_whitelist.SetDefaultDeployerResponse") - proto.RegisterType((*GetDefaultDeployerRequest)(nil), "deployer_whitelist.GetDefaultDeployerRequest") - proto.RegisterType((*GetDefaultDeployerResponse)(nil), "deployer_whitelist.GetDefaultDeployerResponse") + proto.RegisterType((*SetOverrideRequest)(nil), "deployer_whitelist.SetOverrideRequest") + proto.RegisterType((*SetOverrideResponse)(nil), "deployer_whitelist.SetOverrideResponse") + proto.RegisterType((*GetOverrideRequest)(nil), "deployer_whitelist.GetOverrideRequest") + proto.RegisterType((*GetOverrideResponse)(nil), "deployer_whitelist.GetOverrideResponse") + proto.RegisterType((*Override)(nil), "deployer_whitelist.Override") proto.RegisterEnum("deployer_whitelist.Flags", Flags_name, Flags_value) } func init() { - proto.RegisterFile("github.com/loomnetwork/go-loom/builtin/types/deployer_whitelist/deployer_whitelist.proto", fileDescriptor_deployer_whitelist_336d387baa83ab6c) -} - -var fileDescriptor_deployer_whitelist_336d387baa83ab6c = []byte{ - // 411 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xcd, 0xcf, 0xd2, 0x40, - 0x10, 0xc6, 0x6d, 0x79, 0x79, 0xdf, 0x32, 0x48, 0xd2, 0x2c, 0x1f, 0x29, 0x48, 0x0c, 0xd9, 0x13, - 0x31, 0xda, 0x0a, 0x5e, 0x8c, 0x37, 0x0c, 0xd8, 0x90, 0x08, 0x4d, 0x8a, 0x21, 0xdc, 0x0c, 0xd8, - 0x05, 0x1a, 0x4b, 0xb7, 0x76, 0xb7, 0x12, 0x4e, 0xfe, 0xeb, 0xa6, 0xf4, 0x03, 0x4a, 0x41, 0xa3, - 0x5c, 0x9a, 0xec, 0xcc, 0xec, 0xef, 0x79, 0x66, 0x66, 0x0b, 0x8b, 0x8d, 0xcd, 0xb7, 0xc1, 0x4a, - 0xfd, 0x46, 0x77, 0x9a, 0x43, 0xe9, 0xce, 0x25, 0x7c, 0x4f, 0xfd, 0xef, 0xda, 0x86, 0xbe, 0x09, - 0x8f, 0xda, 0x2a, 0xb0, 0x1d, 0x6e, 0xbb, 0x1a, 0x3f, 0x78, 0x84, 0x69, 0x16, 0xf1, 0x1c, 0x7a, - 0x20, 0xfe, 0xd7, 0xfd, 0xd6, 0xe6, 0xc4, 0xb1, 0x19, 0xbf, 0x12, 0x52, 0x3d, 0x9f, 0x72, 0x8a, - 0x50, 0x3e, 0xd3, 0x7a, 0xfb, 0x17, 0xb5, 0x48, 0xe5, 0xf8, 0x8d, 0x28, 0xf8, 0x17, 0x94, 0xc7, - 0xae, 0xcd, 0x4d, 0xf2, 0x23, 0x20, 0x8c, 0xa3, 0x97, 0x50, 0xa4, 0x7b, 0x97, 0xf8, 0x8a, 0xd0, - 0x11, 0xba, 0xe5, 0xbe, 0xa4, 0x0e, 0x2c, 0xcb, 0x27, 0x8c, 0x99, 0x51, 0x18, 0x7d, 0x80, 0x52, - 0x22, 0xcb, 0x14, 0xb1, 0x53, 0xe8, 0x96, 0xfb, 0x6d, 0xf5, 0x8a, 0xc5, 0x61, 0x1c, 0x32, 0x4f, - 0xe5, 0xa8, 0x06, 0xc5, 0xb5, 0xb3, 0xdc, 0x30, 0xa5, 0xd0, 0x11, 0xba, 0x15, 0x33, 0x3a, 0xe0, - 0x21, 0x48, 0x49, 0x31, 0xc2, 0xf0, 0xb4, 0x8c, 0xf4, 0x72, 0xfa, 0x49, 0xe2, 0x44, 0x11, 0xcf, - 0x29, 0x0b, 0x40, 0x03, 0xcb, 0x4a, 0x55, 0xe3, 0x6e, 0x5e, 0xc3, 0xf3, 0x44, 0x3e, 0xe4, 0xe4, - 0xa0, 0x99, 0xec, 0x0d, 0x72, 0x1d, 0xaa, 0x19, 0x32, 0xf3, 0xa8, 0xcb, 0x08, 0xfe, 0x08, 0x48, - 0x27, 0xfc, 0x2e, 0x41, 0x6c, 0x40, 0x35, 0xc3, 0x88, 0xd0, 0xe8, 0x3d, 0x48, 0x49, 0x59, 0x0c, - 0xf8, 0xf3, 0x88, 0xd3, 0x6a, 0x3c, 0x82, 0xba, 0x49, 0x76, 0xf4, 0x27, 0xb9, 0xcf, 0x97, 0x02, - 0x8d, 0x4b, 0x4c, 0xdc, 0x75, 0x03, 0x6a, 0x9f, 0x6d, 0x96, 0x5a, 0x66, 0x31, 0x1f, 0xcf, 0xa0, - 0x7e, 0x11, 0x8f, 0x7b, 0xc9, 0xbc, 0x17, 0xe1, 0x9f, 0xde, 0x0b, 0xee, 0x41, 0x73, 0x16, 0x8e, - 0x67, 0xbd, 0x0c, 0x9c, 0xdc, 0xa4, 0xd3, 0x65, 0x09, 0xe7, 0xcb, 0x6a, 0x43, 0xeb, 0xda, 0x95, - 0xd8, 0xfd, 0x0b, 0x68, 0xea, 0xb7, 0x80, 0x78, 0x0e, 0x2d, 0xfd, 0xe6, 0xd5, 0xff, 0xdf, 0xc9, - 0xab, 0x1e, 0x14, 0x3f, 0x85, 0xde, 0x90, 0x04, 0x0f, 0x53, 0x63, 0x3a, 0x92, 0x9f, 0xa1, 0x47, - 0x10, 0x75, 0x43, 0x16, 0xd0, 0x13, 0x14, 0x46, 0xf3, 0x89, 0x2c, 0xa2, 0x0a, 0x94, 0x26, 0x63, - 0xdd, 0x1c, 0x7c, 0x19, 0x1b, 0x53, 0xf9, 0x61, 0xf5, 0x78, 0xfc, 0x35, 0xdf, 0xfd, 0x0e, 0x00, - 0x00, 0xff, 0xff, 0x9c, 0x09, 0x1c, 0x00, 0x3c, 0x04, 0x00, 0x00, + proto.RegisterFile("github.com/loomnetwork/go-loom/builtin/types/deployer_whitelist/deployer_whitelist.proto", fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7) +} + +var fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7 = []byte{ + // 423 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xc1, 0x8f, 0xd2, 0x40, + 0x14, 0xc6, 0x6d, 0x59, 0x76, 0xbb, 0x0f, 0x37, 0x69, 0x06, 0xd8, 0x34, 0xc6, 0x98, 0x66, 0x4e, + 0x84, 0x68, 0xab, 0x78, 0x31, 0xde, 0x30, 0x20, 0x21, 0x11, 0x9a, 0x14, 0x63, 0xb8, 0x19, 0xb0, + 0x4f, 0x98, 0x58, 0x3a, 0xb5, 0x33, 0x40, 0x38, 0xf9, 0xaf, 0x1b, 0xe8, 0xb4, 0x50, 0x40, 0x8c, + 0xc1, 0x4b, 0xd3, 0xf9, 0xe6, 0xeb, 0xef, 0x9b, 0xf7, 0xde, 0x14, 0xc6, 0x33, 0x26, 0xe7, 0xcb, + 0xa9, 0xf3, 0x8d, 0x2f, 0xdc, 0x90, 0xf3, 0x45, 0x84, 0x72, 0xcd, 0x93, 0x1f, 0xee, 0x8c, 0xbf, + 0xda, 0x2e, 0xdd, 0xe9, 0x92, 0x85, 0x92, 0x45, 0xae, 0xdc, 0xc4, 0x28, 0xdc, 0x00, 0xe3, 0x90, + 0x6f, 0x30, 0xf9, 0xba, 0x9e, 0x33, 0x89, 0x21, 0x13, 0xf2, 0x8c, 0xe4, 0xc4, 0x09, 0x97, 0x9c, + 0x90, 0xd3, 0x9d, 0x67, 0xaf, 0xff, 0x92, 0x96, 0xa6, 0xec, 0x9e, 0x29, 0x85, 0xfe, 0x82, 0x4a, + 0x3f, 0x62, 0xd2, 0xc7, 0x9f, 0x4b, 0x14, 0x92, 0xbc, 0x80, 0x32, 0x5f, 0x47, 0x98, 0x58, 0x9a, + 0xad, 0x35, 0x2a, 0x2d, 0xc3, 0x69, 0x07, 0x41, 0x82, 0x42, 0xf8, 0xa9, 0x4c, 0xde, 0xc3, 0x7d, + 0x16, 0x2b, 0x2c, 0xdd, 0x2e, 0x35, 0x2a, 0xad, 0xe7, 0xce, 0x99, 0x23, 0x76, 0x94, 0xe4, 0xef, + 0xed, 0xa4, 0x06, 0xe5, 0xef, 0xe1, 0x64, 0x26, 0xac, 0x92, 0xad, 0x35, 0x1e, 0xfc, 0x74, 0x41, + 0x3b, 0x60, 0x64, 0x66, 0x42, 0xe1, 0x6e, 0x92, 0xe6, 0x9d, 0xe4, 0x67, 0x1b, 0x7b, 0x8a, 0x7e, + 0x48, 0x19, 0x03, 0x69, 0x07, 0x41, 0x9e, 0xaa, 0xaa, 0x79, 0x09, 0x4f, 0xb3, 0xf8, 0x2d, 0xe7, + 0x04, 0x5a, 0xd8, 0xfd, 0x03, 0xb9, 0x0e, 0xd5, 0x02, 0x59, 0xc4, 0x3c, 0x12, 0x48, 0x3f, 0x00, + 0xe9, 0xa1, 0xbc, 0x2a, 0x90, 0x7a, 0x50, 0x2d, 0x30, 0x52, 0x34, 0x79, 0x07, 0x46, 0x66, 0x53, + 0x80, 0xcb, 0x2d, 0xce, 0xdd, 0xb4, 0x0b, 0x75, 0x1f, 0x17, 0x7c, 0x85, 0xd7, 0x9d, 0xcb, 0x82, + 0xc7, 0x63, 0x8c, 0xaa, 0xfa, 0x11, 0x6a, 0x9f, 0x98, 0xc8, 0x8f, 0x2c, 0x14, 0x9f, 0x8e, 0xa0, + 0x7e, 0xa4, 0xab, 0x5a, 0x0a, 0xf7, 0x45, 0xfb, 0xa7, 0xfb, 0x42, 0x9b, 0x40, 0x46, 0x28, 0xbd, + 0x15, 0x26, 0x09, 0x0b, 0x30, 0x2b, 0x25, 0x9f, 0x92, 0x76, 0x38, 0x25, 0x0f, 0xaa, 0x05, 0xef, + 0xbe, 0x95, 0x5c, 0x69, 0x97, 0x5a, 0x99, 0x7f, 0x97, 0xbb, 0x69, 0x6d, 0x37, 0xdf, 0xa3, 0x70, + 0x35, 0xb1, 0xff, 0x18, 0x63, 0x83, 0x91, 0xa9, 0xe7, 0x2b, 0x6b, 0xbe, 0x81, 0xf2, 0xc7, 0xed, + 0x0b, 0x31, 0xe0, 0x66, 0xe8, 0x0d, 0xbb, 0xe6, 0x13, 0x72, 0x0b, 0x7a, 0xcf, 0x33, 0x35, 0x72, + 0x07, 0xa5, 0xee, 0x97, 0x81, 0xa9, 0x93, 0x07, 0xb8, 0x1f, 0xf4, 0x7b, 0x7e, 0xfb, 0x73, 0xdf, + 0x1b, 0x9a, 0x37, 0xd3, 0xdb, 0xdd, 0xaf, 0xfd, 0xf6, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x65, + 0xca, 0xaa, 0xae, 0x7c, 0x04, 0x00, 0x00, } diff --git a/builtin/types/deployer_whitelist/deployer_whitelist.proto b/builtin/types/deployer_whitelist/deployer_whitelist.proto index 87e8d3a1..e85a4fde 100644 --- a/builtin/types/deployer_whitelist/deployer_whitelist.proto +++ b/builtin/types/deployer_whitelist/deployer_whitelist.proto @@ -52,16 +52,21 @@ message ListDeployersResponse { repeated Deployer deployers = 1; } -message SetDefaultDeployerRequest { +message SetOverrideRequest { uint32 flags = 1; } -message SetDefaultDeployerResponse { +message SetOverrideResponse { + Override override = 1; } -message GetDefaultDeployerRequest { +message GetOverrideRequest { } -message GetDefaultDeployerResponse { - Deployer deployer = 1; +message GetOverrideResponse { + Override override = 1; +} + +message Override { + uint32 flags = 1; } \ No newline at end of file From a9a6f5cb8b0c0e465d1c2aebf543f57439c8f56e Mon Sep 17 00:00:00 2001 From: pathornteng Date: Thu, 18 Apr 2019 11:47:57 +0700 Subject: [PATCH 3/3] remove unused var --- .../deployer_whitelist.pb.go | 151 ++++++------------ .../deployer_whitelist.proto | 6 - 2 files changed, 51 insertions(+), 106 deletions(-) diff --git a/builtin/types/deployer_whitelist/deployer_whitelist.pb.go b/builtin/types/deployer_whitelist/deployer_whitelist.pb.go index b8c83850..2eb29627 100644 --- a/builtin/types/deployer_whitelist/deployer_whitelist.pb.go +++ b/builtin/types/deployer_whitelist/deployer_whitelist.pb.go @@ -45,24 +45,22 @@ func (x Flags) String() string { return proto.EnumName(Flags_name, int32(x)) } func (Flags) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{0} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{0} } type InitRequest struct { - Owner *types.Address `protobuf:"bytes,1,opt,name=owner" json:"owner,omitempty"` - Deployers []*Deployer `protobuf:"bytes,2,rep,name=deployers" json:"deployers,omitempty"` - // default deployer flags - Flags uint32 `protobuf:"varint,3,opt,name=flags,proto3" json:"flags,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Owner *types.Address `protobuf:"bytes,1,opt,name=owner" json:"owner,omitempty"` + Deployers []*Deployer `protobuf:"bytes,2,rep,name=deployers" json:"deployers,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *InitRequest) Reset() { *m = InitRequest{} } func (m *InitRequest) String() string { return proto.CompactTextString(m) } func (*InitRequest) ProtoMessage() {} func (*InitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{0} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{0} } func (m *InitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitRequest.Unmarshal(m, b) @@ -96,13 +94,6 @@ func (m *InitRequest) GetDeployers() []*Deployer { return nil } -func (m *InitRequest) GetFlags() uint32 { - if m != nil { - return m.Flags - } - return 0 -} - type Deployer struct { Address *types.Address `protobuf:"bytes,1,opt,name=address" json:"address,omitempty"` Flags uint32 `protobuf:"varint,2,opt,name=flags,proto3" json:"flags,omitempty"` @@ -115,7 +106,7 @@ func (m *Deployer) Reset() { *m = Deployer{} } func (m *Deployer) String() string { return proto.CompactTextString(m) } func (*Deployer) ProtoMessage() {} func (*Deployer) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{1} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{1} } func (m *Deployer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Deployer.Unmarshal(m, b) @@ -161,7 +152,7 @@ func (m *AddDeployerRequest) Reset() { *m = AddDeployerRequest{} } func (m *AddDeployerRequest) String() string { return proto.CompactTextString(m) } func (*AddDeployerRequest) ProtoMessage() {} func (*AddDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{2} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{2} } func (m *AddDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddDeployerRequest.Unmarshal(m, b) @@ -205,7 +196,7 @@ func (m *AddDeployerResponse) Reset() { *m = AddDeployerResponse{} } func (m *AddDeployerResponse) String() string { return proto.CompactTextString(m) } func (*AddDeployerResponse) ProtoMessage() {} func (*AddDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{3} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{3} } func (m *AddDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddDeployerResponse.Unmarshal(m, b) @@ -236,7 +227,7 @@ func (m *GetDeployerRequest) Reset() { *m = GetDeployerRequest{} } func (m *GetDeployerRequest) String() string { return proto.CompactTextString(m) } func (*GetDeployerRequest) ProtoMessage() {} func (*GetDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{4} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{4} } func (m *GetDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDeployerRequest.Unmarshal(m, b) @@ -274,7 +265,7 @@ func (m *GetDeployerResponse) Reset() { *m = GetDeployerResponse{} } func (m *GetDeployerResponse) String() string { return proto.CompactTextString(m) } func (*GetDeployerResponse) ProtoMessage() {} func (*GetDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{5} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{5} } func (m *GetDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDeployerResponse.Unmarshal(m, b) @@ -312,7 +303,7 @@ func (m *RemoveDeployerRequest) Reset() { *m = RemoveDeployerRequest{} } func (m *RemoveDeployerRequest) String() string { return proto.CompactTextString(m) } func (*RemoveDeployerRequest) ProtoMessage() {} func (*RemoveDeployerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{6} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{6} } func (m *RemoveDeployerRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveDeployerRequest.Unmarshal(m, b) @@ -349,7 +340,7 @@ func (m *RemoveDeployerResponse) Reset() { *m = RemoveDeployerResponse{} func (m *RemoveDeployerResponse) String() string { return proto.CompactTextString(m) } func (*RemoveDeployerResponse) ProtoMessage() {} func (*RemoveDeployerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{7} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{7} } func (m *RemoveDeployerResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveDeployerResponse.Unmarshal(m, b) @@ -379,7 +370,7 @@ func (m *ListDeployersRequest) Reset() { *m = ListDeployersRequest{} } func (m *ListDeployersRequest) String() string { return proto.CompactTextString(m) } func (*ListDeployersRequest) ProtoMessage() {} func (*ListDeployersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{8} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{8} } func (m *ListDeployersRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListDeployersRequest.Unmarshal(m, b) @@ -410,7 +401,7 @@ func (m *ListDeployersResponse) Reset() { *m = ListDeployersResponse{} } func (m *ListDeployersResponse) String() string { return proto.CompactTextString(m) } func (*ListDeployersResponse) ProtoMessage() {} func (*ListDeployersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{9} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{9} } func (m *ListDeployersResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListDeployersResponse.Unmarshal(m, b) @@ -448,7 +439,7 @@ func (m *SetOverrideRequest) Reset() { *m = SetOverrideRequest{} } func (m *SetOverrideRequest) String() string { return proto.CompactTextString(m) } func (*SetOverrideRequest) ProtoMessage() {} func (*SetOverrideRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{10} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{10} } func (m *SetOverrideRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetOverrideRequest.Unmarshal(m, b) @@ -475,44 +466,6 @@ func (m *SetOverrideRequest) GetFlags() uint32 { return 0 } -type SetOverrideResponse struct { - Override *Override `protobuf:"bytes,1,opt,name=override" json:"override,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *SetOverrideResponse) Reset() { *m = SetOverrideResponse{} } -func (m *SetOverrideResponse) String() string { return proto.CompactTextString(m) } -func (*SetOverrideResponse) ProtoMessage() {} -func (*SetOverrideResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{11} -} -func (m *SetOverrideResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_SetOverrideResponse.Unmarshal(m, b) -} -func (m *SetOverrideResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_SetOverrideResponse.Marshal(b, m, deterministic) -} -func (dst *SetOverrideResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetOverrideResponse.Merge(dst, src) -} -func (m *SetOverrideResponse) XXX_Size() int { - return xxx_messageInfo_SetOverrideResponse.Size(m) -} -func (m *SetOverrideResponse) XXX_DiscardUnknown() { - xxx_messageInfo_SetOverrideResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_SetOverrideResponse proto.InternalMessageInfo - -func (m *SetOverrideResponse) GetOverride() *Override { - if m != nil { - return m.Override - } - return nil -} - type GetOverrideRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -523,7 +476,7 @@ func (m *GetOverrideRequest) Reset() { *m = GetOverrideRequest{} } func (m *GetOverrideRequest) String() string { return proto.CompactTextString(m) } func (*GetOverrideRequest) ProtoMessage() {} func (*GetOverrideRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{12} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{11} } func (m *GetOverrideRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetOverrideRequest.Unmarshal(m, b) @@ -554,7 +507,7 @@ func (m *GetOverrideResponse) Reset() { *m = GetOverrideResponse{} } func (m *GetOverrideResponse) String() string { return proto.CompactTextString(m) } func (*GetOverrideResponse) ProtoMessage() {} func (*GetOverrideResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{13} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{12} } func (m *GetOverrideResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetOverrideResponse.Unmarshal(m, b) @@ -592,7 +545,7 @@ func (m *Override) Reset() { *m = Override{} } func (m *Override) String() string { return proto.CompactTextString(m) } func (*Override) ProtoMessage() {} func (*Override) Descriptor() ([]byte, []int) { - return fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7, []int{14} + return fileDescriptor_deployer_whitelist_a8204d55b887d487, []int{13} } func (m *Override) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Override.Unmarshal(m, b) @@ -631,7 +584,6 @@ func init() { proto.RegisterType((*ListDeployersRequest)(nil), "deployer_whitelist.ListDeployersRequest") proto.RegisterType((*ListDeployersResponse)(nil), "deployer_whitelist.ListDeployersResponse") proto.RegisterType((*SetOverrideRequest)(nil), "deployer_whitelist.SetOverrideRequest") - proto.RegisterType((*SetOverrideResponse)(nil), "deployer_whitelist.SetOverrideResponse") proto.RegisterType((*GetOverrideRequest)(nil), "deployer_whitelist.GetOverrideRequest") proto.RegisterType((*GetOverrideResponse)(nil), "deployer_whitelist.GetOverrideResponse") proto.RegisterType((*Override)(nil), "deployer_whitelist.Override") @@ -639,36 +591,35 @@ func init() { } func init() { - proto.RegisterFile("github.com/loomnetwork/go-loom/builtin/types/deployer_whitelist/deployer_whitelist.proto", fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7) -} - -var fileDescriptor_deployer_whitelist_60a0f5e767ee1ee7 = []byte{ - // 423 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xc1, 0x8f, 0xd2, 0x40, - 0x14, 0xc6, 0x6d, 0x59, 0x76, 0xbb, 0x0f, 0x37, 0x69, 0x06, 0xd8, 0x34, 0xc6, 0x98, 0x66, 0x4e, - 0x84, 0x68, 0xab, 0x78, 0x31, 0xde, 0x30, 0x20, 0x21, 0x11, 0x9a, 0x14, 0x63, 0xb8, 0x19, 0xb0, - 0x4f, 0x98, 0x58, 0x3a, 0xb5, 0x33, 0x40, 0x38, 0xf9, 0xaf, 0x1b, 0xe8, 0xb4, 0x50, 0x40, 0x8c, - 0xc1, 0x4b, 0xd3, 0xf9, 0xe6, 0xeb, 0xef, 0x9b, 0xf7, 0xde, 0x14, 0xc6, 0x33, 0x26, 0xe7, 0xcb, - 0xa9, 0xf3, 0x8d, 0x2f, 0xdc, 0x90, 0xf3, 0x45, 0x84, 0x72, 0xcd, 0x93, 0x1f, 0xee, 0x8c, 0xbf, - 0xda, 0x2e, 0xdd, 0xe9, 0x92, 0x85, 0x92, 0x45, 0xae, 0xdc, 0xc4, 0x28, 0xdc, 0x00, 0xe3, 0x90, - 0x6f, 0x30, 0xf9, 0xba, 0x9e, 0x33, 0x89, 0x21, 0x13, 0xf2, 0x8c, 0xe4, 0xc4, 0x09, 0x97, 0x9c, - 0x90, 0xd3, 0x9d, 0x67, 0xaf, 0xff, 0x92, 0x96, 0xa6, 0xec, 0x9e, 0x29, 0x85, 0xfe, 0x82, 0x4a, - 0x3f, 0x62, 0xd2, 0xc7, 0x9f, 0x4b, 0x14, 0x92, 0xbc, 0x80, 0x32, 0x5f, 0x47, 0x98, 0x58, 0x9a, - 0xad, 0x35, 0x2a, 0x2d, 0xc3, 0x69, 0x07, 0x41, 0x82, 0x42, 0xf8, 0xa9, 0x4c, 0xde, 0xc3, 0x7d, - 0x16, 0x2b, 0x2c, 0xdd, 0x2e, 0x35, 0x2a, 0xad, 0xe7, 0xce, 0x99, 0x23, 0x76, 0x94, 0xe4, 0xef, - 0xed, 0xa4, 0x06, 0xe5, 0xef, 0xe1, 0x64, 0x26, 0xac, 0x92, 0xad, 0x35, 0x1e, 0xfc, 0x74, 0x41, - 0x3b, 0x60, 0x64, 0x66, 0x42, 0xe1, 0x6e, 0x92, 0xe6, 0x9d, 0xe4, 0x67, 0x1b, 0x7b, 0x8a, 0x7e, - 0x48, 0x19, 0x03, 0x69, 0x07, 0x41, 0x9e, 0xaa, 0xaa, 0x79, 0x09, 0x4f, 0xb3, 0xf8, 0x2d, 0xe7, - 0x04, 0x5a, 0xd8, 0xfd, 0x03, 0xb9, 0x0e, 0xd5, 0x02, 0x59, 0xc4, 0x3c, 0x12, 0x48, 0x3f, 0x00, - 0xe9, 0xa1, 0xbc, 0x2a, 0x90, 0x7a, 0x50, 0x2d, 0x30, 0x52, 0x34, 0x79, 0x07, 0x46, 0x66, 0x53, - 0x80, 0xcb, 0x2d, 0xce, 0xdd, 0xb4, 0x0b, 0x75, 0x1f, 0x17, 0x7c, 0x85, 0xd7, 0x9d, 0xcb, 0x82, - 0xc7, 0x63, 0x8c, 0xaa, 0xfa, 0x11, 0x6a, 0x9f, 0x98, 0xc8, 0x8f, 0x2c, 0x14, 0x9f, 0x8e, 0xa0, - 0x7e, 0xa4, 0xab, 0x5a, 0x0a, 0xf7, 0x45, 0xfb, 0xa7, 0xfb, 0x42, 0x9b, 0x40, 0x46, 0x28, 0xbd, - 0x15, 0x26, 0x09, 0x0b, 0x30, 0x2b, 0x25, 0x9f, 0x92, 0x76, 0x38, 0x25, 0x0f, 0xaa, 0x05, 0xef, - 0xbe, 0x95, 0x5c, 0x69, 0x97, 0x5a, 0x99, 0x7f, 0x97, 0xbb, 0x69, 0x6d, 0x37, 0xdf, 0xa3, 0x70, - 0x35, 0xb1, 0xff, 0x18, 0x63, 0x83, 0x91, 0xa9, 0xe7, 0x2b, 0x6b, 0xbe, 0x81, 0xf2, 0xc7, 0xed, - 0x0b, 0x31, 0xe0, 0x66, 0xe8, 0x0d, 0xbb, 0xe6, 0x13, 0x72, 0x0b, 0x7a, 0xcf, 0x33, 0x35, 0x72, - 0x07, 0xa5, 0xee, 0x97, 0x81, 0xa9, 0x93, 0x07, 0xb8, 0x1f, 0xf4, 0x7b, 0x7e, 0xfb, 0x73, 0xdf, - 0x1b, 0x9a, 0x37, 0xd3, 0xdb, 0xdd, 0xaf, 0xfd, 0xf6, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x65, - 0xca, 0xaa, 0xae, 0x7c, 0x04, 0x00, 0x00, + proto.RegisterFile("github.com/loomnetwork/go-loom/builtin/types/deployer_whitelist/deployer_whitelist.proto", fileDescriptor_deployer_whitelist_a8204d55b887d487) +} + +var fileDescriptor_deployer_whitelist_a8204d55b887d487 = []byte{ + // 406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0xcb, 0xeb, 0xda, 0x40, + 0x10, 0xc7, 0x1b, 0x9f, 0x71, 0xac, 0x10, 0xd6, 0x07, 0x52, 0x4a, 0x91, 0x3d, 0x89, 0xb4, 0x49, + 0x6b, 0x2f, 0xa5, 0x37, 0x8b, 0x56, 0x84, 0x6a, 0x20, 0x96, 0xe2, 0xad, 0x68, 0x33, 0xd5, 0xa5, + 0x31, 0x9b, 0x66, 0x57, 0xc5, 0xff, 0xbe, 0xc4, 0x6c, 0x62, 0xa3, 0xd6, 0xf2, 0xc3, 0x4b, 0xc8, + 0x7e, 0x67, 0xf2, 0xf9, 0xce, 0x63, 0x03, 0x8b, 0x35, 0x93, 0x9b, 0xdd, 0xca, 0xfc, 0xc1, 0xb7, + 0x96, 0xc7, 0xf9, 0xd6, 0x47, 0x79, 0xe0, 0xe1, 0x2f, 0x6b, 0xcd, 0xdf, 0x44, 0x47, 0x6b, 0xb5, + 0x63, 0x9e, 0x64, 0xbe, 0x25, 0x8f, 0x01, 0x0a, 0xcb, 0xc5, 0xc0, 0xe3, 0x47, 0x0c, 0xbf, 0x1f, + 0x36, 0x4c, 0xa2, 0xc7, 0x84, 0xbc, 0x21, 0x99, 0x41, 0xc8, 0x25, 0x27, 0xe4, 0x3a, 0xf2, 0xe2, + 0xed, 0x7f, 0xdc, 0x62, 0x97, 0xd3, 0x33, 0xa6, 0x50, 0x06, 0xd5, 0x89, 0xcf, 0xa4, 0x83, 0xbf, + 0x77, 0x28, 0x24, 0x79, 0x05, 0x45, 0x7e, 0xf0, 0x31, 0x6c, 0x6b, 0x1d, 0xad, 0x5b, 0xed, 0xeb, + 0xe6, 0xc0, 0x75, 0x43, 0x14, 0xc2, 0x89, 0x65, 0xf2, 0x11, 0x2a, 0x89, 0xad, 0x68, 0xe7, 0x3a, + 0xf9, 0x6e, 0xb5, 0xff, 0xd2, 0xbc, 0x51, 0xe2, 0x50, 0x49, 0xce, 0x39, 0x9d, 0x0e, 0x41, 0x4f, + 0x64, 0x42, 0xa1, 0xbc, 0x8c, 0xc9, 0x57, 0x4e, 0x49, 0x80, 0x34, 0xa0, 0xf8, 0xd3, 0x5b, 0xae, + 0x23, 0x1f, 0xad, 0x5b, 0x73, 0xe2, 0x03, 0x5d, 0x00, 0x19, 0xb8, 0x6e, 0xca, 0x57, 0x75, 0xbf, + 0x86, 0xe7, 0x89, 0x51, 0xc4, 0xb9, 0x82, 0x66, 0xa2, 0xff, 0x20, 0x37, 0xa1, 0x9e, 0x21, 0x8b, + 0x80, 0xfb, 0x02, 0xe9, 0x27, 0x20, 0x63, 0x94, 0x0f, 0x19, 0x52, 0x1b, 0xea, 0x19, 0x46, 0x8c, + 0x26, 0x1f, 0x40, 0x4f, 0xd2, 0x14, 0xe0, 0xfe, 0x30, 0xd3, 0x6c, 0x3a, 0x82, 0xa6, 0x83, 0x5b, + 0xbe, 0xc7, 0xc7, 0xea, 0x6a, 0x43, 0xeb, 0x12, 0xa3, 0xba, 0x6e, 0x41, 0xe3, 0x0b, 0x13, 0x69, + 0xc9, 0x42, 0xf1, 0xe9, 0x1c, 0x9a, 0x17, 0xba, 0xea, 0x25, 0x73, 0x33, 0xb4, 0xa7, 0xdd, 0x8c, + 0x1e, 0x90, 0x39, 0x4a, 0x7b, 0x8f, 0x61, 0xc8, 0x5c, 0x4c, 0x5a, 0x49, 0xb7, 0xa4, 0xfd, 0xbd, + 0xa5, 0xc6, 0x69, 0x1d, 0x17, 0xb9, 0x6a, 0xc0, 0x67, 0xf5, 0x3c, 0x60, 0xae, 0xb4, 0x7b, 0x03, + 0x4e, 0xbf, 0x4b, 0xb3, 0x69, 0x07, 0xf4, 0x44, 0xbd, 0x5d, 0x48, 0xef, 0x1d, 0x14, 0x3f, 0x47, + 0x2f, 0x44, 0x87, 0xc2, 0xcc, 0x9e, 0x8d, 0x8c, 0x67, 0xa4, 0x04, 0xb9, 0xb1, 0x6d, 0x68, 0xa4, + 0x0c, 0xf9, 0xd1, 0xb7, 0xa9, 0x91, 0x23, 0x35, 0xa8, 0x4c, 0x27, 0x63, 0x67, 0xf0, 0x75, 0x62, + 0xcf, 0x8c, 0xc2, 0xaa, 0x74, 0xfa, 0xe7, 0xde, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x4e, + 0xe2, 0xfd, 0x15, 0x04, 0x00, 0x00, } diff --git a/builtin/types/deployer_whitelist/deployer_whitelist.proto b/builtin/types/deployer_whitelist/deployer_whitelist.proto index e85a4fde..5d65fa69 100644 --- a/builtin/types/deployer_whitelist/deployer_whitelist.proto +++ b/builtin/types/deployer_whitelist/deployer_whitelist.proto @@ -5,8 +5,6 @@ import "github.com/loomnetwork/go-loom/types/types.proto"; message InitRequest { Address owner = 1; repeated Deployer deployers = 2; - //default deployer flags - uint32 flags = 3; } enum Flags { @@ -56,10 +54,6 @@ message SetOverrideRequest { uint32 flags = 1; } -message SetOverrideResponse { - Override override = 1; -} - message GetOverrideRequest { }