Skip to content

Commit e35fdc8

Browse files
fix: revert the children node key refer (#904)
1 parent e691ee9 commit e35fdc8

1 file changed

Lines changed: 5 additions & 15 deletions

File tree

node.go

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -526,25 +526,15 @@ func (node *Node) writeHashBytes(w io.Writer, version int64) error {
526526
return fmt.Errorf("writing value, %w", err)
527527
}
528528
} else {
529-
if (node.leftNode == nil && len(node.leftNodeKey) != 32) || (node.rightNode == nil && len(node.rightNodeKey) != 32) {
529+
if node.leftNode == nil || node.rightNode == nil {
530530
return ErrEmptyChild
531531
}
532-
// If left/rightNodeKey is 32 bytes, it is a legacy node whose value is just the hash.
533-
// We may have skipped fetching leftNode/rightNode.
534-
if len(node.leftNodeKey) == 32 {
535-
err = encoding.Encode32BytesHash(w, node.leftNodeKey)
536-
} else {
537-
err = encoding.Encode32BytesHash(w, node.leftNode.hash)
538-
}
539-
if err != nil {
532+
533+
if err := encoding.Encode32BytesHash(w, node.leftNode.hash); err != nil {
540534
return fmt.Errorf("writing left hash, %w", err)
541535
}
542-
if len(node.rightNodeKey) == 32 {
543-
err = encoding.Encode32BytesHash(w, node.rightNodeKey)
544-
} else {
545-
err = encoding.Encode32BytesHash(w, node.rightNode.hash)
546-
}
547-
if err != nil {
536+
537+
if err := encoding.Encode32BytesHash(w, node.rightNode.hash); err != nil {
548538
return fmt.Errorf("writing right hash, %w", err)
549539
}
550540
}

0 commit comments

Comments
 (0)