handle changing default address
This commit is contained in:
+1
-1
@@ -327,7 +327,7 @@ func (fsr *fsLockedRepo) Put(name string, info types.KeyInfo) error {
|
||||
|
||||
_, err := os.Stat(keyPath)
|
||||
if err == nil {
|
||||
return xerrors.Errorf("checking key before put '%s': %w", name, ErrKeyExists)
|
||||
return xerrors.Errorf("checking key before put '%s': %w", name, types.ErrKeyExists)
|
||||
} else if !os.IsNotExist(err) {
|
||||
return xerrors.Errorf("checking key before put '%s': %w", name, err)
|
||||
}
|
||||
|
||||
@@ -15,8 +15,6 @@ var (
|
||||
ErrNoAPIToken = errors.New("API token not set")
|
||||
ErrRepoAlreadyLocked = errors.New("repo is already locked")
|
||||
ErrClosedRepo = errors.New("repo is no longer open")
|
||||
|
||||
ErrKeyExists = errors.New("key already exists")
|
||||
)
|
||||
|
||||
type Repo interface {
|
||||
|
||||
@@ -219,7 +219,7 @@ func (lmem *lockedMemRepo) Put(name string, key types.KeyInfo) error {
|
||||
|
||||
_, isThere := lmem.mem.keystore[name]
|
||||
if isThere {
|
||||
return xerrors.Errorf("putting key '%s': %w", name, ErrKeyExists)
|
||||
return xerrors.Errorf("putting key '%s': %w", name, types.ErrKeyExists)
|
||||
}
|
||||
|
||||
lmem.mem.keystore[name] = key
|
||||
|
||||
@@ -81,7 +81,7 @@ func basicTest(t *testing.T, repo Repo) {
|
||||
|
||||
err = kstr.Put("k1", k1)
|
||||
if assert.Error(t, err, "putting key under the same name should error") {
|
||||
assert.True(t, xerrors.Is(err, ErrKeyExists), "returned error is ErrKeyExists")
|
||||
assert.True(t, xerrors.Is(err, types.ErrKeyExists), "returned error is ErrKeyExists")
|
||||
}
|
||||
|
||||
k1prim, err := kstr.Get("k1")
|
||||
|
||||
Reference in New Issue
Block a user