From 3b6bcbf1298556481c5d0ced4365ee41252ebfc9 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 12 Jun 2022 18:45:17 +0100
Subject: [PATCH] apitest: Promote PIA and PIB to where wdriver can use them

I thought I wanted this for replacing literal piece values in tests,
but actually I don't think I do since MGI::ListPieces and list_pieces
will do.  But there seems little harm in it, so keep it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 apitest/apitest.rs | 7 +++++++
 apitest/atmain.rs  | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apitest/apitest.rs b/apitest/apitest.rs
index 2bbdf89f..8bad2194 100644
--- a/apitest/apitest.rs
+++ b/apitest/apitest.rs
@@ -32,6 +32,13 @@ pub type MgmtChannel = ClientMgmtChannel;
 pub type JsV = serde_json::Value;
 pub type MC = MgmtCommand;
 
+mod pi {
+  use otter::prelude::define_index_type;
+  define_index_type!{ pub struct PIA = usize; }
+  define_index_type!{ pub struct PIB = usize; }
+}
+pub use pi::*;
+
 // -------------------- private crates ----------
 
 use otter_support::config::DAEMON_STARTUP_REPORT;
diff --git a/apitest/atmain.rs b/apitest/atmain.rs
index 69b727a7..743090e9 100644
--- a/apitest/atmain.rs
+++ b/apitest/atmain.rs
@@ -211,13 +211,6 @@ impl UsualCtx {
   }
 }
 
-mod pi {
-  use otter::prelude::define_index_type;
-  define_index_type!{ pub struct PIA = usize; }
-  define_index_type!{ pub struct PIB = usize; }
-}
-pub use pi::*;
-
 type Pieces<PI> = IndexVec<PI, PieceInfo<JsV /*~PreparedPieceState*/>>;
 type PiecesSlice<PI> = IndexSlice<PI,[PieceInfo<JsV>]>;
 
-- 
2.30.2