From c3445e79d99da5d69e56cc1a0411feb72c7466f4 Mon Sep 17 00:00:00 2001
From: Andras Banki-Horvath <bhandras@gmail.com>
Date: Mon, 6 Feb 2023 17:10:06 +0100
Subject: [PATCH] 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.
---
 cert/selfsigned.go                         |  6 +++---
 cert/selfsigned_test.go                    | 17 ++++++++---------
 docs/release-notes/release-notes-0.16.0.md |  3 +++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cert/selfsigned.go b/cert/selfsigned.go
index 24b651c32..748eeba77 100644
--- a/cert/selfsigned.go
+++ b/cert/selfsigned.go
@@ -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)
diff --git a/cert/selfsigned_test.go b/cert/selfsigned_test.go
index 402334d99..437aa4bf2 100644
--- a/cert/selfsigned_test.go
+++ b/cert/selfsigned_test.go
@@ -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)
 
diff --git a/docs/release-notes/release-notes-0.16.0.md b/docs/release-notes/release-notes-0.16.0.md
index dfbb0de76..09bc20e33 100644
--- a/docs/release-notes/release-notes-0.16.0.md
+++ b/docs/release-notes/release-notes-0.16.0.md
@@ -258,6 +258,9 @@ in the lnwire package](https://github.com/lightningnetwork/lnd/pull/7303)
 * [Add a flag](https://github.com/lightningnetwork/lnd/pull/6527) to allow for
   the option to encrypt the tls key.
 
+* [Remove unused args](https://github.com/lightningnetwork/lnd/pull/7387)
+  from `cert.GenCertPair`.
+
 ## `lncli`
 
 * [Add an `insecure` flag to skip tls auth as well as a `metadata` string slice