From fac8e596ab3f40f9728c84df53ccf33c2b0beedc Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Apr 2021 17:56:56 +0100
Subject: [PATCH] wdriver: Return Generation, not a String, from synch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 wdriver/wdriver.rs    | 16 ++++++++++------
 wdriver/wdt-simple.rs |  5 +++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/wdriver/wdriver.rs b/wdriver/wdriver.rs
index c07d2c9f..04cf6c3d 100644
--- a/wdriver/wdriver.rs
+++ b/wdriver/wdriver.rs
@@ -632,7 +632,7 @@ impl<'g> WindowGuard<'g> {
   }
 
   #[throws(AE)]
-  fn synch_raw(&mut self) -> String {
+  fn synch_raw(&mut self) -> Generation {
     let gen = self.su.mgmt_conn().game_synch(self.w.instance.clone())?;
     (|| {
       loop {
@@ -658,23 +658,25 @@ impl<'g> WindowGuard<'g> {
       Ok::<(),AE>(())
     })()
       .context("await gen update via async js script")?;
-    synch_logentry(gen).into_html_string()
+    gen
   }
 
   #[throws(AE)]
-  pub fn synch_ignore_js_errors(&mut self) {
-    self.synch_raw()?;
+  pub fn synch_ignore_js_errors(&mut self) -> Generation {
+    let gen = self.synch_raw()?;
 
     self.su.driver.execute_script(r#"
       let e = document.getElementById('error');
       e.innerHTML = "";
     "#)
       .context("clear in-client trapped errors")?;
+
+    gen
   }
 
   #[throws(AE)]
-  pub fn synch(&mut self) {
-    self.synch_raw()?;
+  pub fn synch(&mut self) -> Generation {
+    let gen = self.synch_raw()?;
 
     (|| {
       let errors = self.su.driver.execute_script(r#"
@@ -697,6 +699,8 @@ impl<'g> WindowGuard<'g> {
       Ok::<(),AE>(())
     })()
       .context("check for in-client trapped errors")?;
+
+    gen
   }
 
   /// These come in stacking order, bottom to top.
diff --git a/wdriver/wdt-simple.rs b/wdriver/wdt-simple.rs
index 0412d3f9..d975da2e 100644
--- a/wdriver/wdt-simple.rs
+++ b/wdriver/wdt-simple.rs
@@ -176,6 +176,7 @@ impl Ctx {
       window: &'s Window,
       start: Pos,
       try_end: Pos,
+      gen: Generation,
     }
 
     let mut mk_side = |window, dx| {
@@ -192,9 +193,9 @@ impl Ctx {
         .perform()
         .did("select and release")?;
 
-      w.synch()?;
+      let gen = w.synch()?;
 
-      Ok::<_,AE>(Side { window, start, try_end })
+      Ok::<_,AE>(Side { window, start, try_end, gen })
     };
 
     let sides = [
-- 
2.30.2