chiark / gitweb /
apitest: Use new ds in a couple of places
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 21 May 2021 18:41:17 +0000 (19:41 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 21 May 2021 18:41:17 +0000 (19:41 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
apitest/at-bundles.rs

index 3fbf195e8bef2f33a4310a8b6af5cc2376f8d36c..b1e09eb014f68252e3701f0ea7d0cbd3c0e3466f 100644 (file)
@@ -20,8 +20,7 @@ impl Ctx {
       "big-bundle","duped-example", "chess-purple-cannon", "a purple cannon",
       &mut |ctx|
     {
-      let cmd = ctx.ds().gss("reset modded-spec")?;
-      ctx.reset_game(&cmd)?;
+      ctx.reset_game(&ctx.ds().gss("reset modded-spec")?)?;
 
       let alice = ctx.connect_player(&ctx.alice)?;
       let pieces = alice.pieces::<PIA>()?;
@@ -50,10 +49,9 @@ impl Ctx {
   fn reset_with_bundles(&mut self) {
     self.clear_reset_to_demo()?;
 
-    let cmd = self.ds().gss(
+    self.reset_game(&self.ds().gss(
       "reset demo-in-test-bundle @examples@/test-bundle.zip"
-    )?;
-    self.reset_game(&cmd)?;
+    )?)?;
 
     self.clear_reset_to_demo()?;
   }