object/id: Zero is a property of the algorithm v0.1.140

5 files changed, 9 insertions, 11 deletions

diff --git a/network/protocol/v0v1/server/advertise.go b/network/protocol/v0v1/server/advertise.go
index 30468d1c..8ec7dfd9 100644
--- a/network/protocol/v0v1/server/advertise.go
+++ b/network/protocol/v0v1/server/advertise.go
@@ -3,8 +3,6 @@ package server
 import (
 	"fmt"
 	"strings"
-
-	objectid "codeberg.org/lindenii/furgit/object/id"
 )
 
 // AdvertiseRefs writes one server ref advertisement.
@@ -20,7 +18,7 @@ func (session *Session) AdvertiseRefs(ad Advertisement, capabilityTokens []strin
 
 	refs := sortAdvertisedRefs(ad.Refs)
 	if len(refs) == 0 {
-		line := fmt.Sprintf("%s capabilities^{}\x00%s\n", objectid.Zero(session.opts.Algorithm), capList)
+		line := fmt.Sprintf("%s capabilities^{}\x00%s\n", session.opts.Algorithm.Zero(), capList)
 
 		err := session.enc.WriteData([]byte(line))
 		if err != nil {
diff --git a/network/protocol/v0v1/server/advertise_test.go b/network/protocol/v0v1/server/advertise_test.go
index 3aac7056..3ad7a725 100644
--- a/network/protocol/v0v1/server/advertise_test.go
+++ b/network/protocol/v0v1/server/advertise_test.go
@@ -93,7 +93,7 @@ func TestAdvertiseRefsWritesNoRefsCapabilitiesLine(t *testing.T) {
 
 		got := out.String()
 
-		want := objectid.Zero(algo).String() + " capabilities^{}\x00report-status object-format=" + algo.String() + "\n"
+		want := algo.Zero().String() + " capabilities^{}\x00report-status object-format=" + algo.String() + "\n"
 		if !strings.Contains(got, want) {
 			t.Fatalf("unexpected no-refs advertisement %q", got)
 		}
diff --git a/network/protocol/v0v1/server/receivepack/parse_test.go b/network/protocol/v0v1/server/receivepack/parse_test.go
index 3a891d3e..d54d8f8d 100644
--- a/network/protocol/v0v1/server/receivepack/parse_test.go
+++ b/network/protocol/v0v1/server/receivepack/parse_test.go
@@ -19,7 +19,7 @@ func TestReadRequestParsesCommandsAndPushOptions(t *testing.T) {
 	testgit.ForEachAlgorithm(t, func(t *testing.T, algo objectid.Algorithm) {
 		t.Parallel()
 
-		oldZero := objectid.Zero(algo).String()
+		oldZero := algo.Zero().String()
 		oneID := mustHexID(t, algo, "1")
 
 		var wire bufferWriteFlusher
@@ -105,7 +105,7 @@ func TestReadRequestDeleteOnlyDoesNotExpectPack(t *testing.T) {
 		enc := pktline.NewEncoder(&wire)
 
 		err := enc.WriteData([]byte(
-			oneID.String() + " " + objectid.Zero(algo).String() + " refs/heads/old\x00delete-refs object-format=" + algo.String() + "\n",
+			oneID.String() + " " + algo.Zero().String() + " refs/heads/old\x00delete-refs object-format=" + algo.String() + "\n",
 		))
 		if err != nil {
 			t.Fatalf("WriteData: %v", err)
@@ -153,7 +153,7 @@ func TestReadRequestRejectsUnsupportedCapability(t *testing.T) {
 		enc := pktline.NewEncoder(&wire)
 
 		err := enc.WriteData([]byte(
-			objectid.Zero(algo).String() + " " + oneID.String() + " refs/heads/main\x00atomic object-format=" + algo.String() + "\n",
+			algo.Zero().String() + " " + oneID.String() + " refs/heads/main\x00atomic object-format=" + algo.String() + "\n",
 		))
 		if err != nil {
 			t.Fatalf("WriteData: %v", err)
@@ -209,7 +209,7 @@ func TestReadRequestParsesPushCertificate(t *testing.T) {
 			"nonce nonce\n",
 			"push-option ci.skip\n",
 			"\n",
-			objectid.Zero(algo).String() + " " + oneID.String() + " refs/heads/main\n",
+			algo.Zero().String() + " " + oneID.String() + " refs/heads/main\n",
 			"-----BEGIN PGP SIGNATURE-----\n",
 			"abcdef\n",
 			"push-cert-end\n",
diff --git a/network/protocol/v0v1/server/receivepack/report_status_test.go b/network/protocol/v0v1/server/receivepack/report_status_test.go
index 697311de..3cde5103 100644
--- a/network/protocol/v0v1/server/receivepack/report_status_test.go
+++ b/network/protocol/v0v1/server/receivepack/report_status_test.go
@@ -59,7 +59,7 @@ func TestWriteReportStatusUsesSideBand64KWhenNegotiated(t *testing.T) {
 		requestEnc := pktline.NewEncoder(&requestWire)
 
 		err := requestEnc.WriteData([]byte(
-			objectid.Zero(algo).String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n",
+			algo.Zero().String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n",
 		))
 		if err != nil {
 			t.Fatalf("WriteData(request): %v", err)
@@ -243,7 +243,7 @@ func TestProgressWriterUsesSideBand64KWhenNegotiated(t *testing.T) {
 		requestEnc := pktline.NewEncoder(&requestWire)
 
 		err := requestEnc.WriteData([]byte(
-			objectid.Zero(algo).String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n",
+			algo.Zero().String() + " " + mustHexID(t, algo, "1").String() + " refs/heads/main\x00report-status side-band-64k object-format=" + algo.String() + "\n",
 		))
 		if err != nil {
 			t.Fatalf("WriteData(request): %v", err)
diff --git a/network/protocol/v0v1/server/receivepack/session.go b/network/protocol/v0v1/server/receivepack/session.go
index 65fa6b36..5299b42d 100644
--- a/network/protocol/v0v1/server/receivepack/session.go
+++ b/network/protocol/v0v1/server/receivepack/session.go
@@ -208,7 +208,7 @@ func parseObjectID(algo objectid.Algorithm, s string) (objectid.ObjectID, error)
 }
 
 func commandIsDelete(cmd Command) bool {
-	return cmd.NewID == objectid.Zero(cmd.NewID.Algorithm())
+	return cmd.NewID == cmd.NewID.Algorithm().Zero()
 }
 
 func deleteOnly(commands []Command) bool {