apitest: Consolidate UsualCtx::prepare_game

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

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index f776b8054d022d12488258edf6147b1e56703c4f..cbb78079f526a07f525a99bbc845462953149aa6 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -9,7 +9,7 @@ type Ctx = UsualCtx;
 impl Ctx {
   #[throws(Explode)]
   fn library_load(&mut self) {
-    prepare_game(&self.su().ds, &self.prctx, TABLE)?;
+    self.prepare_game()?;
 
     let command = self.su().ds.ss(
       "library-list @table@ chess-yellow-?"
@@ -29,7 +29,7 @@ impl Ctx {
 
   #[throws(Explode)]
   fn hidden_hand(&mut self) {
-    prepare_game(&self.su().ds, &default(), TABLE)?;
+    self.prepare_game()?;
     let mut alice = self.connect_player(&self.alice)?;
     let mut bob = self.connect_player(&self.bob)?;
     self.su_mut().mgmt_conn().fakerng_load(&[&"1",&"0"])?;
@@ -185,8 +185,8 @@ impl Ctx {
   #[throws(Explode)]
   fn put_back(&mut self) {
     // Put things back for the ad-hoc human tester
+    self.prepare_game()?;
     let su = self.su();
-    prepare_game(&su.ds, &self.prctx, TABLE)?;
     su.ds.setup_static_users(&mut *su.mgmt_conn.borrow_mut(), default())?;
   }
 

diff --git a/apitest/main.rs b/apitest/main.rs
index e447681da28e2b47d3d379b7599829ee9386212a..d230f64496d3cfb2941bd71d0f1eeda04d06cd63 100644 (file)
--- a/apitest/main.rs
+++ b/apitest/main.rs
@@ -493,6 +493,11 @@ impl UsualCtx {
     self.su().ds.otter_prctx(&self.prctx, &args)?
   }
 
+  #[throws(Explode)]
+  pub fn prepare_game(&mut self) {
+    prepare_game(&self.su().ds, &self.prctx, TABLE)?;
+  }
+
   #[throws(Explode)]
   fn some_library_add(&mut self, command: &[String]) -> Vec<String> {
     let add_err = self.otter(command)