MarshalBinary/UnmarshalBinary test

binary.go

@@ -23,6 +23,10 @@ const (
 )
 
 func (n *Node) MarshalBinary() ([]byte, error) {
+	if n == nil {
+		return nil, nil
+	}
+
 	var buf bytes.Buffer
 
 	if err := n.writeAsBinary(&buf); err != nil {
@@ -106,26 +110,25 @@ func (n *Node) writeAsBinary(w io.Writer) error {
 			return err
 		}
 	}
-	if n != nil {
-		if _, err := w.Write([]byte{ptNullMarker}); err != nil {
-			return err
-		}
+	if _, err := w.Write([]byte{ptNullMarker}); err != nil {
+		return err
 	}
 	return nil
 }
 
 func (n *Node) UnmarshalBinary(b []byte) error {
 	*n = Node{}
-	return n.readAsBinary(bufio.NewReader(bytes.NewReader(b)))
+	return n.readAsBinary(bufio.NewReader(bytes.NewReader(b)), nil)
 }
 
-func (n *Node) readAsBinary(r *bufio.Reader) error {
+func (n *Node) readAsBinary(r *bufio.Reader, parent *Node) error {
 	packType, err := r.ReadByte()
 	if err != nil {
 		return err
 	}
 
 	for c := n; packType != ptNullMarker; {
+		c.parent = parent
 		name, err := r.ReadString(0)
 		if err != nil {
 			return err
@@ -136,9 +139,13 @@ func (n *Node) readAsBinary(r *bufio.Reader) error {
 		case ptNone:
 			var sub Node
 			c.Append(&sub)
-			if err := sub.readAsBinary(r); err != nil {
+			sub.parent = nil
+			if err := sub.readAsBinary(r, c); err != nil {
 				return err
 			}
+			if sub.parent == nil {
+				c.child = nil
+			}
 		case ptString:
 			v, err := r.ReadString(0)
 			if err != nil {
@@ -201,7 +208,6 @@ func (n *Node) readAsBinary(r *bufio.Reader) error {
 		}
 
 		var peer Node
-		peer.parent = c.parent
 		c.next = &peer
 		peer.prev = c
 		c = &peer

binary_test.go

@@ -0,0 +1,59 @@
+package vdf_test
+
+import (
+	"bytes"
+	"encoding/hex"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"testing"
+
+	"github.com/BenLubar/vdf"
+)
+
+func TestBinaryReEncode(t *testing.T) {
+	in, err := ioutil.ReadFile("testdata/UserGameStatsSchema_630.bin")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var n vdf.Node
+	err = n.UnmarshalBinary(in)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	out, err := n.MarshalBinary()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if bytes.Equal(in, out) {
+		return
+	}
+
+	err = ioutil.WriteFile("test_in", []byte(hex.Dump(in)), 0644)
+	if err != nil {
+		panic(err)
+	}
+	defer os.Remove("test_in")
+	err = ioutil.WriteFile("test_out", []byte(hex.Dump(out)), 0644)
+	if err != nil {
+		panic(err)
+	}
+	defer os.Remove("test_out")
+
+	txt, err := n.MarshalText()
+	if err != nil {
+		panic(err)
+	}
+	t.Log(string(txt))
+
+	t.Error("Byte slices differ!")
+	cmd := exec.Command("diff", "-u", "test_in", "test_out")
+	cmd.Stdout = os.Stdout
+	err = cmd.Run()
+	if err != nil {
+		panic(err)
+	}
+}

interface_test.go

@@ -1,8 +1,12 @@
-package vdf
+package vdf_test
 
-import "encoding"
+import (
+	"encoding"
 
-var _ encoding.TextMarshaler = (*Node)(nil)
-var _ encoding.TextUnmarshaler = (*Node)(nil)
-var _ encoding.BinaryMarshaler = (*Node)(nil)
-var _ encoding.BinaryUnmarshaler = (*Node)(nil)
+	"github.com/BenLubar/vdf"
+)
+
+var _ encoding.TextMarshaler = (*vdf.Node)(nil)
+var _ encoding.TextUnmarshaler = (*vdf.Node)(nil)
+var _ encoding.BinaryMarshaler = (*vdf.Node)(nil)
+var _ encoding.BinaryUnmarshaler = (*vdf.Node)(nil)