Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 40 additions & 34 deletions types/transaction_invocation_target.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,19 @@ func (t *TransactionInvocationTarget) Bytes() ([]byte, error) {
return nil, err
}

var protocolMajorBytes []byte
if t.ByPackageHash.ProtocolVersionMajor != nil {
versionBytes = []byte{1} // Option Some tag
bytes, _ := encoding.NewU32ToBytesEncoder(*t.ByPackageHash.ProtocolVersionMajor).Bytes()
protocolMajorBytes = append(versionBytes, bytes...)
} else {
protocolMajorBytes = []byte{0} // Option none tag
}

if err = builder.AddField(ByPackageHashProtocolVersionMajorIndex, protocolMajorBytes); err != nil {
return nil, err
var protocolMajorBytes []byte
if t.ByPackageHash.ProtocolVersionMajor != nil {
versionBytes = []byte{1} // Option Some tag
bytes, _ := encoding.NewU32ToBytesEncoder(*t.ByPackageHash.ProtocolVersionMajor).Bytes()
protocolMajorBytes = append(versionBytes, bytes...)
} else {
protocolMajorBytes = []byte{0} // Option none tag
}

if err = builder.AddField(ByPackageHashProtocolVersionMajorIndex, protocolMajorBytes); err != nil {
return nil, err
}
}
case t.ByPackageName != nil:
if err = builder.AddField(TagFieldIndex, []byte{ByPackageNameVariant}); err != nil {
Expand All @@ -133,17 +135,19 @@ func (t *TransactionInvocationTarget) Bytes() ([]byte, error) {
return nil, err
}

var protocolMajorBytes []byte
if t.ByPackageName.ProtocolVersionMajor != nil {
versionBytes = []byte{1} // Option Some tag
bytes, _ := encoding.NewU32ToBytesEncoder(*t.ByPackageName.ProtocolVersionMajor).Bytes()
protocolMajorBytes = append(versionBytes, bytes...)
} else {
protocolMajorBytes = []byte{0} // Option none tag
}

if err = builder.AddField(ByPackageNameProtocolVersionMajorIndex, protocolMajorBytes); err != nil {
return nil, err
var protocolMajorBytes []byte
if t.ByPackageName.ProtocolVersionMajor != nil {
versionBytes = []byte{1} // Option Some tag
bytes, _ := encoding.NewU32ToBytesEncoder(*t.ByPackageName.ProtocolVersionMajor).Bytes()
protocolMajorBytes = append(versionBytes, bytes...)
} else {
protocolMajorBytes = []byte{0} // Option none tag
}

if err = builder.AddField(ByPackageNameProtocolVersionMajorIndex, protocolMajorBytes); err != nil {
return nil, err
}
}
default:
return nil, errors.New("unknown transaction invocation target")
Expand Down Expand Up @@ -175,34 +179,36 @@ func (t *TransactionInvocationTarget) serializedFieldLengths() []int {
versionSerializedLength = encoding.U32SerializedLength
}

var protocolMajorSerializedLength int
if t.ByPackageHash.ProtocolVersionMajor != nil {
protocolMajorSerializedLength = encoding.U32SerializedLength
}

return []int{
serializedLength := []int{
encoding.U8SerializedLength,
key.ByteHashLen,
encoding.U8SerializedLength + versionSerializedLength,
encoding.U8SerializedLength + protocolMajorSerializedLength,
}

if t.ByPackageHash.ProtocolVersionMajor != nil {
protocolMajorSerializedLength := encoding.U32SerializedLength
serializedLength = append(serializedLength, encoding.U8SerializedLength+protocolMajorSerializedLength)
}

return serializedLength
case t.ByPackageName != nil:
var versionSerializedLength int
if t.ByPackageName.Version != nil {
versionSerializedLength = encoding.U32SerializedLength
}

var protocolMajorSerializedLength int
if t.ByPackageName.ProtocolVersionMajor != nil {
protocolMajorSerializedLength = encoding.U32SerializedLength
}

return []int{
serializedLength := []int{
encoding.U8SerializedLength,
encoding.StringSerializedLength(t.ByPackageName.Name),
encoding.U8SerializedLength + versionSerializedLength,
encoding.U8SerializedLength + protocolMajorSerializedLength,
}

if t.ByPackageName.ProtocolVersionMajor != nil {
protocolMajorSerializedLength := encoding.U32SerializedLength
serializedLength = append(serializedLength, encoding.U8SerializedLength+protocolMajorSerializedLength)
}

return serializedLength
default:
return []int{}
}
Expand Down