From 2220de1281d35742f52fd56a9717e49a282596f5 Mon Sep 17 00:00:00 2001
From: sokorototo <nyachiengatoto@gmail.com>
Date: Tue, 11 Feb 2025 15:24:08 +0300
Subject: [PATCH] fixed benchmarks

---
 crates/vach-benchmarks/benches/main.rs | 38 ++++++++++++--------------
 crates/vach/src/loader/archive.rs      |  1 -
 crates/vach/src/tests.rs               |  1 +
 crates/vach/src/writer/mod.rs          |  7 +++--
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/crates/vach-benchmarks/benches/main.rs b/crates/vach-benchmarks/benches/main.rs
index 89fd90d..cf13bb6 100644
--- a/crates/vach-benchmarks/benches/main.rs
+++ b/crates/vach-benchmarks/benches/main.rs
@@ -53,23 +53,17 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 	// Configure benchmark
 	builder_group.throughput(Throughput::Bytes((data_1.len() + data_2.len() + data_3.len()) as u64));
 
-	builder_group.bench_function("Builder::dump(---)", |b| {
+	builder_group.bench_function("dump(---)", |b| {
 		b.iter(|| {
-			let mut builder = Builder::new();
-
-			// Add data
-			builder
-				.add_leaf(Leaf::new(data_1, "d1").compress(CompressMode::Always))
-				.unwrap();
-			builder
-				.add_leaf(Leaf::new(data_2, "d2").compress(CompressMode::Never))
-				.unwrap();
-			builder
-				.add_leaf(Leaf::new(data_3, "d3").compress(CompressMode::Detect))
-				.unwrap();
-
-			// Dump data
-			builder.dump(Sink::new(), &b_config).unwrap();
+			// setup data
+			let mut leaves = [
+				Leaf::new(data_1, "d1").compress(CompressMode::Always),
+				Leaf::new(data_2, "d2").compress(CompressMode::Never),
+				Leaf::new(data_3, "d3").compress(CompressMode::Detect),
+			];
+
+			// dump
+			dump(Sink::new(), &mut leaves, &b_config, None).unwrap()
 		});
 	});
 
@@ -82,15 +76,17 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
 	{
 		// Builds an archive source from which to benchmark
-		let mut builder = Builder::new().template(Leaf::default().encrypt(false).sign(false));
+		let template = Leaf::default().encrypt(false).sign(false);
 
 		// Add data
-		builder.add(data_1, "d1").unwrap();
-		builder.add(data_2, "d2").unwrap();
-		builder.add(data_3, "d3").unwrap();
+		let mut leaves = [
+			Leaf::new(data_1, "d1").template(&template),
+			Leaf::new(data_2, "d2").template(&template),
+			Leaf::new(data_3, "d3").template(&template),
+		];
 
 		// Dump data
-		black_box(builder.dump(&mut target, &b_config).unwrap());
+		dump(&mut target, &mut leaves, &b_config, None).unwrap();
 	}
 
 	// Load data
diff --git a/crates/vach/src/loader/archive.rs b/crates/vach/src/loader/archive.rs
index 98bf941..a8ee141 100644
--- a/crates/vach/src/loader/archive.rs
+++ b/crates/vach/src/loader/archive.rs
@@ -86,7 +86,6 @@ impl<T> Archive<T> {
 			}
 		}
 
-		// Add read layers
 		// 1: Decryption layer
 		if entry.flags.contains(Flags::ENCRYPTED_FLAG) {
 			#[cfg(feature = "crypto")]
diff --git a/crates/vach/src/tests.rs b/crates/vach/src/tests.rs
index 391e711..cf735cf 100644
--- a/crates/vach/src/tests.rs
+++ b/crates/vach/src/tests.rs
@@ -310,6 +310,7 @@ fn consolidated_test() -> InternalResult {
 
 	// Quick assertions
 	let then = Instant::now();
+
 	assert_eq!(archive.fetch_mut("d1")?.data.as_ref(), data_1);
 	assert_eq!(archive.fetch_mut("d2")?.data.as_ref(), data_2);
 	assert_eq!(archive.fetch_mut("d3")?.data.as_ref(), data_3);
diff --git a/crates/vach/src/writer/mod.rs b/crates/vach/src/writer/mod.rs
index 9c3b7de..7f8b37d 100644
--- a/crates/vach/src/writer/mod.rs
+++ b/crates/vach/src/writer/mod.rs
@@ -13,10 +13,13 @@ pub use leaf::Leaf;
 pub use {leaf::CompressMode, crate::global::compressor::Compressor};
 
 use crate::global::error::*;
-use crate::global::{header::Header, reg_entry::RegistryEntry, flags::Flags};
+use crate::global::{header::Header, reg_entry::RegistryEntry};
 
 #[cfg(feature = "crypto")]
-use {crate::crypto::Encryptor, ed25519_dalek::Signer};
+use {
+	crate::{crypto::Encryptor, global::flags::Flags},
+	ed25519_dalek::Signer,
+};
 
 #[cfg(not(feature = "crypto"))]
 type Encryptor = ();