change!: split index and pack checksum verification errors

Author: emilazy

gix-pack/src/index/traverse/error.rs

@@ -6,8 +6,8 @@ use crate::index;
 pub enum Error<E: std::error::Error + Send + Sync + 'static> {
     #[error("One of the traversal processors failed")]
     Processor(#[source] E),
-    #[error("Index file, pack file or object verification failed")]
-    VerifyChecksum(#[from] index::verify::checksum::Error),
+    #[error("Failed to verify index file checksum")]
+    IndexVerify(#[source] index::verify::checksum::Error),
     #[error("The pack delta tree index could not be built")]
     Tree(#[from] crate::cache::delta::from_offsets::Error),
     #[error("The tree traversal failed")]
@@ -25,6 +25,8 @@ pub enum Error<E: std::error::Error + Send + Sync + 'static> {
         expected: gix_hash::ObjectId,
         actual: gix_hash::ObjectId,
     },
+    #[error("Failed to verify pack file checksum")]
+    PackVerify(#[source] crate::verify::checksum::Error),
     #[error("The hash of {kind} object at offset {offset} didn't match the checksum in the index file: expected {expected}, got {actual}")]
     PackObjectMismatch {
         expected: gix_hash::ObjectId,

gix-pack/src/index/traverse/mod.rs

@@ -136,8 +136,8 @@ impl index::File {
                 move || pack.verify_checksum(pack_progress, should_interrupt),
                 move || self.verify_checksum(index_progress, should_interrupt),
             );
-            pack_res?;
-            id?
+            pack_res.map_err(Error::PackVerify)?;
+            id.map_err(Error::IndexVerify)?
         } else {
             self.index_checksum()
         })

gix-pack/src/index/verify.rs

@@ -220,7 +220,7 @@ impl index::File {
                         .add_child_with_id("Sha1 of index".into(), integrity::ProgressId::ChecksumBytes.into()),
                     should_interrupt,
                 )
-                .map_err(Into::into)
+                .map_err(index::traverse::Error::IndexVerify)
                 .map(|id| integrity::Outcome {
                     actual_index_checksum: id,
                     pack_traverse_statistics: None,

gix-pack/src/multi_index/verify.rs

@@ -279,9 +279,10 @@ impl File {
                         use index::traverse::Error::*;
                         match err {
                             Processor(err) => Processor(integrity::Error::IndexIntegrity(err)),
-                            VerifyChecksum(err) => VerifyChecksum(err),
+                            IndexVerify(err) => IndexVerify(err),
                             Tree(err) => Tree(err),
                             TreeTraversal(err) => TreeTraversal(err),
+                            PackVerify(err) => PackVerify(err),
                             PackDecode { id, offset, source } => PackDecode { id, offset, source },
                             PackMismatch { expected, actual } => PackMismatch { expected, actual },
                             EntryType(err) => EntryType(err),

gix-pack/src/verify.rs

@@ -10,7 +10,7 @@ pub mod checksum {
     pub enum Error {
         #[error("Interrupted by user")]
         Interrupted,
-        #[error("index checksum mismatch: expected {expected}, got {actual}")]
+        #[error("expected {expected}, got {actual}")]
         Mismatch {
             expected: gix_hash::ObjectId,
             actual: gix_hash::ObjectId,

tests/snapshots/plumbing/no-repo/pack/explode/broken-delete-pack-to-sink-failure

@@ -1,5 +1,5 @@
 Error: Failed to explode the entire pack - some loose objects may have been created nonetheless
 
 Caused by:
-    0: Index file, pack file or object verification failed
-    1: index checksum mismatch: expected f1cd3cc7bc63a4a2b357a475a58ad49b40355470, got 337fe3b886fc5041a35313887d68feefeae52519
+    0: Failed to verify pack file checksum
+    1: expected f1cd3cc7bc63a4a2b357a475a58ad49b40355470, got 337fe3b886fc5041a35313887d68feefeae52519

tests/snapshots/plumbing/no-repo/pack/verify/index-failure

@@ -2,5 +2,5 @@ Could not find matching pack file at 'index.pack' - only index file will be veri
 Error: Verification failure
 
 Caused by:
-    0: Index file, pack file or object verification failed
-    1: index checksum mismatch: expected 0eba66e6b391eb83efc3ec9fc8a3087788911c0a, got fa9a8a630eacc2d3df00aff604bec2451ccbc8ff
+    0: Failed to verify index file checksum
+    1: expected 0eba66e6b391eb83efc3ec9fc8a3087788911c0a, got fa9a8a630eacc2d3df00aff604bec2451ccbc8ff