apitest: Prep refactor updates

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

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index 388fa7d8597260bc80ab6c787dcdd934b1f4080f..0776d2a213e6c5091871e59b814de21881f45a96 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -245,13 +245,20 @@ impl Session {
   }
 
   #[throws(AE)]
-  fn synch(&mut self, su: &mut SetupCore) {
+  fn synchx<
+    F: FnMut(&mut Session, Generation, &str, &serde_json::Value),
+  > (&mut self, su: &mut SetupCore, mut f: F) {
     let exp = mgmt_game_synch(&mut su.mgmt_conn, TABLE.parse().unwrap())?;
     self.await_update(
-      |session, gen        | (gen == exp).as_option(),
-      |_session, _gen, _k, _v| None,
+      |session, gen      | (gen == exp).as_option(),
+      |session, gen, k, v| { f(session,gen,k,v); None },
     )?;
   }
+
+  #[throws(AE)]
+  fn synch(&mut self, su: &mut SetupCore) {
+    self.synchx(su, |_session, _gen, _k, _v|() )?;
+  }
 }
 
 impl Ctx {