20260506 清理废弃bundle代码并收敛ccr compare view

This commit is contained in:
2026-05-06 16:49:23 +08:00
parent f843eedda9
commit 51663a9410
26 changed files with 16 additions and 7245 deletions

View File

@@ -1,7 +1,7 @@
use std::collections::BTreeSet;
use std::path::{Path, PathBuf};
use rpki::bundle::{VapCompareRow, VrpCompareRow, decode_ccr_compare_views};
use rpki::ccr::{VapCompareRow, VrpCompareRow, decode_ccr_compare_views};
fn fixture(rel: &str) -> PathBuf {
PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(rel)

View File

@@ -64,10 +64,9 @@ fn offline_default_parallel_and_configured_phase2_match_compare_views() {
rpki::ccr::decode_content_info(&configured_ccr_bytes).expect("decode configured ccr");
let (default_vrps, default_vaps) =
rpki::bundle::decode_ccr_compare_views(&default_ccr, "apnic")
.expect("default compare view");
rpki::ccr::decode_ccr_compare_views(&default_ccr, "apnic").expect("default compare view");
let (configured_vrps, configured_vaps) =
rpki::bundle::decode_ccr_compare_views(&configured_ccr, "apnic")
rpki::ccr::decode_ccr_compare_views(&configured_ccr, "apnic")
.expect("configured compare view");
assert_eq!(
@@ -96,8 +95,7 @@ fn offline_default_parallel_and_configured_phase2_match_compare_views() {
fn offline_default_parallel_emits_online_ccr_accumulator_output() {
let (report, ccr_bytes) = run_offline_case(None);
let ccr = rpki::ccr::decode_content_info(&ccr_bytes).expect("decode ccr");
let (_vrps, _vaps) =
rpki::bundle::decode_ccr_compare_views(&ccr, "apnic").expect("compare view");
let (_vrps, _vaps) = rpki::ccr::decode_ccr_compare_views(&ccr, "apnic").expect("compare view");
assert!(
report["publication_points"]
.as_array()