tests: wdt-bundles: Break out VATIKAN_DECK and VATIKAN_HAND

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

diff --git a/wdriver/wdt-bundles.rs b/wdriver/wdt-bundles.rs
index ec7a503e83532907773dedec21f640cd48543ae9..48c8c982d312c0a311d67bfe09eb6e2d77043b80 100644 (file)
--- a/wdriver/wdt-bundles.rs
+++ b/wdriver/wdt-bundles.rs
@@ -18,6 +18,9 @@ impl Ctx {
   }
 }
 
+const VATIKAN_DECK: Pos = Pos::new(150,184);
+const VATIKAN_HAND: Pos = Pos::new(68, 175);
+
 #[throws(Explode)]
 fn tests(UsualSetup { su, alice, bob, ..}: UsualSetup) {
   let mut c = Ctx { su, alice, bob };
@@ -62,8 +65,8 @@ fn tests(UsualSetup { su, alice, bob, ..}: UsualSetup) {
     let game_spec = &c.su.ds.subst("@specs@/vatikan.game.toml")?;
     c.otter(&["reset"],&[&game_spec])?;
 
-    let deckg = Pos::new(150,184);
-    let handg = Pos::new(68, 175);
+    let deckg = VATIKAN_DECK;
+    let handg = VATIKAN_HAND;
 
     {
       let mut alice = c.su.w(&c.alice)?;