more tests

Author: sammymu

bytes_test.go

@@ -26,16 +26,25 @@ func TestReverseCopy(t *testing.T) {
 		ReverseCopy(c.dst, c.src)
 
 		if !bytes.Equal(c.dst, c.expect) {
-			t.Fatalf("#%d failed: got %v, expect %v", i, c.dst, c.expect)
+			t.Fatalf("#%d failed: got %x, expect %x", i, c.dst, c.expect)
 		}
 	}
 }
 
 func TestPaddedAppend(t *testing.T) {
-	dst := make([]byte, 0, 12)
-	src := []byte{0x12, 0x34}
+	testCases := []struct {
+		size     uint
+		dst, src []byte
+		expect   []byte
+	}{
+		{2, nil, []byte{0x12}, []byte{0x00, 0x12}},
+		{1, nil, []byte{0x12}, []byte{0x12}},
+		{0, nil, []byte{0x12}, []byte{0x12}},
+	}
 
-	hello := paddedAppend(3, dst, src)
-	t.Logf("% x", dst)
-	t.Logf("% x", hello)
+	for i, c := range testCases {
+		if got := paddedAppend(c.size, c.dst, c.src); !bytes.Equal(got, c.expect) {
+			t.Fatalf("#%d failed: got %x, expect %x", i, got, c.expect)
+		}
+	}
 }

goldie_test.go

