Expose address in keyinfo, add get command

This commit is contained in:
Ethan Frey
2017-02-28 20:07:44 +01:00
parent d5931c9ee3
commit c59e2d7d13
11 changed files with 89 additions and 17 deletions
+2 -2
View File
@@ -74,7 +74,7 @@ func (s FileStore) Get(name string) ([]byte, keys.Info, error) {
}
key, _, err := read(priv)
return key, info, err
return key, info.Format(), err
}
// List parses the key directory for public info and returns a list of
@@ -99,7 +99,7 @@ func (s FileStore) List() (keys.Infos, error) {
if err != nil {
return nil, err
}
infos = append(infos, info)
infos = append(infos, info.Format())
}
}
+4 -2
View File
@@ -49,11 +49,13 @@ func TestBasicCRUD(t *testing.T) {
k, i, err := store.Get(name)
require.Nil(err, "%+v", err)
assert.Equal(key, k)
assert.Equal(info, i)
assert.Equal(info.Name, i.Name)
assert.Equal(info.PubKey, i.PubKey)
assert.NotEmpty(i.Address)
l, err = store.List()
require.Nil(err, "%+v", err)
assert.Equal(1, len(l))
assert.Equal(info, l[0])
assert.Equal(i, l[0])
// querying a non-existent key fails
_, _, err = store.Get("badname")
+2 -2
View File
@@ -44,7 +44,7 @@ func (s MemStore) Get(name string) ([]byte, keys.Info, error) {
if !ok {
err = errors.Errorf("Key named '%s' doesn't exist", name)
}
return d.key, d.info, err
return d.key, d.info.Format(), err
}
// List returns the public info of all keys in the MemStore in unsorted order
@@ -52,7 +52,7 @@ func (s MemStore) List() (keys.Infos, error) {
res := make([]keys.Info, len(s))
i := 0
for _, d := range s {
res[i] = d.info
res[i] = d.info.Format()
i++
}
return res, nil
+4 -2
View File
@@ -41,11 +41,13 @@ func TestBasicCRUD(t *testing.T) {
k, i, err := store.Get(name)
assert.Nil(err)
assert.Equal(key, k)
assert.Equal(info, i)
assert.Equal(info.Name, i.Name)
assert.Equal(info.PubKey, i.PubKey)
assert.NotEmpty(i.Address)
l, err = store.List()
assert.Nil(err)
assert.Equal(1, len(l))
assert.Equal(info, l[0])
assert.Equal(i, l[0])
// querying a non-existent key fails
_, _, err = store.Get("badname")