Skip to content

Commit

Permalink
Make sure to error out in generate key pair if key exists (#1288)
Browse files Browse the repository at this point in the history
  • Loading branch information
AnomalRoil committed Nov 8, 2023
1 parent e13aff2 commit ec69b2f
Showing 1 changed file with 4 additions and 3 deletions.
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

0 comments on commit ec69b2f

Please sign in to comment.