From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2021 00:52:50 +0000 (+0000)
Subject: apitest: Prep refactor updates
X-Git-Tag: otter-0.4.0~337
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=725e1b841c448726d6ab44d1f5b6180821a39428;p=otter.git

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 6a33ef3f..388fa7d8 100644
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -225,9 +225,9 @@ impl Session {
   #[throws(AE)]
   fn await_update<
     R,
-    G: FnMut(&mut Session, Generation) -> Option<R>,
     F: FnMut(&mut Session, Generation, &str, &serde_json::Value) -> Option<R>,
-   > (&mut self, mut f: F, mut g: G) -> R {
+    G: FnMut(&mut Session, Generation) -> Option<R>,
+   > (&mut self, mut g: G, mut f: F) -> R {
     'overall: loop {
       let update = self.updates.recv()?;
       let update = update.as_array().unwrap();
@@ -248,8 +248,8 @@ impl Session {
   fn synch(&mut self, su: &mut SetupCore) {
     let exp = mgmt_game_synch(&mut su.mgmt_conn, TABLE.parse().unwrap())?;
     self.await_update(
-      |session, gen, _k, _v| (gen == exp).as_option(),
       |session, gen        | (gen == exp).as_option(),
+      |_session, _gen, _k, _v| None,
     )?;
   }
 }