Skip to content

Commit 1c4c486

Browse files
authored
cmd/ethkey: speed up test by using weaker scrypt parameters (#20680)
1 parent ac72787 commit 1c4c486

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

cmd/ethkey/generate.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ If you want to encrypt an existing private key, it can be specified by setting
5252
Name: "privatekey",
5353
Usage: "file containing a raw private key to encrypt",
5454
},
55+
cli.BoolFlag{
56+
Name: "lightkdf",
57+
Usage: "use less secure scrypt parameters",
58+
},
5559
},
5660
Action: func(ctx *cli.Context) error {
5761
// Check if keyfile path given and make sure it doesn't already exist.
@@ -91,7 +95,11 @@ If you want to encrypt an existing private key, it can be specified by setting
9195

9296
// Encrypt key with passphrase.
9397
passphrase := promptPassphrase(true)
94-
keyjson, err := keystore.EncryptKey(key, passphrase, keystore.StandardScryptN, keystore.StandardScryptP)
98+
scryptN, scryptP := keystore.StandardScryptN, keystore.StandardScryptP
99+
if ctx.Bool("lightkdf") {
100+
scryptN, scryptP = keystore.LightScryptN, keystore.LightScryptP
101+
}
102+
keyjson, err := keystore.EncryptKey(key, passphrase, scryptN, scryptP)
95103
if err != nil {
96104
utils.Fatalf("Error encrypting key: %v", err)
97105
}

cmd/ethkey/message_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func TestMessageSignVerify(t *testing.T) {
3434
message := "test message"
3535

3636
// Create the key.
37-
generate := runEthkey(t, "generate", keyfile)
37+
generate := runEthkey(t, "generate", "--lightkdf", keyfile)
3838
generate.Expect(`
3939
!! Unsupported terminal, password will be echoed.
4040
Password: {{.InputLine "foobar"}}

0 commit comments

Comments
 (0)