macaroons: use fast scrypt options in itest and unit tests

This commit is contained in:
Oliver Gugger committed 2020-03-24 09:52:39 +01:00
1 parent 466294ed4c
commit 847d27f8a6
4 files changed
+42 -2

No files matched your search

+13
View File
@@ -0,0 +1,13 @@
// +build !rpctest
package macaroons
import "github.com/btcsuite/btcwallet/snacl"
var (
// Below are the default scrypt parameters that are used when creating
// the encryption key for the macaroon database with snacl.NewSecretKey.
scryptN = snacl.DefaultN
scryptR = snacl.DefaultR
scryptP = snacl.DefaultP
)
+14
View File
@@ -0,0 +1,14 @@
// +build rpctest
package macaroons
import "github.com/btcsuite/btcwallet/waddrmgr"
var (
// Below are the reduced scrypt parameters that are used when creating
// the encryption key for the macaroon database with snacl.NewSecretKey.
// We use very low values for our itest/rpctest to speed things up.
scryptN = waddrmgr.FastScryptOptions.N
scryptR = waddrmgr.FastScryptOptions.R
scryptP = waddrmgr.FastScryptOptions.P
)
+12
View File
@@ -0,0 +1,12 @@
package macaroons
import "github.com/btcsuite/btcwallet/waddrmgr"
func init() {
// Below are the reduced scrypt parameters that are used when creating
// the encryption key for the macaroon database with snacl.NewSecretKey.
// We use very low values for our itest/rpctest to speed things up.
scryptN = waddrmgr.FastScryptOptions.N
scryptR = waddrmgr.FastScryptOptions.R
scryptP = waddrmgr.FastScryptOptions.P
}
+3 -2
View File
@@ -106,8 +106,9 @@ func (r *RootKeyStorage) CreateUnlock(password *[]byte) error {
}
// We haven't yet stored a key, so create a new one.
encKey, err := snacl.NewSecretKey(password, snacl.DefaultN,
snacl.DefaultR, snacl.DefaultP)
encKey, err := snacl.NewSecretKey(
password, scryptN, scryptR, scryptP,
)
if err != nil {
return err
}