From 1362e458963cd3a12d6057b96e3034bbcd4d58c4 Mon Sep 17 00:00:00 2001 From: Sergio Mena Date: Wed, 12 Oct 2022 12:31:20 +0200 Subject: [PATCH] Simplified steps to unmarshall --- test/loadtime/payload/payload.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/loadtime/payload/payload.go b/test/loadtime/payload/payload.go index 25ddcfe9e..1d4f6544e 100644 --- a/test/loadtime/payload/payload.go +++ b/test/loadtime/payload/payload.go @@ -1,9 +1,7 @@ package payload import ( - "bytes" "crypto/rand" - "errors" "fmt" "math" @@ -51,13 +49,8 @@ func NewBytes(p *Payload) ([]byte, error) { // FromBytes leaves the padding untouched, returning it to the caller to handle // or discard per their preference. func FromBytes(b []byte) (*Payload, error) { - tr_h := bytes.TrimPrefix(b, []byte(keyPrefix)) - if bytes.Equal(b, tr_h) { - return nil, errors.New("payload bytes missing key prefix") - } - - tr_b := make([]byte, (len(tr_h)+1)/2) - n, err := fmt.Sscanf(string(tr_h), "%X", &tr_b) + tr_b := make([]byte, (len(b)-len(keyPrefix)+1)/2) + n, err := fmt.Sscanf(string(b), keyPrefix+"%X", &tr_b) if err != nil { return nil, err }