aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorJakob Unterwurzacher2018-06-25 22:02:05 +0200
committerJakob Unterwurzacher2018-07-01 20:56:22 +0200
commit91de77943fba3cb993aad4e9756e159c4514764a (patch)
tree7cc07a23ec031e93b0c896b4541a94beaed46aee /internal
parent8e5ca7299a3292cae64418aaf875819c2cca01f5 (diff)
configfile: reduce function name stutter
configfile.LoadConfFile() -> configfile.Load() configfile.CreateConfFile() -> configfile.Create()
Diffstat (limited to 'internal')
-rw-r--r--internal/configfile/config_file.go8
-rw-r--r--internal/configfile/config_test.go24
2 files changed, 16 insertions, 16 deletions
diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go
index da6c4da..a70a511 100644
--- a/internal/configfile/config_file.go
+++ b/internal/configfile/config_file.go
@@ -64,10 +64,10 @@ func randBytesDevRandom(n int) []byte {
return b
}
-// CreateConfFile - create a new config with a random key encrypted with
+// Create - create a new config with a random key encrypted with
// "password" and write it to "filename".
// Uses scrypt with cost parameter logN.
-func CreateConfFile(filename string, password []byte, plaintextNames bool,
+func Create(filename string, password []byte, plaintextNames bool,
logN int, creator string, aessiv bool, devrandom bool, trezor bool) error {
var cf ConfFile
cf.filename = filename
@@ -112,13 +112,13 @@ func CreateConfFile(filename string, password []byte, plaintextNames bool,
return cf.WriteFile()
}
-// LoadConfFile - read config file from disk and decrypt the
+// Load - read config file from disk and decrypt the
// contained key using "password".
// Returns the decrypted key and the ConfFile object
//
// If "password" is empty, the config file is read
// but the key is not decrypted (returns nil in its place).
-func LoadConfFile(filename string, password []byte) ([]byte, *ConfFile, error) {
+func Load(filename string, password []byte) ([]byte, *ConfFile, error) {
var cf ConfFile
cf.filename = filename
diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go
index 3152ab5..e130cfa 100644
--- a/internal/configfile/config_test.go
+++ b/internal/configfile/config_test.go
@@ -11,7 +11,7 @@ import (
var testPw = []byte("test")
func TestLoadV1(t *testing.T) {
- _, _, err := LoadConfFile("config_test/v1.conf", testPw)
+ _, _, err := Load("config_test/v1.conf", testPw)
if err == nil {
t.Errorf("Outdated v1 config file must fail to load but it didn't")
} else if testing.Verbose() {
@@ -24,7 +24,7 @@ func TestLoadV1(t *testing.T) {
func TestLoadV2(t *testing.T) {
t1 := time.Now()
- _, _, err := LoadConfFile("config_test/v2.conf", testPw)
+ _, _, err := Load("config_test/v2.conf", testPw)
if err != nil {
t.Errorf("Could not load v2 config file: %v", err)
}
@@ -39,21 +39,21 @@ func TestLoadV2PwdError(t *testing.T) {
if !testing.Verbose() {
tlog.Warn.Enabled = false
}
- _, _, err := LoadConfFile("config_test/v2.conf", []byte("wrongpassword"))
+ _, _, err := Load("config_test/v2.conf", []byte("wrongpassword"))
if err == nil {
t.Errorf("Loading with wrong password must fail but it didn't")
}
}
func TestLoadV2Feature(t *testing.T) {
- _, _, err := LoadConfFile("config_test/PlaintextNames.conf", testPw)
+ _, _, err := Load("config_test/PlaintextNames.conf", testPw)
if err != nil {
t.Errorf("Could not load v2 PlaintextNames config file: %v", err)
}
}
func TestLoadV2StrangeFeature(t *testing.T) {
- _, _, err := LoadConfFile("config_test/StrangeFeature.conf", testPw)
+ _, _, err := Load("config_test/StrangeFeature.conf", testPw)
if err == nil {
t.Errorf("Loading unknown feature must fail but it didn't")
} else if testing.Verbose() {
@@ -62,11 +62,11 @@ func TestLoadV2StrangeFeature(t *testing.T) {
}
func TestCreateConfDefault(t *testing.T) {
- err := CreateConfFile("config_test/tmp.conf", testPw, false, 10, "test", false, false, false)
+ err := Create("config_test/tmp.conf", testPw, false, 10, "test", false, false, false)
if err != nil {
t.Fatal(err)
}
- _, c, err := LoadConfFile("config_test/tmp.conf", testPw)
+ _, c, err := Load("config_test/tmp.conf", testPw)
if err != nil {
t.Fatal(err)
}
@@ -83,18 +83,18 @@ func TestCreateConfDefault(t *testing.T) {
}
func TestCreateConfDevRandom(t *testing.T) {
- err := CreateConfFile("config_test/tmp.conf", testPw, false, 10, "test", false, true, false)
+ err := Create("config_test/tmp.conf", testPw, false, 10, "test", false, true, false)
if err != nil {
t.Fatal(err)
}
}
func TestCreateConfPlaintextnames(t *testing.T) {
- err := CreateConfFile("config_test/tmp.conf", testPw, true, 10, "test", false, false, false)
+ err := Create("config_test/tmp.conf", testPw, true, 10, "test", false, false, false)
if err != nil {
t.Fatal(err)
}
- _, c, err := LoadConfFile("config_test/tmp.conf", testPw)
+ _, c, err := Load("config_test/tmp.conf", testPw)
if err != nil {
t.Fatal(err)
}
@@ -111,11 +111,11 @@ func TestCreateConfPlaintextnames(t *testing.T) {
// Reverse mode uses AESSIV
func TestCreateConfFileAESSIV(t *testing.T) {
- err := CreateConfFile("config_test/tmp.conf", testPw, false, 10, "test", true, false, false)
+ err := Create("config_test/tmp.conf", testPw, false, 10, "test", true, false, false)
if err != nil {
t.Fatal(err)
}
- _, c, err := LoadConfFile("config_test/tmp.conf", testPw)
+ _, c, err := Load("config_test/tmp.conf", testPw)
if err != nil {
t.Fatal(err)
}