localrepo: Replace use of SHA1 hashes in tests with the default hash

Replace hardcoded uses of SHA1 object hashes in our tests to instead use
the default object hash as indicated by the gittest package.

2 files changed, 14 insertions, 14 deletions

diff --git a/internal/git/localrepo/objects_test.go b/internal/git/localrepo/objects_test.go
index 6b3b49dc5..c43e24eb3 100644
--- a/internal/git/localrepo/objects_test.go
+++ b/internal/git/localrepo/objects_test.go
@@ -102,7 +102,7 @@ func TestFormatTag(t *testing.T) {
 		// internal/gitaly/service/operations/tags_test.go
 		{
 			desc:       "basic signature",
-			objectID:   git.ObjectHashSHA1.ZeroOID,
+			objectID:   gittest.DefaultObjectHash.ZeroOID,
 			objectType: "commit",
 			tagName:    []byte("my-tag"),
 			author: &gitalypb.User{
@@ -113,7 +113,7 @@ func TestFormatTag(t *testing.T) {
 		},
 		{
 			desc:       "basic signature",
-			objectID:   git.ObjectHashSHA1.ZeroOID,
+			objectID:   gittest.DefaultObjectHash.ZeroOID,
 			objectType: "commit",
 			tagName:    []byte("my-tag\ninjection"),
 			tagBody:    []byte(""),
@@ -125,7 +125,7 @@ func TestFormatTag(t *testing.T) {
 		},
 		{
 			desc:       "signature with fixed time",
-			objectID:   git.ObjectHashSHA1.ZeroOID,
+			objectID:   gittest.DefaultObjectHash.ZeroOID,
 			objectType: "commit",
 			tagName:    []byte("my-tag"),
 			tagBody:    []byte(""),
@@ -245,8 +245,8 @@ func TestRepo_ReadObject(t *testing.T) {
 	}{
 		{
 			desc:  "invalid object",
-			oid:   git.ObjectHashSHA1.ZeroOID,
-			error: InvalidObjectError(git.ObjectHashSHA1.ZeroOID.String()),
+			oid:   gittest.DefaultObjectHash.ZeroOID,
+			error: InvalidObjectError(gittest.DefaultObjectHash.ZeroOID.String()),
 		},
 		{
 			desc:    "valid object",
@@ -311,12 +311,12 @@ signed commit body
 	}{
 		{
 			desc:        "invalid commit",
-			revision:    git.ObjectHashSHA1.ZeroOID.Revision(),
+			revision:    gittest.DefaultObjectHash.ZeroOID.Revision(),
 			expectedErr: ErrObjectNotFound,
 		},
 		{
 			desc:        "invalid commit with trailers",
-			revision:    git.ObjectHashSHA1.ZeroOID.Revision(),
+			revision:    gittest.DefaultObjectHash.ZeroOID.Revision(),
 			expectedErr: ErrObjectNotFound,
 			opts:        []ReadCommitOpt{WithTrailers()},
 		},
@@ -437,18 +437,18 @@ func TestRepo_IsAncestor(t *testing.T) {
 		},
 		{
 			desc:   "parent is not valid commit",
-			parent: git.ObjectHashSHA1.ZeroOID.Revision(),
+			parent: gittest.DefaultObjectHash.ZeroOID.Revision(),
 			child:  childCommitID.Revision(),
 			errorMatcher: func(t testing.TB, err error) {
-				require.Equal(t, InvalidCommitError(git.ObjectHashSHA1.ZeroOID), err)
+				require.Equal(t, InvalidCommitError(gittest.DefaultObjectHash.ZeroOID), err)
 			},
 		},
 		{
 			desc:   "child is not valid commit",
 			parent: childCommitID.Revision(),
-			child:  git.ObjectHashSHA1.ZeroOID.Revision(),
+			child:  gittest.DefaultObjectHash.ZeroOID.Revision(),
 			errorMatcher: func(t testing.TB, err error) {
-				require.Equal(t, InvalidCommitError(git.ObjectHashSHA1.ZeroOID), err)
+				require.Equal(t, InvalidCommitError(gittest.DefaultObjectHash.ZeroOID), err)
 			},
 		},
 		{
diff --git a/internal/git/localrepo/refs_test.go b/internal/git/localrepo/refs_test.go
index e2def27e5..64d5f0219 100644
--- a/internal/git/localrepo/refs_test.go
+++ b/internal/git/localrepo/refs_test.go
@@ -133,7 +133,7 @@ func TestRepo_GetReferenceWithAmbiguousRefs(t *testing.T) {
 		"refs/master",
 		"refs/tags/master",
 	} {
-		require.NoError(t, repo.UpdateRef(ctx, ref, prevOID, git.ObjectHashSHA1.ZeroOID))
+		require.NoError(t, repo.UpdateRef(ctx, ref, prevOID, gittest.DefaultObjectHash.ZeroOID))
 	}
 
 	ref, err := repo.GetReference(ctx, "refs/heads/master")
@@ -445,7 +445,7 @@ func TestRepo_UpdateRef(t *testing.T) {
 		{
 			desc:     "deleting main succeeds",
 			ref:      "refs/heads/main",
-			newValue: git.ObjectHashSHA1.ZeroOID,
+			newValue: gittest.DefaultObjectHash.ZeroOID,
 			oldValue: mainCommitID,
 			verify: func(t *testing.T, repo *Repo, err error) {
 				require.NoError(t, err)
@@ -457,7 +457,7 @@ func TestRepo_UpdateRef(t *testing.T) {
 			desc:     "creating new branch succeeds",
 			ref:      "refs/heads/new",
 			newValue: mainCommitID,
-			oldValue: git.ObjectHashSHA1.ZeroOID,
+			oldValue: gittest.DefaultObjectHash.ZeroOID,
 			verify: func(t *testing.T, repo *Repo, err error) {
 				require.NoError(t, err)
 				ref, err := repo.GetReference(ctx, "refs/heads/new")