From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 21 May 2021 18:41:17 +0000 (+0100)
Subject: apitest: Use new ds in a couple of places
X-Git-Tag: otter-0.6.0~97
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9531af737eb242e9f056fa4f52f45fc05329eaa4;p=otter.git

apitest: Use new ds in a couple of places

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

diff --git a/apitest/at-bundles.rs b/apitest/at-bundles.rs
index 3fbf195e..b1e09eb0 100644
--- a/apitest/at-bundles.rs
+++ b/apitest/at-bundles.rs
@@ -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()?;
   }