From a53b951b5597ed1be46946073839032b0e2116df Mon Sep 17 00:00:00 2001
From: edef <edef@unfathomable.blue>
Date: Sun, 1 May 2022 15:48:42 +0000
Subject: ripple/fossil/chunker: handle and test boundary condition correctness

This ensures that MIN_CHUNK_SIZE-sized chunks can actually be emitted,
and adds tests for both MIN_CHUNK_SIZE and MAX_CHUNK_SIZE chunks.

The behaviour for all cases now verifiably matches casync.

Change-Id: Ie0bfaf50ec02658069da83ebb30210e6e1963de6
---
 ripple/fossil/src/chunker/mod.rs | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

(limited to 'ripple/fossil/src/chunker/mod.rs')

diff --git a/ripple/fossil/src/chunker/mod.rs b/ripple/fossil/src/chunker/mod.rs
index e52e49a..3bc160e 100644
--- a/ripple/fossil/src/chunker/mod.rs
+++ b/ripple/fossil/src/chunker/mod.rs
@@ -48,13 +48,13 @@ impl<'a> Iterator for Chunker<'a> {
 		let mut hasher = buz::Rolling::<48>::from_slice(&self.buffer[..MIN_CHUNK_SIZE]);
 		let chunk;
 		for (idx, byte) in bytes {
-			hasher.push(byte);
 			let buz::Hash(x) = hasher.sum();
 			if x % d == d.wrapping_sub(1) {
 				// split point
-				(chunk, self.buffer) = self.buffer.split_at(idx + 1);
+				(chunk, self.buffer) = self.buffer.split_at(idx);
 				return Some(chunk);
 			}
+			hasher.push(byte);
 		}
 
 		(chunk, self.buffer) = self.buffer.split_at(MAX_CHUNK_SIZE.min(self.buffer.len()));
@@ -161,4 +161,38 @@ mod test {
 			assert_eq!(actual, blake3::Hash::from(expected));
 		}
 	}
+
+	#[test]
+	fn all_zeroes() {
+		assert_eq!(
+			super::Chunker::from(&[0u8; super::MAX_CHUNK_SIZE + 1])
+				.next()
+				.unwrap()
+				.len(),
+			super::MAX_CHUNK_SIZE
+		);
+	}
+
+	#[test]
+	fn min_chunk() {
+		let data = generate(1024 * 32);
+
+		// a "tail" is a 48-byte sequence that terminates a chunk
+		// we extract one from our test vectors, since every chunk
+		// smaller than MAX_CHUNK_SIZE ends in a tail
+		let mut tail = [0; 48];
+		tail.copy_from_slice({
+			let chunk = super::Chunker::from(&data).next().unwrap();
+			chunk.rchunks_exact(48).next().unwrap()
+		});
+
+		let mut data = vec![0; super::MIN_CHUNK_SIZE - 48];
+		data.extend(tail);
+		data.push(0);
+
+		assert_eq!(
+			super::Chunker::from(&data).next().unwrap().len(),
+			super::MIN_CHUNK_SIZE
+		);
+	}
 }
-- 
cgit 1.4.1