Merge pull request #43 from planetmint/32-rename-machineissue-to-reissue

32 rename machineissue to reissue
This commit is contained in:
Julian Strobl 2023-07-20 09:06:16 +02:00 committed by GitHub
commit bb39d64653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 49 additions and 41 deletions

2
go.mod
View File

@ -22,6 +22,7 @@ require (
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
google.golang.org/grpc v1.55.0
gopkg.in/yaml.v2 v2.4.0
sigs.k8s.io/yaml v1.3.0
)
require (
@ -162,7 +163,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
nhooyr.io/websocket v1.8.6 // indirect
pgregory.net/rapid v0.5.5 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
replace github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7

View File

@ -7,7 +7,7 @@ message Machine {
string name = 1;
string ticker = 2;
uint64 issued = 3;
bool reissue = 3;
uint64 amount = 4;
uint64 precision = 5;
string issuerPlanetmint = 6;

View File

@ -46,7 +46,7 @@ func Machine(name, pubKey string) machinetypes.Machine {
m := machinetypes.Machine{
Name: name,
Ticker: name + "_ticker",
Issued: 1,
Reissue: true,
Amount: 1000,
Precision: 8,
IssuerPlanetmint: pubKey,

View File

@ -32,7 +32,6 @@ var _ io.Reader
var _ status.Status
var _ = runtime.String
var _ = utilities.NewDoubleArray
//lint:ignore SA1019 file is generated
var _ = descriptor.ForMessage
var _ = metadata.Join

View File

@ -11,6 +11,10 @@ import (
func (k msgServer) AttestMachine(goCtx context.Context, msg *types.MsgAttestMachine) (*types.MsgAttestMachineResponse, error) {
ctx := sdk.UnwrapSDKContext(goCtx)
if msg.Machine.Reissue {
k.Logger(ctx).Info("TODO Implement handle on reissue == true")
}
k.StoreMachine(ctx, *msg.Machine)
k.StoreMachineIndex(ctx, *msg.Machine)

View File

@ -25,7 +25,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
type Machine struct {
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
Ticker string `protobuf:"bytes,2,opt,name=ticker,proto3" json:"ticker,omitempty"`
Issued uint64 `protobuf:"varint,3,opt,name=issued,proto3" json:"issued,omitempty"`
Reissue bool `protobuf:"varint,3,opt,name=reissue,proto3" json:"reissue,omitempty"`
Amount uint64 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount,omitempty"`
Precision uint64 `protobuf:"varint,5,opt,name=precision,proto3" json:"precision,omitempty"`
IssuerPlanetmint string `protobuf:"bytes,6,opt,name=issuerPlanetmint,proto3" json:"issuerPlanetmint,omitempty"`
@ -81,11 +81,11 @@ func (m *Machine) GetTicker() string {
return ""
}
func (m *Machine) GetIssued() uint64 {
func (m *Machine) GetReissue() bool {
if m != nil {
return m.Issued
return m.Reissue
}
return 0
return false
}
func (m *Machine) GetAmount() uint64 {
@ -269,31 +269,31 @@ func init() {
}
var fileDescriptor_1bb279745bef7c4b = []byte{
// 371 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x41, 0x4f, 0xf2, 0x30,
0x18, 0xc7, 0x29, 0xe3, 0x05, 0xd6, 0x97, 0x44, 0x6c, 0x8c, 0xe9, 0x41, 0x1b, 0xb2, 0xd3, 0x62,
0x74, 0x24, 0x7a, 0x30, 0xf1, 0xa8, 0x5c, 0x48, 0x24, 0x31, 0x3b, 0x7a, 0xab, 0x6b, 0xc5, 0x46,
0xd6, 0xcd, 0xb5, 0x18, 0x4c, 0xfc, 0x08, 0x1e, 0xfc, 0x22, 0x7e, 0x0f, 0x8f, 0x1c, 0x3d, 0x1a,
0xf8, 0x22, 0x66, 0x5d, 0x01, 0x61, 0x1c, 0x3c, 0xed, 0x79, 0x7e, 0xcf, 0x7f, 0xe9, 0x9e, 0xdf,
0x0a, 0xbd, 0x74, 0x44, 0x25, 0xd7, 0xb1, 0x90, 0x7a, 0x98, 0x74, 0x63, 0x1a, 0x3d, 0x08, 0xc9,
0x17, 0xcf, 0x20, 0xcd, 0x12, 0x9d, 0xa0, 0xbd, 0xdf, 0x99, 0xc0, 0xce, 0xbc, 0x8f, 0x2a, 0x6c,
0x0c, 0x8a, 0x1a, 0x21, 0x58, 0x93, 0x34, 0xe6, 0x18, 0x74, 0x80, 0xef, 0x86, 0xa6, 0x46, 0xfb,
0xb0, 0xae, 0x45, 0xf4, 0xc8, 0x33, 0x5c, 0x35, 0xd4, 0x76, 0x39, 0x17, 0x4a, 0x8d, 0x39, 0xc3,
0x4e, 0x07, 0xf8, 0xb5, 0xd0, 0x76, 0x39, 0xa7, 0x71, 0x32, 0x96, 0x1a, 0xd7, 0x0a, 0x5e, 0x74,
0xe8, 0x00, 0xba, 0x69, 0xc6, 0x23, 0xa1, 0x44, 0x22, 0xf1, 0x3f, 0x33, 0x5a, 0x01, 0x74, 0x04,
0xdb, 0xe6, 0xfd, 0xec, 0x66, 0xf9, 0x8d, 0xb8, 0x6e, 0xce, 0x2b, 0x71, 0xe4, 0xc1, 0x56, 0xc1,
0xae, 0xc5, 0xd3, 0x58, 0x30, 0xdc, 0x30, 0xb9, 0x35, 0x96, 0x9f, 0x66, 0x17, 0xec, 0x33, 0xdc,
0x34, 0x81, 0x15, 0x40, 0x17, 0xb0, 0x19, 0x73, 0x4d, 0x19, 0xd5, 0x14, 0xbb, 0x1d, 0xe0, 0xff,
0x3f, 0x25, 0xc1, 0x36, 0x39, 0xc1, 0xc0, 0xa6, 0xc2, 0x65, 0xde, 0x7b, 0x03, 0xb0, 0xb9, 0xc0,
0xa8, 0x0d, 0x9d, 0x61, 0xaa, 0xac, 0xaf, 0xbc, 0xcc, 0xd7, 0x67, 0xfc, 0x59, 0x44, 0x7c, 0xa1,
0xab, 0xe8, 0x90, 0x0f, 0x77, 0xa8, 0x52, 0x5c, 0xf7, 0xf8, 0xbd, 0x90, 0x42, 0xe7, 0x12, 0x1c,
0x13, 0xd8, 0xc4, 0xe8, 0x18, 0xee, 0x52, 0xc6, 0x4c, 0x4d, 0x47, 0x3d, 0xaa, 0xe9, 0x55, 0xbf,
0x67, 0x5c, 0xba, 0x61, 0x79, 0xe0, 0xbd, 0xc2, 0x96, 0xfd, 0x7b, 0x7d, 0xc9, 0xf8, 0x64, 0x7d,
0x71, 0xb0, 0xb9, 0xf8, 0x36, 0xcd, 0xd5, 0x3f, 0x6a, 0x76, 0xca, 0x9a, 0x2f, 0xcf, 0x3f, 0x67,
0x04, 0x4c, 0x67, 0x04, 0x7c, 0xcf, 0x08, 0x78, 0x9f, 0x93, 0xca, 0x74, 0x4e, 0x2a, 0x5f, 0x73,
0x52, 0xb9, 0x3d, 0x5c, 0xf9, 0x3c, 0x19, 0x26, 0xdd, 0xc9, 0xf2, 0x4e, 0xea, 0x97, 0x94, 0xab,
0xbb, 0xba, 0xb9, 0x92, 0x67, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd5, 0x3f, 0x35, 0x20, 0xb8,
0x02, 0x00, 0x00,
// 378 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4a, 0xeb, 0x40,
0x14, 0xc6, 0x3b, 0x4d, 0x6f, 0x9b, 0x9c, 0x5b, 0xb8, 0xbd, 0xc3, 0xe5, 0x32, 0x0b, 0x0d, 0x21,
0xab, 0x20, 0x9a, 0x82, 0x2e, 0x04, 0x97, 0xda, 0x4d, 0xc1, 0x82, 0x64, 0xe9, 0x6e, 0x4c, 0x8e,
0x75, 0xb0, 0x99, 0xc4, 0x64, 0x2a, 0x15, 0x7c, 0x04, 0x17, 0xbe, 0x89, 0xaf, 0xe1, 0xb2, 0x4b,
0x97, 0xd2, 0xbe, 0x88, 0x64, 0x9a, 0xb4, 0xf6, 0xcf, 0xc2, 0x55, 0xce, 0xf9, 0xce, 0x37, 0x4c,
0xbe, 0xdf, 0x1c, 0x70, 0xd3, 0x11, 0x97, 0xa8, 0x62, 0x21, 0xd5, 0x30, 0xe9, 0xc6, 0x3c, 0xbc,
0x13, 0x12, 0xab, 0xaf, 0x9f, 0x66, 0x89, 0x4a, 0xe8, 0xbf, 0xef, 0x1e, 0xbf, 0x9c, 0xb9, 0x6f,
0x75, 0x68, 0x0d, 0x16, 0x35, 0xa5, 0xd0, 0x90, 0x3c, 0x46, 0x46, 0x1c, 0xe2, 0x59, 0x81, 0xae,
0xe9, 0x7f, 0x68, 0x2a, 0x11, 0xde, 0x63, 0xc6, 0xea, 0x5a, 0x2d, 0x3b, 0xca, 0xa0, 0x95, 0xa1,
0xc8, 0xf3, 0x31, 0x32, 0xc3, 0x21, 0x9e, 0x19, 0x54, 0x6d, 0x71, 0x82, 0xc7, 0xc9, 0x58, 0x2a,
0xd6, 0x70, 0x88, 0xd7, 0x08, 0xca, 0x8e, 0xee, 0x81, 0x95, 0x66, 0x18, 0x8a, 0x5c, 0x24, 0x92,
0xfd, 0xd2, 0xa3, 0x95, 0x40, 0x0f, 0xa0, 0xa3, 0x8f, 0x67, 0x57, 0xcb, 0xbf, 0x64, 0x4d, 0x7d,
0xe3, 0x96, 0x4e, 0x5d, 0x68, 0x2f, 0xb4, 0x4b, 0xf1, 0x30, 0x16, 0x11, 0x6b, 0x69, 0xdf, 0x9a,
0x56, 0xdc, 0x56, 0x46, 0xec, 0x47, 0xcc, 0xd4, 0x86, 0x95, 0x40, 0xcf, 0xc0, 0x8c, 0x51, 0xf1,
0x88, 0x2b, 0xce, 0x2c, 0x87, 0x78, 0xbf, 0x8f, 0x6d, 0x7f, 0x17, 0x1e, 0x7f, 0x50, 0xba, 0x82,
0xa5, 0xdf, 0x7d, 0x21, 0x60, 0x56, 0x32, 0xed, 0x80, 0x31, 0x4c, 0xf3, 0x92, 0x58, 0x51, 0x16,
0xf1, 0x23, 0x7c, 0x14, 0x21, 0x56, 0xc0, 0x16, 0x1d, 0xf5, 0xe0, 0x0f, 0xcf, 0x73, 0x54, 0x3d,
0xbc, 0x15, 0x52, 0xa8, 0x02, 0x82, 0xa1, 0x0d, 0x9b, 0x32, 0x3d, 0x84, 0xbf, 0x3c, 0x8a, 0x74,
0xcd, 0x47, 0x3d, 0xae, 0xf8, 0x45, 0xbf, 0xa7, 0x59, 0x5a, 0xc1, 0xf6, 0xc0, 0x7d, 0x86, 0x76,
0xf9, 0x7e, 0x7d, 0x19, 0xe1, 0x64, 0x3d, 0x38, 0xd9, 0x0c, 0xbe, 0x0b, 0x73, 0xfd, 0x87, 0x98,
0x8d, 0x6d, 0xcc, 0xe7, 0xa7, 0xef, 0x33, 0x9b, 0x4c, 0x67, 0x36, 0xf9, 0x9c, 0xd9, 0xe4, 0x75,
0x6e, 0xd7, 0xa6, 0x73, 0xbb, 0xf6, 0x31, 0xb7, 0x6b, 0xd7, 0xfb, 0x2b, 0x9e, 0x47, 0xc3, 0xa4,
0x3b, 0x59, 0x6e, 0xa5, 0x7a, 0x4a, 0x31, 0xbf, 0x69, 0xea, 0xa5, 0x3c, 0xf9, 0x0a, 0x00, 0x00,
0xff, 0xff, 0x35, 0x4e, 0xee, 0x2e, 0xba, 0x02, 0x00, 0x00,
}
func (m *Machine) Marshal() (dAtA []byte, err error) {
@ -359,8 +359,13 @@ func (m *Machine) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x20
}
if m.Issued != 0 {
i = encodeVarintMachine(dAtA, i, uint64(m.Issued))
if m.Reissue {
i--
if m.Reissue {
dAtA[i] = 1
} else {
dAtA[i] = 0
}
i--
dAtA[i] = 0x18
}
@ -501,8 +506,8 @@ func (m *Machine) Size() (n int) {
if l > 0 {
n += 1 + l + sovMachine(uint64(l))
}
if m.Issued != 0 {
n += 1 + sovMachine(uint64(m.Issued))
if m.Reissue {
n += 2
}
if m.Amount != 0 {
n += 1 + sovMachine(uint64(m.Amount))
@ -676,9 +681,9 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Issued", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field Reissue", wireType)
}
m.Issued = 0
var v int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowMachine
@ -688,11 +693,12 @@ func (m *Machine) Unmarshal(dAtA []byte) error {
}
b := dAtA[iNdEx]
iNdEx++
m.Issued |= uint64(b&0x7F) << shift
v |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
m.Reissue = bool(v != 0)
case 4:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType)

View File

@ -32,7 +32,6 @@ var _ io.Reader
var _ status.Status
var _ = runtime.String
var _ = utilities.NewDoubleArray
//lint:ignore SA1019 file is generated
var _ = descriptor.ForMessage
var _ = metadata.Join