20260401 live recorder 扩展到1+N个delta，完成5个RIR录制，以及三方replay，结果三方均对齐vrps和vaps

src/bin/replay_bundle_capture.rs

@@ -1,7 +1,8 @@
 use rpki::bundle::{
-    BundleManifest, BundleManifestEntry, RirBundleMetadata, RecordingHttpFetcher,
-    RecordingRsyncFetcher, build_vap_compare_rows, build_vrp_compare_rows,
-    write_live_base_replay_bundle_inputs, write_vap_csv, write_vrp_csv,
+    RirBundleMetadata, RecordingHttpFetcher, RecordingRsyncFetcher,
+    build_single_rir_bundle_manifest, build_vap_compare_rows, build_vrp_compare_rows,
+    sha256_hex, write_json, write_live_base_replay_bundle_inputs, write_live_bundle_rir_readme,
+    write_live_bundle_top_readme, write_timing_json, write_vap_csv, write_vrp_csv,
 };
 use rpki::ccr::{build_ccr_from_run, verify_content_info, write_ccr_file};
 use rpki::fetch::http::{BlockingHttpFetcher, HttpFetcherConfig};
@@ -13,9 +14,8 @@ use rpki::validation::run_tree_from_tal::{
     run_tree_from_tal_and_ta_der_serial_audit,
 };
 use rpki::validation::tree::TreeRunConfig;
-use sha2::Digest;
 use std::fs;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::time::Instant;
 use time::format_description::well_known::Rfc3339;
 
@@ -135,57 +135,6 @@ fn parse_args(argv: &[String]) -> Result<Args, String> {
     Ok(args)
 }
 
-fn sha256_hex(bytes: &[u8]) -> String {
-    hex::encode(sha2::Sha256::digest(bytes))
-}
-
-fn write_json(path: &Path, value: &impl serde::Serialize) -> Result<(), String> {
-    if let Some(parent) = path.parent() {
-        fs::create_dir_all(parent)
-            .map_err(|e| format!("create parent failed: {}: {e}", parent.display()))?;
-    }
-    let bytes = serde_json::to_vec_pretty(value).map_err(|e| e.to_string())?;
-    fs::write(path, bytes).map_err(|e| format!("write json failed: {}: {e}", path.display()))
-}
-
-fn write_timing_json(
-    path: &Path,
-    mode: &str,
-    validation_time: &time::OffsetDateTime,
-    duration: std::time::Duration,
-) -> Result<(), String> {
-    write_json(
-        path,
-        &serde_json::json!({
-            "mode": mode,
-            "validationTime": validation_time
-                .format(&Rfc3339)
-                .map_err(|e| format!("format validation time failed: {e}"))?,
-            "durationSeconds": duration.as_secs_f64(),
-        }),
-    )
-}
-
-fn write_top_readme(path: &Path, rir: &str) -> Result<(), String> {
-    fs::write(
-        path,
-        format!(
-            "# Ours Live Replay Bundle\n\nThis run contains one per-RIR bundle recorded online by `ours`.\n\n- RIR: `{rir}`\n- Reference result format: `CCR`\n"
-        ),
-    )
-    .map_err(|e| format!("write readme failed: {}: {e}", path.display()))
-}
-
-fn write_rir_readme(path: &Path, rir: &str, base_validation_time: &str) -> Result<(), String> {
-    fs::write(
-        path,
-        format!(
-            "# {rir} live replay bundle\n\n- `tal.tal` and `ta.cer` are the actual live run inputs.\n- `base-locks.json.validationTime` = `{base_validation_time}`.\n- `base.ccr` is the authoritative reference result.\n- `base-vrps.csv` and `base-vaps.csv` are compare views derived from `base.ccr`.\n"
-        ),
-    )
-    .map_err(|e| format!("write rir readme failed: {}: {e}", path.display()))
-}
-
 fn run(args: Args) -> Result<PathBuf, String> {
     let rir = args.rir.as_ref().unwrap();
     let rir_normalized = rir.to_ascii_lowercase();
@@ -370,25 +319,18 @@ fn run(args: Args) -> Result<PathBuf, String> {
             }
         }),
     )?;
-    write_top_readme(&out_root.join("README.md"), &rir_normalized)?;
-    write_rir_readme(&rir_dir.join("README.md"), &rir_normalized, &metadata.base_validation_time)?;
+    write_live_bundle_top_readme(&out_root.join("README.md"), &rir_normalized)?;
+    write_live_bundle_rir_readme(&rir_dir.join("README.md"), &rir_normalized, &metadata.base_validation_time)?;
     write_json(
         &out_root.join("bundle-manifest.json"),
-        &BundleManifest {
-            schema_version: "20260330-v1".to_string(),
-            bundle_producer: "ours".to_string(),
-            recorded_at_rfc3339_utc: time::OffsetDateTime::now_utc()
-                .format(&Rfc3339)
-                .map_err(|e| format!("format recorded_at failed: {e}"))?,
-            rirs: vec![rir_normalized.clone()],
-            per_rir_bundles: vec![BundleManifestEntry {
-                rir: rir_normalized.clone(),
-                relative_path: rir_normalized,
-                base_validation_time: metadata.base_validation_time.clone(),
-                delta_validation_time: None,
-                has_aspa: metadata.has_aspa,
-            }],
-        },
+        &build_single_rir_bundle_manifest(
+            "20260330-v1",
+            "ours",
+            &rir_normalized,
+            &validation_time,
+            None,
+            metadata.has_aspa,
+        )?,
     )?;
 
     let _ = fs::remove_dir_all(&db_dir);
@@ -424,7 +366,7 @@ mod tests {
         ];
         let args = parse_args(&argv).expect("parse");
         assert_eq!(args.rir.as_deref(), Some("apnic"));
-        assert_eq!(args.out_dir.as_deref(), Some(Path::new("out")));
+        assert_eq!(args.out_dir.as_deref(), Some(std::path::Path::new("out")));
         assert_eq!(args.http_timeout_secs, 20);
         assert_eq!(args.rsync_timeout_secs, 60);
     }