cert: removed unused args from cert.GenCertPair

Since the cert pair is written with a subsequent call to
cert.WriteCertPair we can safely remove the two file paths from the
argument list of cert.GenCertPair.
This commit is contained in:
Andras Banki-Horvath
2023-02-06 17:10:06 +01:00
parent 0cf0a7dd3b
commit c3445e79d9
3 changed files with 14 additions and 12 deletions

View File

@@ -200,9 +200,9 @@ func IsOutdated(cert *x509.Certificate, tlsExtraIPs,
//
// This function is adapted from https://github.com/btcsuite/btcd and
// https://github.com/btcsuite/btcd/btcutil
func GenCertPair(org, certFile, keyFile string, tlsExtraIPs,
tlsExtraDomains []string, tlsDisableAutofill bool,
certValidity time.Duration) ([]byte, []byte, error) {
func GenCertPair(org string, tlsExtraIPs, tlsExtraDomains []string,
tlsDisableAutofill bool, certValidity time.Duration) (
[]byte, []byte, error) {
now := time.Now()
validUntil := now.Add(certValidity)

View File

@@ -29,8 +29,8 @@ func TestIsOutdatedCert(t *testing.T) {
// Generate TLS files with two extra IPs and domains.
certBytes, keyBytes, err := cert.GenCertPair(
"lnd autogenerated cert", certPath, keyPath, extraIPs[:2],
extraDomains[:2], false, testTLSCertDuration,
"lnd autogenerated cert", extraIPs[:2], extraDomains[:2],
false, testTLSCertDuration,
)
if err != nil {
t.Fatal(err)
@@ -89,8 +89,8 @@ func TestIsOutdatedPermutation(t *testing.T) {
// Generate TLS files from the IPs and domains.
certBytes, keyBytes, err := cert.GenCertPair(
"lnd autogenerated cert", certPath, keyPath, extraIPs[:],
extraDomains[:], false, testTLSCertDuration,
"lnd autogenerated cert", extraIPs[:], extraDomains[:],
false, testTLSCertDuration,
)
if err != nil {
t.Fatal(err)
@@ -160,8 +160,8 @@ func TestTLSDisableAutofill(t *testing.T) {
// Generate TLS files with two extra IPs and domains and no interface IPs.
certBytes, keyBytes, err := cert.GenCertPair(
"lnd autogenerated cert", certPath, keyPath, extraIPs[:2],
extraDomains[:2], true, testTLSCertDuration,
"lnd autogenerated cert", extraIPs[:2], extraDomains[:2],
true, testTLSCertDuration,
)
require.NoError(
t, err,
@@ -222,9 +222,8 @@ func TestTLSConfig(t *testing.T) {
// Generate TLS files with an extra IP and domain.
certBytes, keyBytes, err := cert.GenCertPair(
"lnd autogenerated cert", certPath, keyPath,
[]string{extraIPs[0]}, []string{extraDomains[0]}, false,
testTLSCertDuration,
"lnd autogenerated cert", []string{extraIPs[0]},
[]string{extraDomains[0]}, false, testTLSCertDuration,
)
require.NoError(t, err)