From 7803febf2da0ec1674d2dd46654619acccee7268 Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Fri, 18 May 2018 18:17:20 -0600
Subject: [PATCH] refactor; make doc match code

---
 docs/proposed/grid-manager/managed-grid.rst | 11 +++++++++--
 src/allmydata/scripts/tahoe_grid_manager.py |  7 +++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docs/proposed/grid-manager/managed-grid.rst b/docs/proposed/grid-manager/managed-grid.rst
index 342bcf29d..304273fe2 100644
--- a/docs/proposed/grid-manager/managed-grid.rst
+++ b/docs/proposed/grid-manager/managed-grid.rst
@@ -82,8 +82,8 @@ directory specified by the ``--config`` option. It is an error if the
 directory already exists.
 
 
-tahoe grid-manager show-identity
-````````````````````````````````
+tahoe grid-manager public-identity
+``````````````````````````````````
 
 Print out a grid-manager's public key. This key is derived from the
 private-key of the grid-manager, so a valid grid-manager config must
@@ -105,6 +105,13 @@ configuration. (Since it mutates the configuration, if you used
 ``--config -`` the new configuration will be printed to stdout).
 
 
+tahoe grid-manager list
+```````````````````````
+
+Lists all storage-servers that have previously been added using
+``tahoe grid-manager add``.
+
+
 tahoe grid-manager sign
 ```````````````````````
 
diff --git a/src/allmydata/scripts/tahoe_grid_manager.py b/src/allmydata/scripts/tahoe_grid_manager.py
index 6775b38f1..1a8c627ac 100644
--- a/src/allmydata/scripts/tahoe_grid_manager.py
+++ b/src/allmydata/scripts/tahoe_grid_manager.py
@@ -176,6 +176,10 @@ class _GridManager(object):
     def storage_servers(self):
         return self._storage_servers
 
+    def public_identity(self):
+        verify_key_bytes = self._private_key.get_verifying_key_bytes()
+        return base32.b2a(verify_key_bytes)
+
     def sign(self, name):
         try:
             public_key = self._storage_servers[name]
@@ -274,8 +278,7 @@ def _show_identity(gridoptions, options):
     assert gm_config is not None
 
     gm = _load_gridmanager_config(gm_config)
-    verify_key_bytes = gm['private_key'].get_verifying_key_bytes()
-    print(base32.b2a(verify_key_bytes))
+    print(gm.public_identity())
 
 
 def _add(gridoptions, options):