@@ -28,9 +28,7 @@ type generateMasterKeyGoldie struct {
 
 func readInGenerateMasterKeyGoldie(t *testing.T) []*generateMasterKeyGoldie {
 	var golden []bip32.Goldie
-	if err := bip32.ReadGoldenJSON(bip32.GoldenName, &golden); nil != err {
-		t.Fatal(err)
-	}
+	ReadGoldenJSON(t, bip32.GoldenName, &golden)
 
 	var goods []*generateMasterKeyGoldie
 	for _, v := range golden {
@@ -80,13 +78,9 @@ func readChildGoldie(t *testing.T, pub bool) []*childGoldie {
 	var goldens, addOn []*bip32.Goldie
 
 	if !pub {
-		if err := bip32.ReadGoldenJSON(bip32.GoldenName, &goldens); nil != err {
-			t.Fatal(err)
-		}
-	}
-	if err := bip32.ReadGoldenJSON(bip32.GoldenAddOnName, &addOn); nil != err {
-		t.Fatal(err)
+		ReadGoldenJSON(t, bip32.GoldenName, &goldens)
 	}
+	ReadGoldenJSON(t, bip32.GoldenAddOnName, &addOn)
 
 	goldens = append(goldens, addOn...)
 

helper_test.go

@@ -0,0 +1,22 @@
+package bip32_test
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/sammy00/bip32"
+)
+
+func ReadGoldenJSON(t *testing.T, name string, golden interface{}) {
+	fd, err := os.Open(filepath.Join(bip32.GoldenBase, name))
+	if nil != err {
+		t.Fatal(err)
+	}
+	defer fd.Close()
+
+	if err := json.NewDecoder(fd).Decode(golden); nil != err {
+		t.Fatal(err)
+	}
+}

internal_test.go

@@ -1,6 +1,8 @@
 package bip32
 
 import (
+	"bytes"
+	"encoding/hex"
 	"reflect"
 	"testing"
 
@@ -70,3 +72,77 @@ func Test_decodePublicKey(t *testing.T) {
 		}
 	}
 }
+
+func Test_derivePublicKey(t *testing.T) {
+	// test vector decoded from the golden as specified in testdata/bip32.golden
+	testCases := []struct {
+		priv   string
+		expect string
+	}{
+		{
+			"e8f32e723decf4051aefac8e2c93c9c5b214313817cdb01a1494b917c8436b35",
+			"0339a36013301597daef41fbe593a02cc513d0b55527ec2df1050e2e8ff49c85c2",
+		},
+		{
+			"edb2e14f9ee77d26dd93b4ecede8d16ed408ce149b6cd80b0715a2d911a0afea",
+			"035a784662a4a20a65bf6aab9ae98a6c068a81c52e4b032c0fb5400c706cfccc56",
+		},
+		{
+			"3c6cb8d0f6a264c91ea8b5030fadaa8e538b020f0a387421a12de9319dc93368",
+			"03501e454bf00751f24b1b489aa925215d66af2234e3891c3b21a52bedb3cd711c",
+		},
+		{
+			"cbce0d719ecf7431d88e6a89fa1483e02e35092af60c042b1df2ff59fa424dca",
+			"0357bfe1e341d01c69fe5654309956cbea516822fba8a601743a012a7896ee8dc2",
+		},
+		{
+			"0f479245fb19a38a1954c5c7c0ebab2f9bdfd96a17563ef28a6a4b1a2a764ef4",
+			"02e8445082a72f29b75ca48748a914df60622a609cacfce8ed0e35804560741d29",
+		},
+		{
+			"471b76e389e528d6de6d816857e012c5455051cad6660850e58372a6c3e6e7c8",
+			"022a471424da5e657499d1ff51cb43c47481a03b1e77f951fe64cec9f5a48f7011",
+		},
+		{
+			"4b03d6fc340455b363f51020ad3ecca4f0850280cf436c70c727923f6db46c3e",
+			"03cbcaa9c98c877a26977d00825c956a238e8dddfbd322cce4f74b0b5bd6ace4a7",
+		},
+		{
+			"abe74a98f6c7eabee0428f53798f0ab8aa1bd37873999041703c742f15ac7e1e",
+			"02fc9e5af0ac8d9b3cecfe2a888e2117ba3d089d8585886c9c826b6b22a98d12ea",
+		},
+		{
+			"877c779ad9687164e9c2f4f0f4ff0340814392330693ce95a58fe18fd52e6e93",
+			"03c01e7425647bdefa82b12d9bad5e3e6865bee0502694b94ca58b666abc0a5c3b",
+		},
+		{
+			"704addf544a06e5ee4bea37098463c23613da32020d604506da8c0518e1da4b7",
+			"03a7d1d856deb74c508e05031f9895dab54626251b3806e16b4bd12e781a7df5b9",
+		},
+		{
+			"f1c7c871a54a804afe328b4c83a1c33b8e5ff48f5087273f04efa83b247d6a2d",
+			"02d2b36900396c9282fa14628566582f206a5dd0bcc8d5e892611806cafb0301f0",
+		},
+		{
+			"bb7d39bdb83ecf58f2fd82b6d918341cbef428661ef01ab97c28a4842125ac23",
+			"024d902e1a2fc7a8755ab5b694c575fce742c48d9ff192e63df5193e4c7afe1f9c",
+		},
+		{
+			"00ddb80b067e0d4993197fe10f2657a844a384589847602d56f0c629c81aae32",
+			"03683af1ba5743bdfc798cf814efeeab2735ec52d95eced528e692b8e34c4e5669",
+		},
+		{
+			"491f7a2eebc7b57028e0d3faa0acda02e75c33b03c48fb288c41e2ea44e1daef",
+			"026557fdda1d5d43d79611f784780471f086d58e8126b8c40acb82272a7712e7f2",
+		},
+	}
+
+	for i, c := range testCases {
+		priv, _ := hex.DecodeString(c.priv)
+		expect, _ := hex.DecodeString(c.expect)
+
+		if got := derivePublicKey(priv); !bytes.Equal(got, expect) {
+			t.Fatalf("#%d failed: got %x, expect %x", i, got, expect)
+		}
+	}
+}

master_key_test.go

@@ -9,27 +9,21 @@ import (
 func TestGenerateMasterKey(t *testing.T) {
 	testCases := readInGenerateMasterKeyGoldie(t)
 
-	for _, c := range testCases {
-		c := c
-
-		t.Run("", func(st *testing.T) {
-			key, err := bip32.GenerateMasterKey(c.rand, *c.keyID, c.strength)
-
-			if c.expect.bad && nil == err {
-				st.Fatal("expect error but got none")
-			} else if !c.expect.bad && nil != err {
-				st.Fatalf("unexpected error: %v", err)
-			}
-
-			if c.expect.bad {
-				return // skip due to error out
-			}
-
-			if got := key.String(); got != c.expect.key {
-				st.Fatalf("invalid key: got %s, expect %s", got, c.expect.key)
-			}
-		})
+	for i, c := range testCases {
+		key, err := bip32.GenerateMasterKey(c.rand, *c.keyID, c.strength)
+
+		if c.expect.bad && nil == err {
+			t.Fatalf("#%d expect error but got none", i)
+		} else if !c.expect.bad && nil != err {
+			t.Fatalf("#%d unexpected error: %v", i, err)
+		}
+
+		if c.expect.bad {
+			return // skip due to error out
+		}
+
+		if got := key.String(); got != c.expect.key {
+			t.Fatalf("#%d invalid key: got %s, expect %s", i, got, c.expect.key)
+		}
 	}
 }
-
-//func readInMasterPrivKey()

private_key_test.go

@@ -272,7 +272,7 @@ func TestPrivateKey_Child_OK3(t *testing.T) {
 
 func TestPrivateKey_Neuter(t *testing.T) {
 	var testCases []bip32.Goldie
-	bip32.ReadGoldenJSON(bip32.GoldenName, &testCases)
+	ReadGoldenJSON(t, bip32.GoldenName, &testCases)
 
 	for _, c := range testCases {
 		chains := c.Chains
@@ -302,7 +302,7 @@ func TestPrivateKey_Neuter(t *testing.T) {
 
 func TestParsePrivateKey_OK(t *testing.T) {
 	var testCases []bip32.Goldie
-	bip32.ReadGoldenJSON(bip32.GoldenName, &testCases)
+	ReadGoldenJSON(t, bip32.GoldenName, &testCases)
 
 	for _, c := range testCases {
 		chains := c.Chains

public_key_test.go

@@ -57,7 +57,7 @@ func TestParsePublicKey_Bad(t *testing.T) {
 
 func TestParsePublicKey_OK(t *testing.T) {
 	var testCases []bip32.Goldie
-	bip32.ReadGoldenJSON(bip32.GoldenName, &testCases)
+	ReadGoldenJSON(t, bip32.GoldenName, &testCases)
 
 	for _, c := range testCases {
 		chains := c.Chains

testing.go

@@ -2,10 +2,8 @@ package bip32
 
 import (
 	"encoding/hex"
-	"encoding/json"
 	"errors"
 	"io"
-	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -69,6 +67,7 @@ func NewEntropyReader(hexStr string) io.Reader {
 	return hex.NewDecoder(strings.NewReader(hexStr))
 }
 
+/*
 func ReadGoldenJSON(name string, golden interface{}) error {
 	fd, err := os.Open(filepath.Join(GoldenBase, name))
 	if nil != err {
@@ -78,3 +77,4 @@ func ReadGoldenJSON(name string, golden interface{}) error {
 
 	return json.NewDecoder(fd).Decode(golden)
 }
+*/