20260519_2 收紧CCR/CIR四文件分诊

src/bin/ccr_state_compare.rs

@@ -303,9 +303,9 @@ fn build_compare_view_fallback(
 
 fn decode_views(
     content_info: &CcrContentInfo,
-    trust_anchor: &str,
+    _trust_anchor: &str,
 ) -> Result<(BTreeSet<VrpCompareRow>, BTreeSet<VapCompareRow>), String> {
-    decode_ccr_compare_views(content_info, trust_anchor)
+    decode_ccr_compare_views(content_info)
 }
 
 fn compare_sets<T: Ord + Clone>(ours: &BTreeSet<T>, rpki_client: &BTreeSet<T>) -> SetSummary<T> {

src/bin/ccr_to_compare_views.rs

@@ -6,18 +6,14 @@ struct Args {
     ccr_path: Option<std::path::PathBuf>,
     vrps_out_path: Option<std::path::PathBuf>,
     vaps_out_path: Option<std::path::PathBuf>,
-    trust_anchor: String,
 }
 
 fn usage() -> &'static str {
-    "Usage: ccr_to_compare_views --ccr <path> --vrps-out <path> --vaps-out <path> [--trust-anchor <name>]"
+    "Usage: ccr_to_compare_views --ccr <path> --vrps-out <path> --vaps-out <path> [--trust-anchor <ignored>]"
 }
 
 fn parse_args(argv: &[String]) -> Result<Args, String> {
-    let mut args = Args {
-        trust_anchor: "unknown".to_string(),
-        ..Args::default()
-    };
+    let mut args = Args::default();
     let mut i = 1usize;
     while i < argv.len() {
         match argv[i].as_str() {
@@ -38,8 +34,7 @@ fn parse_args(argv: &[String]) -> Result<Args, String> {
             }
             "--trust-anchor" => {
                 i += 1;
-                let v = argv.get(i).ok_or("--trust-anchor requires a value")?;
-                args.trust_anchor = v.clone();
+                argv.get(i).ok_or("--trust-anchor requires a value")?;
             }
             "-h" | "--help" => return Err(usage().to_string()),
             other => return Err(format!("unknown argument: {other}\n{}", usage())),
@@ -64,8 +59,7 @@ fn main() -> Result<(), String> {
     let bytes = std::fs::read(ccr_path)
         .map_err(|e| format!("read ccr failed: {}: {e}", ccr_path.display()))?;
     let content_info = decode_content_info(&bytes).map_err(|e| e.to_string())?;
-    let (vrps, vaps) =
-        decode_ccr_compare_views(&content_info, &args.trust_anchor).map_err(|e| e.to_string())?;
+    let (vrps, vaps) = decode_ccr_compare_views(&content_info).map_err(|e| e.to_string())?;
     write_vrp_csv(args.vrps_out_path.as_ref().unwrap(), &vrps)?;
     write_vap_csv(args.vaps_out_path.as_ref().unwrap(), &vaps)?;
     println!(
@@ -106,7 +100,6 @@ mod tests {
             args.vaps_out_path.as_deref(),
             Some(std::path::Path::new("vaps.csv"))
         );
-        assert_eq!(args.trust_anchor, "apnic");
     }
 
     #[test]

src/bin/ccr_to_routinator_csv.rs

@@ -5,18 +5,14 @@ use std::io::Write;
 struct Args {
     ccr_path: Option<std::path::PathBuf>,
     out_path: Option<std::path::PathBuf>,
-    trust_anchor: String,
 }
 
 fn usage() -> &'static str {
-    "Usage: ccr_to_routinator_csv --ccr <path> --out <path> [--trust-anchor <name>]"
+    "Usage: ccr_to_routinator_csv --ccr <path> --out <path> [--trust-anchor <ignored>]"
 }
 
 fn parse_args(argv: &[String]) -> Result<Args, String> {
-    let mut args = Args {
-        trust_anchor: "unknown".to_string(),
-        ..Args::default()
-    };
+    let mut args = Args::default();
     let mut i = 1usize;
     while i < argv.len() {
         match argv[i].as_str() {
@@ -32,8 +28,7 @@ fn parse_args(argv: &[String]) -> Result<Args, String> {
             }
             "--trust-anchor" => {
                 i += 1;
-                let v = argv.get(i).ok_or("--trust-anchor requires a value")?;
-                args.trust_anchor = v.clone();
+                argv.get(i).ok_or("--trust-anchor requires a value")?;
             }
             "-h" | "--help" => return Err(usage().to_string()),
             other => return Err(format!("unknown argument: {other}\n{}", usage())),
@@ -74,8 +69,7 @@ fn main() -> Result<(), String> {
     );
     writeln!(file, "ASN,IP Prefix,Max Length,Trust Anchor").map_err(|e| e.to_string())?;
     for (asn, prefix, max_len) in rows {
-        writeln!(file, "AS{asn},{prefix},{max_len},{}", args.trust_anchor)
-            .map_err(|e| e.to_string())?;
+        writeln!(file, "AS{asn},{prefix},{max_len},unknown").map_err(|e| e.to_string())?;
     }
     println!("{}", out_path.display());
     Ok(())
@@ -105,7 +99,6 @@ mod tests {
             args.out_path.as_deref(),
             Some(std::path::Path::new("out.csv"))
         );
-        assert_eq!(args.trust_anchor, "apnic");
     }
 
     #[test]

src/bin/cir_drop_report.rs

@@ -117,8 +117,8 @@ fn main() -> Result<(), String> {
         &std::fs::read(&ccr_path).map_err(|e| format!("read ccr failed: {e}"))?,
     )
     .map_err(|e| format!("decode ccr failed: {e}"))?;
-    let (vrps, vaps) = decode_ccr_compare_views(&ccr, "unknown")
-        .map_err(|e| format!("decode compare views failed: {e}"))?;
+    let (vrps, vaps) =
+        decode_ccr_compare_views(&ccr).map_err(|e| format!("decode compare views failed: {e}"))?;
     let report: serde_json::Value = serde_json::from_slice(
         &std::fs::read(&report_path).map_err(|e| format!("read report failed: {e}"))?,
     )