From b4916e646a23a49299512652662bc83fdc945c97 Mon Sep 17 00:00:00 2001 From: Adam Schmideg Date: Tue, 17 Mar 2020 21:55:09 +0100 Subject: [PATCH] Use string literals, no magic --- cmd/geth/accountcmd_test.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index 2890a33063..024d3736b6 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -90,19 +90,18 @@ Path of the secret key file: .*UTC--.+--[0-9a-f]{40} } func TestAccountImport(t *testing.T) { - bytes64 := "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef" success := "Address: {fcad0b19bb29d4674531d6f115237e16afce377c}\n" failureTemplate := "Fatal: Failed to load the private key: expected 64 bytes, got %v\n" tests := []struct { key string result string }{ - {key: bytes64, result: success}, - {key: bytes64 + "\n", result: success}, - {key: bytes64 + "\r\n", result: success}, - {key: bytes64 + "1", result: fmt.Sprintf(failureTemplate, 65)}, - {key: bytes64 + "x", result: fmt.Sprintf(failureTemplate, 65)}, - {key: bytes64 + "\n\n\n", result: fmt.Sprintf(failureTemplate, 67)}, + {key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", result: success}, + {key: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\n", result: success}, + {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 { importAccountWithExpect(t, test.key, test.result)