Skip to content
Snippets Groups Projects
Commit 89f0a5bc authored by Hans Moog's avatar Hans Moog
Browse files

Fix: fixed broken marshalUtil

parent 594efbcb
No related branches found
No related tags found
No related merge requests found
......@@ -40,7 +40,7 @@ func New(args ...interface{}) *MarshalUtil {
func (util *MarshalUtil) Parse(parser func(data []byte) (interface{}, error, int)) (result interface{}, err error) {
result, err, readBytes := parser(util.bytes[util.readOffset:])
if err != nil {
if err == nil {
util.ReadSeek(util.readOffset + readBytes)
}
......
......@@ -65,7 +65,7 @@ func FromBytes(bytes []byte, optionalTargetObject ...*Payload) (result *Payload,
result.branchPayloadId = payloadid.New(parsedBranchPayloadId)
// parse transfer
parsedTransfer, err := marshalUtil.Parse(func(data []byte) (result interface{}, err error, consumedBytes int) { return transfer.FromBytes(data) })
parsedTransfer, err := marshalUtil.Parse(func(data []byte) (interface{}, error, int) { return transfer.FromBytes(data) })
if err != nil {
return
}
......
......@@ -51,14 +51,14 @@ func FromBytes(bytes []byte, optionalTargetObject ...*Transfer) (result *Transfe
marshalUtil := marshalutil.New(bytes)
// unmarshal inputs
parsedInputs, err := marshalUtil.Parse(func(data []byte) (result interface{}, err error, consumedBytes int) { return inputs.FromBytes(data) })
parsedInputs, err := marshalUtil.Parse(func(data []byte) (interface{}, error, int) { return inputs.FromBytes(data) })
if err != nil {
return
}
result.inputs = parsedInputs.(*inputs.Inputs)
// unmarshal outputs
parsedOutputs, err := marshalUtil.Parse(func(data []byte) (result interface{}, err error, consumedBytes int) { return outputs.FromBytes(data) })
parsedOutputs, err := marshalUtil.Parse(func(data []byte) (interface{}, error, int) { return outputs.FromBytes(data) })
if err != nil {
return
}
......
......@@ -22,8 +22,8 @@ func TestPayload(t *testing.T) {
payloadid.Empty,
transfer.New(
inputs.New(
transferoutputid.New(address.New([]byte("test")), transferid.New([]byte("test"))),
transferoutputid.New(address.New([]byte("test")), transferid.New([]byte("test1"))),
transferoutputid.New(address.New([]byte("input_address1")), transferid.New([]byte("transfer1"))),
transferoutputid.New(address.New([]byte("input_address2")), transferid.New([]byte("transfer2"))),
),
outputs.New(map[address.Address][]*coloredbalance.ColoredBalance{
......
......@@ -48,9 +48,7 @@ func TransferFromBytes(bytes []byte, optionalTargetObject ...*Transfer) (result
marshalUtil := marshalutil.New(bytes)
// unmarshal inputs
if parseResult, inputsErr := marshalUtil.Parse(func(data []byte) (result interface{}, err error, consumedBytes int) {
return TransferInputsFromBytes(data)
}); inputsErr != nil {
if parseResult, inputsErr := marshalUtil.Parse(func(data []byte) (interface{}, error, int) { return TransferInputsFromBytes(data) }); inputsErr != nil {
err = inputsErr
return
......@@ -59,9 +57,7 @@ func TransferFromBytes(bytes []byte, optionalTargetObject ...*Transfer) (result
}
// unmarshal outputs
if parseResult, outputsErr := marshalUtil.Parse(func(data []byte) (result interface{}, err error, consumedBytes int) {
return OutputsFromBytes(data)
}); outputsErr != nil {
if parseResult, outputsErr := marshalUtil.Parse(func(data []byte) (interface{}, error, int) { return OutputsFromBytes(data) }); outputsErr != nil {
err = outputsErr
return
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment