fix(tests): repair botched bounded-read rewrite (mismatched delimiters)

main's "remediate UnboundedAllocation" commit mechanically rewrote
fs::read_to_string(PATH) into a bounded File::open(...).take(...).read_to_string()
form, but for multi-.join(...) paths it glued `.and_then` onto the path's join
instead of File::open and stranded a paren -- leaving 9 test sites that don't
compile (mismatched/unexpected closing delimiter). This reddened ALL januskey CI
(Rust Build + Unit Tests, E2E), #65 included.

Repairs the 9 sites in aspect_test / p2p_test / concurrency_test / e2e_test:
close File::open(FULL_PATH) before .and_then(...), drop the stray paren. Kept
the bounded-read form (respects the remediation's intent); cargo fmt normalized
the expressions. cargo test --workspace green (all suites pass).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BJmfoz1ZS1Pejy9LLMY742

Author: claude

crates/januskey-cli/src/attestation.rs

@@ -269,7 +269,11 @@ impl AuditLog {
     }
 
     /// Log key retrieval
-    pub fn log_key_retrieved(&self, key_id: Uuid, fingerprint: &str) -> std::io::Result<AuditEntry> {
+    pub fn log_key_retrieved(
+        &self,
+        key_id: Uuid,
+        fingerprint: &str,
+    ) -> std::io::Result<AuditEntry> {
         let details = KeyEventDetails {
             key_id,
             fingerprint: fingerprint.to_string(),
@@ -301,11 +305,7 @@ impl AuditLog {
             rotated_to: None,
             rotated_from: Some(old_key_id),
         };
-        let reason = format!(
-            "Rotated from key {} ({})",
-            old_key_id,
-            old_fingerprint
-        );
+        let reason = format!("Rotated from key {} ({})", old_key_id, old_fingerprint);
         self.log_event(AuditEventType::KeyRotated, Some(details), Some(reason))
     }
 
@@ -426,10 +426,7 @@ impl AuditLog {
             valid: true,
             total_entries: entries.len(),
             first_invalid_index: None,
-            message: format!(
-                "Audit log integrity verified: {} entries",
-                entries.len()
-            ),
+            message: format!("Audit log integrity verified: {} entries", entries.len()),
         })
     }
 
@@ -538,14 +535,21 @@ mod tests {
         let key_id = Uuid::new_v4();
         let new_key_id = Uuid::new_v4();
 
-        log.log_key_generated(key_id, "abc", KeyAlgorithm::Aes256Gcm, KeyPurpose::Encryption)
-            .expect("failed to log key generation");
+        log.log_key_generated(
+            key_id,
+            "abc",
+            KeyAlgorithm::Aes256Gcm,
+            KeyPurpose::Encryption,
+        )
+        .expect("failed to log key generation");
         log.log_key_rotated(key_id, "abc", new_key_id, "def")
             .expect("failed to log key rotation");
         log.log_key_revoked(key_id, "abc", Some("rotated"))
             .expect("failed to log key revocation");
 
-        let history = log.get_key_history(key_id).expect("failed to get key history");
+        let history = log
+            .get_key_history(key_id)
+            .expect("failed to get key history");
         assert_eq!(history.len(), 3);
     }
 }

crates/januskey-cli/src/delta.rs

@@ -260,7 +260,11 @@ impl Delta {
         }
 
         // Preserve original line endings
-        let line_ending = if original_str.contains("\r\n") { "\r\n" } else { "\n" };
+        let line_ending = if original_str.contains("\r\n") {
+            "\r\n"
+        } else {
+            "\n"
+        };
         let result = result_lines.join(line_ending);
 
         // Add final newline if original had one
@@ -435,7 +439,12 @@ fn find_block(original: &[u8], start: usize, block: &[u8]) -> Option<usize> {
 }
 
 /// Find how much content before the next matching block
