Remove unneeded [Fingerprint.string]

Usage of [Fingerprint.string] in archive names is incorrect - archive names are based on MD5 which may or may not be the same as the file fingerprinting algorithm. The other use of [Fingerprint.string] is in debug output of tests, where it's used to debug the test framework itself. Remove this usage for now. As such, [Fingerprint.string] becomes unused and can be removed.
oferchen · Sep 26, 2023 · 9a41cab · 9a41cab
1 parent 893b380
commit 9a41cab
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/src/.depend b/src/.depend
@@ -1057,7 +1057,6 @@ test.cmo : \
     globals.cmi \
     fspath.cmi \
     fs.cmi \
-    fingerprint.cmi \
     common.cmi \
     test.cmi
 test.cmx : \
@@ -1516,7 +1515,6 @@ update.cmo : \
     fswatch.cmi \
     fspath.cmi \
     fpcache.cmi \
-    fingerprint.cmi \
     fileinfo.cmi \
     features.cmi \
     common.cmi \
@@ -1549,7 +1547,6 @@ update.cmx : \
     fswatch.cmx \
     fspath.cmx \
     fpcache.cmx \
-    fingerprint.cmx \
     fileinfo.cmx \
     features.cmx \
     common.cmx \

diff --git a/src/fingerprint.ml b/src/fingerprint.ml
@@ -86,8 +86,6 @@ let toString md5 =
     Bytes.to_string string
   end
 
-let string = Digest.string
-
 let dummy = ""
 
 let hash d =

diff --git a/src/fingerprint.mli b/src/fingerprint.mli
@@ -9,8 +9,6 @@ val m : t Umarshal.t
 val file : Fspath.t -> Path.local -> t
 val subfile : Fspath.t -> Int64.t -> Uutil.Filesize.t -> t
 
-val string : string -> t
-
 val toString : t -> string
 
 (* This dummy fingerprint is guaranteed small and distinct from all

diff --git a/src/test.ml b/src/test.ml
@@ -156,8 +156,8 @@ let writefs p fs =
   verbose (fun() -> Util.msg "Writing new test filesystem\n");
   let rec loop p = function
     | File s ->
-        verbose (fun() -> Util.msg "Writing %s with contents %s (fingerprint %s)\n"
-                   (Fspath.toDebugString p) s (Fingerprint.toString (Fingerprint.string s)));
+        verbose (fun() -> Util.msg "Writing %s with contents %s\n"
+                   (Fspath.toDebugString p) s);
         write p s
     | Link s -> Fs.symlink s p
     | Dir files ->

diff --git a/src/update.ml b/src/update.ml
@@ -236,7 +236,7 @@ let archiveHash fspath =
   let thisRoot = thisRootsGlobalName fspath in
   let r = Prefs.read rootsName in
   let n = Printf.sprintf "%s;%s;%d" thisRoot r archiveFormat in
-  let d = Fingerprint.toString (Fingerprint.string n) in
+  let d = Digest.to_hex (Digest.string n) in
   debugverbose (fun()-> Util.msg "Archive name is %s; hashcode is %s\n" n d);
   if Prefs.read showArchiveName then
     Util.msg "Archive name is %s; hashcode is %s\n" n d;
@@ -282,7 +282,7 @@ let archiveName251 fspath (v: archiveVersion): string * string =
     let thisRoot = thisRootsGlobalName fspath in
     let r = Prefs.read rootsName in
     let n = Printf.sprintf "%s;%s;22" thisRoot r in
-    let d = Fingerprint.toString (Fingerprint.string n) in
+    let d = Digest.to_hex (Digest.string n) in
     (String.sub d 0 significantDigits)
   in
   let n = archiveHash251 fspath in