将fetch pp cache改成使用vcir结构，跑通apnic全量同步

src/validation/tree.rs

@@ -1,10 +1,10 @@
 use crate::audit::DiscoveredFrom;
 use crate::audit::PublicationPointAudit;
 use crate::data_model::rc::{AsResourceSet, IpResourceSet};
-use crate::report::{RfcRef, Warning};
-use crate::storage::FetchCachePpPack;
+use crate::report::Warning;
 use crate::validation::manifest::PublicationPointSource;
 use crate::validation::objects::{AspaAttestation, ObjectsOutput, Vrp};
+use crate::validation::publication_point::PublicationPointSnapshot;
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct TreeRunConfig {
@@ -12,10 +12,6 @@ pub struct TreeRunConfig {
     pub max_depth: Option<usize>,
     /// Max number of CA instances to process.
     pub max_instances: Option<usize>,
-    /// Skip RRDP/rsync fetch and re-validate from existing `fetch_cache_pp` packs in the DB.
-    ///
-    /// This is primarily intended for profiling/analysis runs to remove network noise.
-    pub revalidate_only: bool,
 }
 
 impl Default for TreeRunConfig {
@@ -23,7 +19,6 @@ impl Default for TreeRunConfig {
         Self {
             max_depth: None,
             max_instances: None,
-            revalidate_only: false,
         }
     }
 }
@@ -31,6 +26,8 @@ impl Default for TreeRunConfig {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CaInstanceHandle {
     pub depth: usize,
+    pub tal_id: String,
+    pub parent_manifest_rsync_uri: Option<String>,
     /// DER bytes of the CA certificate for this CA instance.
     pub ca_certificate_der: Vec<u8>,
     /// rsync URI of this CA certificate object (where it is published).
@@ -59,15 +56,15 @@ impl CaInstanceHandle {
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PublicationPointRunResult {
     pub source: PublicationPointSource,
-    pub pack: FetchCachePpPack,
+    pub snapshot: Option<PublicationPointSnapshot>,
     pub warnings: Vec<Warning>,
     pub objects: ObjectsOutput,
     pub audit: PublicationPointAudit,
-    /// Candidate child CA instances discovered from this publication point.
+    /// Candidate child CA instances to enqueue after this publication point completes.
     ///
-    /// RFC 9286 §6.6 restriction is enforced by the tree engine: if this
-    /// publication point used fetch_cache_pp due to failed fetch, children MUST NOT
-    /// be enqueued/processed in this run.
+    /// - For `Fresh`, these are discovered from the current validated publication point.
+    /// - For `VcirCurrentInstance`, these are restored from the current instance VCIR and then
+    ///   processed fresh-first when their own turn arrives.
     pub discovered_children: Vec<DiscoveredChildCaInstance>,
 }
 
@@ -187,37 +184,25 @@ pub fn run_tree_serial_audit(
         audit.discovered_from = node.discovered_from.clone();
         publication_points.push(audit);
 
-        let enqueue_children =
-            res.source == PublicationPointSource::Fresh || config.revalidate_only;
-        if !enqueue_children && !res.discovered_children.is_empty() {
-            warnings.push(
-                Warning::new("skipping child CA discovery due to failed fetch cache use")
-                    .with_rfc_refs(&[RfcRef("RFC 9286 §6.6")])
-                    .with_context(&ca.manifest_rsync_uri),
-            );
-        }
-
-        if enqueue_children {
-            let mut children = res.discovered_children;
-            children.sort_by(|a, b| {
-                a.handle
-                    .manifest_rsync_uri
-                    .cmp(&b.handle.manifest_rsync_uri)
-                    .then_with(|| {
-                        a.discovered_from
-                            .child_ca_certificate_rsync_uri
-                            .cmp(&b.discovered_from.child_ca_certificate_rsync_uri)
-                    })
+        let mut children = res.discovered_children;
+        children.sort_by(|a, b| {
+            a.handle
+                .manifest_rsync_uri
+                .cmp(&b.handle.manifest_rsync_uri)
+                .then_with(|| {
+                    a.discovered_from
+                        .child_ca_certificate_rsync_uri
+                        .cmp(&b.discovered_from.child_ca_certificate_rsync_uri)
+                })
+        });
+        for child in children {
+            queue.push_back(QueuedCaInstance {
+                id: next_id,
+                handle: child.handle.with_depth(ca.depth + 1),
+                parent_id: Some(node.id),
+                discovered_from: Some(child.discovered_from),
             });
-            for child in children {
-                queue.push_back(QueuedCaInstance {
-                    id: next_id,
-                    handle: child.handle.with_depth(ca.depth + 1),
-                    parent_id: Some(node.id),
-                    discovered_from: Some(child.discovered_from),
-                });
-                next_id += 1;
-            }
+            next_id += 1;
         }
     }