Revert length FromBytes changes

iotaledger · Mar 11, 2024 · b0e23ff · b0e23ff
1 parent 5f56f3d
commit b0e23ff
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/block_id.gen.go b/block_id.gen.go
diff --git a/commitment_id.gen.go b/commitment_id.gen.go
diff --git a/epoch_index.gen.go b/epoch_index.gen.go
@@ -20,7 +20,7 @@ type EpochIndex uint32
 
 func EpochIndexFromBytes(b []byte) (EpochIndex, int, error) {
 	if len(b) < EpochIndexLength {
-		return 0, 0, ierrors.New("invalid epoch index size")
+		return 0, 0, ierrors.Errorf("invalid length for epoch index, expected at least %d bytes, got %d bytes", EpochIndexLength, len(b))
 	}
 
 	return EpochIndex(binary.LittleEndian.Uint32(b)), EpochIndexLength, nil

diff --git a/gen/identifier.tmpl b/gen/identifier.tmpl
@@ -64,8 +64,8 @@ func IsValid{{.Name}}(b []byte) error {
 
 func {{.Name}}FromBytes(bytes []byte) ({{.Name}}, int, error) {
 	var {{.Receiver}} {{.Name}}
-		if err := IsValid{{.Name}}(bytes); err != nil {
-		return {{.Receiver}}, 0, err
+		if len(bytes) < {{.Name}}Length {
+		return {{.Receiver}}, 0, ierrors.Errorf("invalid length for {{firstLower .Name}}, expected at least %d bytes, got %d bytes", {{.Name}}Length, len(bytes))
 	}
 	copy({{.Receiver}}[:], bytes)
 

diff --git a/gen/index.tmpl b/gen/index.tmpl
@@ -20,7 +20,7 @@ type {{.Name}}Index uint32
 
 func {{.Name}}IndexFromBytes(b []byte) ({{.Name}}Index, int, error) {
 	if len(b) < {{.Name}}IndexLength {
-		return 0, 0, ierrors.New("invalid {{firstLower .Name}} index size")
+		return 0, 0, ierrors.Errorf("invalid length for {{firstLower .Name}} index, expected at least %d bytes, got %d bytes", {{.Name}}IndexLength, len(b))
 	}
 
 	return {{.Name}}Index(binary.LittleEndian.Uint32(b)), {{.Name}}IndexLength, nil

diff --git a/gen/slot_identifier.tmpl b/gen/slot_identifier.tmpl
@@ -79,8 +79,8 @@ func IsValid{{.Name}}(b []byte) error {
 
 // {{.Name}}FromBytes returns a new {{.Name}} represented by the passed bytes.
 func {{.Name}}FromBytes(b []byte) ({{.Name}}, int, error) {
-	if err := IsValid{{.Name}}(b); err != nil {
-		return Empty{{.Name}}, 0, err
+	if len(b) < {{.Name}}Length {
+		return Empty{{.Name}}, 0, ierrors.Errorf("invalid length for {{firstLower .Name}}, expected at least %d bytes, got %d bytes", {{.Name}}Length, len(b))
 	}
 
 	return {{.Name}}(b), {{.Name}}Length, nil

diff --git a/identifier.gen.go b/identifier.gen.go
diff --git a/identifier_account.gen.go b/identifier_account.gen.go
diff --git a/identifier_anchor.gen.go b/identifier_anchor.gen.go
diff --git a/output_id.gen.go b/output_id.gen.go
diff --git a/signed_transaction_id.gen.go b/signed_transaction_id.gen.go
diff --git a/slot_index.gen.go b/slot_index.gen.go
@@ -20,7 +20,7 @@ type SlotIndex uint32
 
 func SlotIndexFromBytes(b []byte) (SlotIndex, int, error) {
 	if len(b) < SlotIndexLength {
-		return 0, 0, ierrors.New("invalid slot index size")
+		return 0, 0, ierrors.Errorf("invalid length for slot index, expected at least %d bytes, got %d bytes", SlotIndexLength, len(b))
 	}
 
 	return SlotIndex(binary.LittleEndian.Uint32(b)), SlotIndexLength, nil

diff --git a/transaction_id.gen.go b/transaction_id.gen.go