-fn find_next_match(original: &[u8], orig_start: usize, new_content: &[u8], block_size: usize) -> Option<usize> {
+fn find_next_match(
+    original: &[u8],
+    orig_start: usize,
+    new_content: &[u8],
+    block_size: usize,
+) -> Option<usize> {
     for i in 1..new_content.len() {
         let remaining = &new_content[i..];
         if remaining.len() >= block_size {
@@ -495,8 +504,10 @@ mod tests {
 
     #[test]
     fn test_delta_roundtrip() {
-        let original = b"Original content here\nWith multiple lines\nAnd some more text\n".repeat(50);
-        let new = b"Modified content here\nWith multiple lines\nAnd some different text\n".repeat(50);
+        let original =
+            b"Original content here\nWith multiple lines\nAnd some more text\n".repeat(50);
+        let new =
+            b"Modified content here\nWith multiple lines\nAnd some different text\n".repeat(50);
 
         let delta = Delta::compute(&original, &new);
         let restored = delta.apply(&original).unwrap();

crates/januskey-cli/src/keys.rs

@@ -340,7 +340,9 @@ impl KeyManager {
         self.save_store(&store)?;
 
         // Log key generation
-        let _ = self.audit_log.log_key_generated(id, &fingerprint, algorithm, purpose);
+        let _ = self
+            .audit_log
+            .log_key_generated(id, &fingerprint, algorithm, purpose);
 
         Ok(id)
     }
@@ -388,7 +390,9 @@ impl KeyManager {
         }
 
         // Log key retrieval
-        let _ = self.audit_log.log_key_retrieved(id, &wrapped.metadata.fingerprint);
+        let _ = self
+            .audit_log
+            .log_key_retrieved(id, &wrapped.metadata.fingerprint);
 
         unwrap_key(kek, &wrapped)
     }
@@ -445,7 +449,9 @@ impl KeyManager {
         self.save_store(&store)?;
 
         // Log rotation event
-        let _ = self.audit_log.log_key_rotated(id, &old_fingerprint, new_id, &fingerprint);
+        let _ = self
+            .audit_log
+            .log_key_rotated(id, &old_fingerprint, new_id, &fingerprint);
 
         Ok(new_id)
     }
@@ -501,7 +507,9 @@ impl KeyManager {
         self.save_store(&store)?;
 
         // Log revocation with reason
-        let _ = self.audit_log.log_key_revoked(id, &fingerprint, Some(reason));
+        let _ = self
+            .audit_log
+            .log_key_revoked(id, &fingerprint, Some(reason));
 
         Ok(())
     }
@@ -531,7 +539,14 @@ impl KeyManager {
 
     fn load_store_raw(&self) -> Result<KeyStoreData> {
         let path = self.store_path.join("keystore.jks");
-        let content = ({ use std::io::Read; std::fs::File::open(&path).and_then(|mut f| { let mut buf = String::new(); f.take(10 * 1024 * 1024).read_to_string(&mut buf)?; Ok(buf) }) })?;
+        let content = ({
+            use std::io::Read;
+            std::fs::File::open(&path).and_then(|mut f| {
+                let mut buf = String::new();
+                f.take(10 * 1024 * 1024).read_to_string(&mut buf)?;
+                Ok(buf)
+            })
+        })?;
         let store: KeyStoreData = serde_json::from_str(&content)?;
         Ok(store)
     }
@@ -641,7 +656,8 @@ mod tests {
         let mut km = KeyManager::new(tmp.path());
 
         assert!(!km.is_initialized());
-        km.init("test-passphrase").expect("failed to init key manager");
+        km.init("test-passphrase")
+            .expect("failed to init key manager");
         assert!(km.is_initialized());
     }
 
@@ -650,7 +666,8 @@ mod tests {
         let tmp = TempDir::new().expect("failed to create temp dir");
         let mut km = KeyManager::new(tmp.path());
 
-        km.init("test-passphrase").expect("failed to init key manager");
+        km.init("test-passphrase")
+            .expect("failed to init key manager");
 
         let id = km
             .generate(
@@ -676,7 +693,8 @@ mod tests {
         let tmp = TempDir::new().expect("failed to create temp dir");
         let mut km = KeyManager::new(tmp.path());
 
-        km.init("test-passphrase").expect("failed to init key manager");
+        km.init("test-passphrase")
+            .expect("failed to init key manager");
 
         let old_id = km
             .generate(KeyAlgorithm::Aes256Gcm, KeyPurpose::Encryption, None, None)
@@ -697,7 +715,8 @@ mod tests {
         let tmp = TempDir::new().expect("failed to create temp dir");
         let mut km = KeyManager::new(tmp.path());
 
-        km.init("correct-passphrase").expect("failed to init key manager");
+        km.init("correct-passphrase")
+            .expect("failed to init key manager");
 
         // Generate a key so we have something to verify against
         km.generate(KeyAlgorithm::Aes256Gcm, KeyPurpose::Encryption, None, None)

crates/januskey-cli/src/keys_cli.rs

@@ -201,7 +201,10 @@ fn cmd_init(km: &mut KeyManager, _no_recovery: bool) -> Result<(), Box<dyn std::
     println!();
     println!("{}", "✓ Key store initialized successfully".green());
     println!();
-    println!("Location: {}/.januskey/keys/", std::env::current_dir()?.display());
+    println!(
+        "Location: {}/.januskey/keys/",
+        std::env::current_dir()?.display()
+    );
     println!();
     println!("{}", "Next steps:".cyan());
     println!("  • Generate a key:  jk-keys generate --type aes256 --purpose encryption");
@@ -217,12 +220,17 @@ fn cmd_list(km: &mut KeyManager, active_only: bool) -> Result<(), Box<dyn std::e
     let keys = km.list()?;
 
     if keys.is_empty() {
-        println!("{}", "No keys in store. Generate one with: jk-keys generate".yellow());
+        println!(
+            "{}",
+            "No keys in store. Generate one with: jk-keys generate".yellow()
+        );
         return Ok(());
     }
 
     let filtered: Vec<_> = if active_only {
-        keys.into_iter().filter(|k| k.state == KeyState::Active).collect()
+        keys.into_iter()
+            .filter(|k| k.state == KeyState::Active)
+            .collect()
     } else {
         keys
     };
@@ -273,15 +281,27 @@ fn cmd_generate(
         "aes256" | "aes-256" | "aes256gcm" => KeyAlgorithm::Aes256Gcm,
         "ed25519" => KeyAlgorithm::Ed25519,
         "x25519" => KeyAlgorithm::X25519,
-        _ => return Err(format!("Unknown key type: {}. Use: aes256, ed25519, x25519", key_type).into()),
+        _ => {
+            return Err(format!(
+                "Unknown key type: {}. Use: aes256, ed25519, x25519",
+                key_type
+            )
+            .into())
+        }
     };
 
     let key_purpose = match purpose.to_lowercase().as_str() {
         "encryption" | "encrypt" => KeyPurpose::Encryption,
         "signing" | "sign" => KeyPurpose::Signing,
         "keywrap" | "key-wrap" | "wrap" => KeyPurpose::KeyWrap,
         "recovery" => KeyPurpose::Recovery,
-        _ => return Err(format!("Unknown purpose: {}. Use: encryption, signing, keywrap, recovery", purpose).into()),
+        _ => {
+            return Err(format!(
+                "Unknown purpose: {}. Use: encryption, signing, keywrap, recovery",
+                purpose
+            )
+            .into())
+        }
     };
 
     println!("{}", "Generating key...".cyan());
@@ -318,7 +338,10 @@ fn cmd_show(km: &mut KeyManager, key_id: Uuid) -> Result<(), Box<dyn std::error:
     println!("  Purpose:     {}", meta.purpose);
     println!("  State:       {}", format_state(meta.state));
     println!("  Fingerprint: {}", meta.fingerprint.cyan());
-    println!("  Created:     {}", meta.created_at.format("%Y-%m-%d %H:%M:%S UTC"));
+    println!(
+        "  Created:     {}",
+        meta.created_at.format("%Y-%m-%d %H:%M:%S UTC")
+    );
 
     if let Some(exp) = meta.expires_at {
         let now = chrono::Utc::now();
@@ -327,7 +350,11 @@ fn cmd_show(km: &mut KeyManager, key_id: Uuid) -> Result<(), Box<dyn std::error:
         } else {
             "".normal()
         };
-        println!("  Expires:     {}{}", exp.format("%Y-%m-%d %H:%M:%S UTC"), status);
+        println!(
+            "  Expires:     {}{}",
+            exp.format("%Y-%m-%d %H:%M:%S UTC"),
+            status
+        );
     }
 
     if let Some(rot) = meta.rotation_of {
@@ -470,9 +497,7 @@ fn unlock_store(km: &mut KeyManager) -> Result<(), Box<dyn std::error::Error>> {
         return Err("Key store not initialized. Run 'jk-keys init' first.".into());
     }
 
-    let passphrase = Password::new()
-        .with_prompt("Enter passphrase")
-        .interact()?;
+    let passphrase = Password::new().with_prompt("Enter passphrase").interact()?;
 
     km.unlock(&passphrase)?;
     Ok(())
@@ -563,18 +588,29 @@ fn cmd_audit_history(km: &mut KeyManager, key_id: Uuid) -> Result<(), Box<dyn st
     let entries = km.audit_log().get_key_history(key_id)?;
 
     if entries.is_empty() {
-        println!("{}", format!("No audit entries found for key {}", key_id).yellow());
+        println!(
+            "{}",
+            format!("No audit entries found for key {}", key_id).yellow()
+        );
         return Ok(());
     }
 
-    println!("{}", format!("Audit History for Key: {}", key_id).cyan().bold());
+    println!(
+        "{}",
+        format!("Audit History for Key: {}", key_id).cyan().bold()
+    );
     println!();
 
     for entry in entries {
         let timestamp = entry.timestamp.format("%Y-%m-%d %H:%M:%S UTC");
         let event_str = format_event_type(entry.event_type);
 
-        println!("{} {} by {}", timestamp.to_string().dimmed(), event_str, entry.actor);
+        println!(
+            "{} {} by {}",
+            timestamp.to_string().dimmed(),
+            event_str,
+            entry.actor
+        );
 
         if let Some(ref kd) = entry.key_details {
             println!("  Fingerprint: {}", kd.fingerprint.cyan());
@@ -622,19 +658,27 @@ fn cmd_audit_verify(km: &mut KeyManager) -> Result<(), Box<dyn std::error::Error
         println!();
         println!(
             "{}",
-            "WARNING: The audit log may have been tampered with!".yellow().bold()
+            "WARNING: The audit log may have been tampered with!"
+                .yellow()
+                .bold()
         );
     }
 
     Ok(())
 }
 
-fn cmd_audit_export(km: &mut KeyManager, output: &PathBuf) -> Result<(), Box<dyn std::error::Error>> {
+fn cmd_audit_export(
+    km: &mut KeyManager,
+    output: &PathBuf,
+) -> Result<(), Box<dyn std::error::Error>> {
     unlock_store(km)?;
 
     if output.exists() {
         let confirm = Confirm::new()
-            .with_prompt(format!("File {} already exists. Overwrite?", output.display()))
+            .with_prompt(format!(
+                "File {} already exists. Overwrite?",
+                output.display()
+            ))
             .default(false)
             .interact()?;
 

crates/januskey-cli/src/lib.rs

@@ -24,15 +24,13 @@ pub mod operations;
 pub use reversible_core::content_store::{self, ContentHash, ContentStore};
 /// Error module — re-exports reversible-core error types with JanusKey naming
 pub mod error {
-    pub use reversible_core::error::ReversibleError as JanusError;
     pub use reversible_core::error::Result;
+    pub use reversible_core::error::ReversibleError as JanusError;
 }
 pub use error::{JanusError, Result};
 pub use reversible_core::manifest::{self, ManifestEmitter};
 pub use reversible_core::metadata::{self, MetadataStore, OperationMetadata, OperationType};
-pub use reversible_core::transaction::{
-    self, Transaction, TransactionManager, TransactionPreview,
-};
+pub use reversible_core::transaction::{self, Transaction, TransactionManager, TransactionPreview};
 pub use reversible_core::ReversibleExecutor;
 
 pub use attestation::{AuditEntry, AuditEventType, AuditLog, IntegrityReport, KeyEventDetails};
@@ -78,7 +76,14 @@ impl Config {
     pub fn load(dir: &std::path::Path) -> Self {
         let config_path = dir.join(".januskey").join("config.json");
         if config_path.exists() {
-            if let Ok(content) = ({ use std::io::Read; std::fs::File::open(&config_path).and_then(|mut f| { let mut buf = String::new(); f.take(10 * 1024 * 1024).read_to_string(&mut buf)?; Ok(buf) }) }) {
+            if let Ok(content) = ({
+                use std::io::Read;
+                std::fs::File::open(&config_path).and_then(|mut f| {
+                    let mut buf = String::new();
+                    f.take(10 * 1024 * 1024).read_to_string(&mut buf)?;
+                    Ok(buf)
+                })
+            }) {
                 if let Ok(config) = serde_json::from_str(&content) {
                     return config;
                 }