forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/geth: simplify TestAccountImport

Browse source 
Don't need to cover all cases in this test because package crypto
has its own test for loading keys.
This commit is contained in:
Felix Lange 2020-04-07 23:31:05 +02:00
parent b68c0f5846
commit 0d574eee7d
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cmd/geth/accountcmd_test.go
View file

@ -17,7 +17,6 @@
package main package main
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"path/filepath" "path/filepath"
"runtime" "runtime"
@ -90,32 +89,29 @@ Path of the secret key file: .*UTC--.+--[0-9a-f]{40}
} }
func TestAccountImport(t *testing.T) { func TestAccountImport(t *testing.T) {
success := "Address: {fcad0b19bb29d4674531d6f115237e16afce377c}\n" tests := []struct{ key, output string }{
failureTemplate := "Fatal: Failed to load the private key: expected 64 bytes, got %v\n" {
tests := []struct { key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
key string output: "Address: {fcad0b19bb29d4674531d6f115237e16afce377c}\n",
result string },
}{ {
{key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", result: success}, key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1",
{key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\n", result: success}, output: "Fatal: Failed to load the private key: invalid character '1' at end of key file\n",
{key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\r\n", result: success}, },
{key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef1", result: fmt.Sprintf(failureTemplate, 65)},
{key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdefx", result: fmt.Sprintf(failureTemplate, 65)},
{key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\n\n\n", result: fmt.Sprintf(failureTemplate, 67)},
} }
for _, test := range tests { for _, test := range tests {
importAccountWithExpect(t, test.key, test.result) importAccountWithExpect(t, test.key, test.output)
} }
} }
func importAccountWithExpect(t *testing.T, key string, expected string) { func importAccountWithExpect(t *testing.T, key string, expected string) {
dir := tmpdir(t) dir := tmpdir(t)
keyfile := filepath.Join(dir, "key.prv") keyfile := filepath.Join(dir, "key.prv")
if err := ioutil.WriteFile(keyfile, []byte(key), 0644); err != nil { if err := ioutil.WriteFile(keyfile, []byte(key), 0600); err != nil {
t.Error(err) t.Error(err)
} }
passwordFile := filepath.Join(dir, "password.txt") passwordFile := filepath.Join(dir, "password.txt")
if err := ioutil.WriteFile(passwordFile, []byte("foobar"), 0644); err != nil { if err := ioutil.WriteFile(passwordFile, []byte("foobar"), 0600); err != nil {
t.Error(err) t.Error(err)
} }
geth := runGeth(t, "account", "import", keyfile, "-password", passwordFile) geth := runGeth(t, "account", "import", keyfile, "-password", passwordFile)