From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 19:28:34 +0000 (+0000)
Subject: wdt-altergame: Refactor to use UsualSetup
X-Git-Tag: otter-0.4.0~491
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fd6e0b3163a760464f73a1f11e89e6e25f05e39b;p=otter.git

wdt-altergame: Refactor to use UsualSetup

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

diff --git a/wdriver/wdt-altergame.rs b/wdriver/wdt-altergame.rs
index c75539cd..07d69d96 100644
--- a/wdriver/wdt-altergame.rs
+++ b/wdriver/wdt-altergame.rs
@@ -65,12 +65,7 @@ impl Ctx {
 }
 
 #[throws(AE)]
-fn main(){
-  let (mut su, inst) = setup(module_path!()).always_context("setup")?;
-  let [alice, _]: [Window; 2] =
-    su.setup_static_users(&inst)?.try_into().unwrap();
-  debug!("ok {:?}", alice);
-
+fn tests(UsualSetup { su, alice, ..}: UsualSetup) {
   let mut c = Ctx { su, alice };
 
   test!(c, "links", {
@@ -90,5 +85,8 @@ fn main(){
     alice.synch()?;
   });
 
-  info!("ok");
+  debug!("finishing");
 }
+
+#[throws(AE)]
+fn main() { as_usual(tests)? }