gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

acounts/keystore, cmd/faucet: fix faucet double import, fix twitter url

Browse Source
This commit is contained in:
Péter Szilágyi
2020-06-04 08:59:26 +03:00
parent 8b83125739
commit 469b8739eb
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accounts/keystore/keystore.go
View File

@ -43,6 +43,10 @@ var (
ErrLocked = accounts.NewAuthNeededError("password or unlock")
ErrNoMatch = errors.New("no key for given address or file")
ErrDecrypt = errors.New("could not decrypt key with given password")
// ErrAccountAlreadyExists is returned if an account attempted to import is
// already present in the keystore.
ErrAccountAlreadyExists = errors.New("account alreaady exists")
)
// KeyStoreType is the reflect type of a keystore backend.
@ -446,7 +450,7 @@ func (ks *KeyStore) Import(keyJSON []byte, passphrase, newPassphrase string) (ac
ks.importMu.Lock()
defer ks.importMu.Unlock()
if ks.cache.hasAddress(key.Address) {
return accounts.Account{}, errors.New("account already exists")
return accounts.Account{}, ErrAccountAlreadyExists
}
return ks.importKey(key, newPassphrase)
}
@ -457,7 +461,7 @@ func (ks *KeyStore) ImportECDSA(priv *ecdsa.PrivateKey, passphrase string) (acco
ks.importMu.Lock()
defer ks.importMu.Unlock()
if ks.cache.hasAddress(key.Address) {
return accounts.Account{}, errors.New("account already exists")
return accounts.Account{}, ErrAccountAlreadyExists
}
return ks.importKey(key, passphrase)
}