mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-31 15:31:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enforce validator's keystore dir (#5707)

Browse Source 
* enforces keystore dir
* Merge refs/heads/master into recheck-before-raw-tx-data
* do not ignore error
* Merge branch 'recheck-before-raw-tx-data' of github.com:prysmaticlabs/prysm into recheck-before-raw-tx-data
This commit is contained in:
Victor Farazdagi 2020-05-01 18:12:26 +03:00 committed by GitHub
parent 436d545f80
commit b42cc724c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
validator/accounts/account.go
View File

@ -161,6 +161,16 @@ func CreateValidatorAccount(path string, passphrase string) (string, string, err
path = text
}
}
// Forces user to create directory if using non-default path.
if path != DefaultValidatorDir() {
exists, err := Exists(path)
if err != nil {
return path, passphrase, err
}
if !exists {
return path, passphrase, fmt.Errorf("path %q does not exist", path)
}
}
if err := NewValidatorAccount(path, passphrase); err != nil {
return "", "", errors.Wrapf(err, "could not initialize validator account")
}

13
validator/accounts/account_test.go
View File

@ -1,6 +1,7 @@
package accounts
import (
"fmt"
"io/ioutil"
"os"
"testing"
@ -14,7 +15,7 @@ func TestNewValidatorAccount_AccountExists(t *testing.T) {
directory := testutil.TempDir() + "/testkeystore"
defer func() {
if err := os.RemoveAll(directory); err != nil {
t.Log(err)
t.Logf("Could not remove directory: %v", err)
}
}()
validatorKey, err := keystore.NewKey()
@ -38,7 +39,13 @@ func TestNewValidatorAccount_AccountExists(t *testing.T) {
t.Errorf("%v\n", f.Name())
}
}
if err := os.RemoveAll(directory); err != nil {
t.Fatalf("Could not remove directory: %v", err)
}
func TestNewValidatorAccount_CreateValidatorAccount(t *testing.T) {
directory := "foobar"
_, _, err := CreateValidatorAccount(directory, "foobar")
wantErrString := fmt.Sprintf("path %q does not exist", directory)
if err == nil || err.Error() != wantErrString {
t.Errorf("expected error not thrown, want: %v, got: %v", wantErrString, err)
}
}