From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 17 Apr 2022 15:10:15 +0000 (+0100)
Subject: hidden: Add another consistency check for pieces<->notches
X-Git-Tag: otter-1.1.0~516
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b50c5b253fd486d4e59a864c585d1f0a62ba9386;p=otter.git

hidden: Add another consistency check for pieces<->notches

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/vpid.rs b/src/vpid.rs
index f0575cbb..5ff139d4 100644
--- a/src/vpid.rs
+++ b/src/vpid.rs
@@ -410,6 +410,15 @@ pub fn consistency_check(
     let ogpc = gpieces.get(occ.occulter).unwrap();
     assert_eq!(ogpc.occult.active, Some(occid));
     assert_eq!(occ.notches.table.len(), occ.notches.zg.len());
+
+    for (notch, nr) in occ.notches.table.iter_enumerated() {
+      if_let!{ Some(ppiece) = nr.piece(); else continue };
+      let pgpc = gpieces.get(ppiece).unwrap();
+      let passive = pgpc.occult.passive.as_ref().unwrap();
+      assert_eq!(passive.occid, occid);
+      assert_eq!(passive.notch, notch);
+    }
+
     let nfree1 = occ.notches.table.iter()
       .filter(|nr| nr.piece().is_none()).count();
     let mut walk = occ.notches.freelist;