From f6382a58717c89ce6773e698d45c68b0ac518f35 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 18 Nov 2020 20:43:43 +0000
Subject: [PATCH] cli: use CheckAccount

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/bin/otter.rs   | 11 ++++-------
 src/cmdlistener.rs |  2 +-
 src/commands.rs    |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index a0f8a9f4..a8c0f6a1 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -391,18 +391,15 @@ impl ConnForGame {
       let mut resp;
       if wantup.0 {
         desc = "UpdateAccount";
-        resp = self.conn.cmd(&MC::UpdateAccount(clone_via_serde(&ad)))
-          .map(|_|());
+        resp = self.conn.cmd(&MC::UpdateAccount(clone_via_serde(&ad)));
       } else {
-        desc = "AlterGame--Noop";
-        resp = self.alter_game(vec![MGI::Noop], None)
-          .map(|_|());
+        desc = "CheckAccount";
+        resp = self.conn.cmd(&MC::CheckAccount);
       };
       if is_no_account(&resp) {
         ad.access.get_or_insert(Box::new(UrlOnStdout));
         desc = "CreateAccount";
-        resp = self.conn.cmd(&MC::CreateAccount(clone_via_serde(&ad)))
-          .map(|_|());
+        resp = self.conn.cmd(&MC::CreateAccount(clone_via_serde(&ad)));
       }
       resp.with_context(||format!("response to {}", &desc))?;
     }
diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs
index 3eaa4e9e..edddfdfc 100644
--- a/src/cmdlistener.rs
+++ b/src/cmdlistener.rs
@@ -141,7 +141,7 @@ fn execute(cs: &mut CommandStream, cmd: MgmtCommand) -> MgmtResponse {
       Fine
     },
 
-    CheckAccount() => {
+    CheckAccount => {
       let ag = AccountsGuard::lock();
       let _ok = ag.lookup(&cs.current_account()?.notional_account)?;
       Fine
diff --git a/src/commands.rs b/src/commands.rs
index 7ef0c69f..bbe1e89f 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -14,7 +14,7 @@ pub enum MgmtCommand {
   DeleteAccount(AccountName),
 
   SelectAccount(AccountName), // success does not mean account exists
-  CheckAccount(), // success *does* mean account exists and we have access
+  CheckAccount, // success *does* mean account exists and we have access
 
   CreateGame {
     game: InstanceName,
-- 
2.30.2