From 26ae02d471bbcf27210ec218ffe2e782c34ea34a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 18 Nov 2020 20:47:14 +0000
Subject: [PATCH] cli: break out access_account

This reverts commit e212270ec6423f2c11574d70cac0f09ec3873c70.
---
 src/bin/otter.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 0c7f38d9..cee40f49 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -615,15 +615,20 @@ fn read_spec<T: DeserializeOwned>(filename: &str, what: &str) -> T {
   })().with_context(|| format!("read {} {:?}", what, filename))?
 }
 
+#[throws(AE)]
+fn access_account(ma: &MainOpts) -> Conn {
+  let mut conn = connect(&ma)?;
+  conn.prep_access_account(ma)?;
+  conn
+}
+
 #[throws(AE)]
 fn access_game(ma: &MainOpts, table_name: &String) -> ConnForGame {
-  let conn = connect(&ma)?;
   let mut chan = ConnForGame {
-    conn,
+    conn: access_account(ma)?,
     game: ma.instance_name(table_name),
     how: MgmtGameUpdateMode::Online,
   };
-  chan.prep_access_account(ma)?;
   chan.join_game(&ma)?;
   chan
 }
-- 
2.30.2