mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-19 14:34:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

linting: a few fixes

Browse Source
This commit is contained in:
Zach Ramsay
2017-10-23 08:30:18 -04:00
parent 8e031b367f
commit 47d3fa4741
4 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keys/cryptostore/holder_test.go
+7 -7
View File
@@ -50,22 +50,22 @@ func TestKeyManagement(t *testing.T) {
assert.NotNil(err)
// list shows them in order
keys, err := cstore.List()
keyS, err := cstore.List()
require.Nil(err)
require.Equal(2, len(keys))
require.Equal(2, len(keyS))
// note these are in alphabetical order
assert.Equal(n2, keys[0].Name)
assert.Equal(n1, keys[1].Name)
assert.Equal(i2.PubKey, keys[0].PubKey)
assert.Equal(n2, keyS[0].Name)
assert.Equal(n1, keyS[1].Name)
assert.Equal(i2.PubKey, keyS[0].PubKey)
// deleting a key removes it
err = cstore.Delete("bad name", "foo")
require.NotNil(err)
err = cstore.Delete(n1, p1)
require.Nil(err)
keys, err = cstore.List()
keyS, err = cstore.List()
require.Nil(err)
assert.Equal(1, len(keys))
assert.Equal(1, len(keyS))
_, err = cstore.Get(n1)
assert.NotNil(err)
keys/storage/filestorage/main.go
+5 -10
View File
@@ -89,11 +89,10 @@ func (s FileStore) Get(name string) (salt []byte, key []byte, info keys.Info, er
// Info for all keys located in this directory.
func (s FileStore) List() (keys.Infos, error) {
dir, err := os.Open(s.keyDir)
defer dir.Close()
if err != nil {
return nil, errors.Wrap(err, "List Keys")
}
defer dir.Close()
names, err := dir.Readdirnames(0)
if err != nil {
@@ -141,11 +140,10 @@ func (s FileStore) nameToPaths(name string) (pub, priv string) {
func readInfo(path string) (info keys.Info, err error) {
f, err := os.Open(path)
defer f.Close()
if err != nil {
return info, errors.Wrap(err, "Reading data")
}
defer f.Close()
d, err := ioutil.ReadAll(f)
if err != nil {
@@ -170,11 +168,10 @@ func readInfo(path string) (info keys.Info, err error) {
func read(path string) (salt, key []byte, name string, err error) {
f, err := os.Open(path)
defer f.Close()
if err != nil {
return nil, nil, "", errors.Wrap(err, "Reading data")
}
defer f.Close()
d, err := ioutil.ReadAll(f)
if err != nil {
@@ -208,11 +205,10 @@ func read(path string) (salt, key []byte, name string, err error) {
func writeInfo(path string, info keys.Info) error {
f, err := os.OpenFile(path, os.O_CREATE|os.O_EXCL|os.O_WRONLY, keyPerm)
defer f.Close()
if err != nil {
return errors.Wrap(err, "Writing data")
}
defer f.Close()
headers := map[string]string{"name": info.Name}
text := crypto.EncodeArmor(BlockType, headers, info.PubKey.Bytes())
@@ -223,11 +219,10 @@ func writeInfo(path string, info keys.Info) error {
func write(path, name string, salt, key []byte) error {
f, err := os.OpenFile(path, os.O_CREATE|os.O_EXCL|os.O_WRONLY, keyPerm)
defer f.Close()
if err != nil {
return errors.Wrap(err, "Writing data")
}
defer f.Close()
headers := map[string]string{
"name": name,