better leaf op test coverage

Author: ethanfrey

go/ops.go

@@ -60,6 +60,7 @@ func ApplyLeafOp(op *LeafOp, key []byte, value []byte) ([]byte, error) {
 	}
 	data := append(op.Prefix, pkey...)
 	data = append(data, pvalue...)
+	fmt.Printf("data: %X\n", data)
 	return doHash(op.Hash, data)
 }
 
@@ -139,6 +140,6 @@ func encodeVarintProto(l int) []byte {
 		res = append(res, uint8(l&0x7f|0x80))
 		l >>= 7
 	}
-	res = append(res, uint8(1))
+	res = append(res, uint8(l))
 	return res
 }

go/ops_test.go

@@ -24,6 +24,26 @@ func TestLeafOp(t *testing.T) {
 			// echo -n foobar | sha256sum
 			expected: fromHex("c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2"),
 		},
+		"hash foobaz, sha-512": {
+			op: &LeafOp{
+				Hash: HashOp_SHA512,
+				// no prehash, no length prefix
+			},
+			key:   []byte("foo"),
+			value: []byte("baz"),
+			// echo -n foobaz | sha512sum
+			expected: fromHex("4f79f191298ec7461d60136c60f77c2ae8ddd85dbf6168bb925092d51bfb39b559219b39ae5385ba04946c87f64741385bef90578ea6fe6dac85dbf7ad3f79e1"),
+		},
+		"hash foobar (different break)": {
+			op: &LeafOp{
+				Hash: HashOp_SHA256,
+				// no prehash, no length prefix
+			},
+			key:   []byte("f"),
+			value: []byte("oobar"),
+			// echo -n foobar | sha256sum
+			expected: fromHex("c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2"),
+		},
 		"requires key": {
 			op: &LeafOp{
 				Hash: HashOp_SHA256,
@@ -40,6 +60,33 @@ func TestLeafOp(t *testing.T) {
 			value: []byte("bar"),
 			isErr: true,
 		},
+		"hash with length prefix": {
+			op: &LeafOp{
+				Hash:   HashOp_SHA256,
+				Length: LengthOp_VAR_PROTO,
+				// no prehash, no length prefix
+			},
+			// echo -n food | xxs -ps
+			// and manually compute length byte
+			key:   []byte("food"),             // 04666f6f64
+			value: []byte("some longer text"), // 10736f6d65206c6f6e6765722074657874
+			// echo -n 04666f6f6410736f6d65206c6f6e6765722074657874 | xxd -r -p | sha256sum
+			expected: fromHex("b68f5d298e915ae1753dd333da1f9cf605411a5f2e12516be6758f365e6db265"),
+		},
+		"hash with prehash and length prefix": {
+			op: &LeafOp{
+				Hash:         HashOp_SHA256,
+				Length:       LengthOp_VAR_PROTO,
+				PrehashValue: HashOp_SHA256,
+				// no prehash, no length prefix
+			},
+			key: []byte("food"), // 04666f6f64
+			// TODO: this is hash, then length....
+			// echo -n yet another long string | sha256sum
+			value: []byte("yet another long string"), // 20a48c2d4f67b9f80374938535285ed285819d8a5a8fc1fccd1e3244e437cf290d
+			// echo -n 04666f6f6420a48c2d4f67b9f80374938535285ed285819d8a5a8fc1fccd1e3244e437cf290d | xxd -r -p | sha256sum
+			expected: fromHex("87e0483e8fb624aef2e2f7b13f4166cda485baa8e39f437c83d74c94bedb148f"),
+		},
 	}
 
 	for name, tc := range cases {