cli: use CheckAccount

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

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index a0f8a9f49471b9e23d970d023c71814f2de08f1d..a8c0f6a11f54d761798e77f1c14ea09da2b02990 100644 (file)
--- 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 3eaa4e9e84570302ca3506b050e386ac4df163cb..edddfdfce37afee52d310fd3627a5f4f9ccd1840 100644 (file)
--- 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 7ef0c69f5a3528c16d8ef0c602ccbaa1b5dad753..bbe1e89fc03dfbc78c431d74142c4238f5986e34 100644 (file)
--- 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,