Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure to error out in generate key pair if key exists #1288

Merged
merged 1 commit into from
Nov 8, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/drand-cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -776,10 +776,11 @@ func keygenCmd(c *cli.Context) error {
beaconID := getBeaconID(c)
fileStore := key.NewFileStore(config.ConfigFolderMB(), beaconID)

if _, err := fileStore.LoadKeyPair(sch); err == nil {
if _, err := fileStore.LoadKeyPair(nil); err == nil {
keyDirectory := path.Join(config.ConfigFolderMB(), beaconID)
fmt.Fprintf(output, "Keypair already present in `%s`.\nRemove them before generating new one\n", keyDirectory)
return nil
fmt.Fprintf(output, "\nKeypair for beaconID %s already present in `%s`.\n"+
"Remove them before generating new one\n", beaconID, keyDirectory)
return fmt.Errorf("keypair already exists")
}
if err := fileStore.SaveKeyPair(priv); err != nil {
return fmt.Errorf("could not save key: %w", err)
Expand Down
Loading