Update tests to use hashers

buchgr · Dec 10, 2023 · 724429f · 724429f
1 parent f8df72a
commit 724429f
Show file tree

Hide file tree

Showing 24 changed files with 893 additions and 708 deletions.
diff --git a/cache/disk/BUILD.bazel b/cache/disk/BUILD.bazel
@@ -42,6 +42,7 @@ go_test(
         "//cache:go_default_library",
         "//cache/disk/casblob:go_default_library",
         "//cache/disk/zstdimpl:go_default_library",
+        "//cache/hashing:go_default_library",
         "//cache/httpproxy:go_default_library",
         "//genproto/build/bazel/remote/execution/v2:go_default_library",
         "//utils:go_default_library",

diff --git a/cache/disk/casblob/BUILD.bazel b/cache/disk/casblob/BUILD.bazel
@@ -17,6 +17,7 @@ go_test(
     deps = [
         ":go_default_library",
         "//cache/disk/zstdimpl:go_default_library",
+        "//cache/hashing:go_default_library",
         "//utils:go_default_library",
     ],
 )
diff --git a/cache/disk/casblob/casblob_test.go b/cache/disk/casblob/casblob_test.go
@@ -2,8 +2,6 @@ package casblob_test
 
 import (
 	"bytes"
-	"crypto/sha256"
-	"encoding/hex"
 	"fmt"
 	"io"
 	"os"
@@ -12,6 +10,7 @@ import (
 
 	"github.com/buchgr/bazel-remote/v2/cache/disk/casblob"
 	"github.com/buchgr/bazel-remote/v2/cache/disk/zstdimpl"
+	"github.com/buchgr/bazel-remote/v2/cache/hashing"
 	testutils "github.com/buchgr/bazel-remote/v2/utils"
 )
 
@@ -35,7 +34,7 @@ func TestZstdFromLegacy(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	data, hash := testutils.RandomDataAndHash(int64(size))
+	data, hash := testutils.RandomDataAndHash(int64(size), hashing.DefaultHasher)
 	dir := testutils.TempDir(t)
 	filename := fmt.Sprintf("%s/%s", dir, hash)
 	file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0664)
@@ -73,8 +72,7 @@ func TestZstdFromLegacy(t *testing.T) {
 		t.Fatalf("Unexpected buf size %d, expected %d", buf.Len(), size)
 	}
 
-	h := sha256.Sum256(data)
-	hs := hex.EncodeToString(h[:])
+	hs := hashing.DefaultHasher.Hash(data)
 	if hs != hash {
 		t.Fatalf("Unexpected content sha %s, expected %s", hs, hash)
 	}