From 789c6bac8ca4b75d15e9e40f8ded8e394df518bb Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 14 Jun 2023 11:33:44 +0200 Subject: [PATCH] multi: replace ioutil.WriteFile --- cert/selfsigned.go | 5 ++--- cmd/lncli/cmd_macaroon.go | 5 ++--- cmd/lncli/profile.go | 4 ++-- internal/musig2v040/musig2_test.go | 8 ++++---- kvdb/backend.go | 3 +-- lnrpc/chainrpc/chain_server.go | 3 +-- lnrpc/invoicesrpc/invoices_server.go | 3 +-- lnrpc/routerrpc/router_server.go | 3 +-- lnrpc/signrpc/signer_server.go | 3 +-- lnrpc/walletrpc/walletkit_server.go | 3 +-- tls_manager.go | 3 +-- tls_manager_test.go | 5 ++--- tor/cmd_onion.go | 3 +-- 13 files changed, 20 insertions(+), 31 deletions(-) diff --git a/cert/selfsigned.go b/cert/selfsigned.go index c956afb004..80fe421069 100644 --- a/cert/selfsigned.go +++ b/cert/selfsigned.go @@ -9,7 +9,6 @@ import ( "crypto/x509/pkix" "encoding/pem" "fmt" - "io/ioutil" "math/big" "net" "os" @@ -295,14 +294,14 @@ func GenCertPair(org string, tlsExtraIPs, tlsExtraDomains []string, func WriteCertPair(certFile, keyFile string, certBytes, keyBytes []byte) error { // Write cert and key files. if certFile != "" { - err := ioutil.WriteFile(certFile, certBytes, 0644) + err := os.WriteFile(certFile, certBytes, 0644) if err != nil { return err } } if keyFile != "" { - err := ioutil.WriteFile(keyFile, keyBytes, 0600) + err := os.WriteFile(keyFile, keyBytes, 0600) if err != nil { os.Remove(certFile) return err diff --git a/cmd/lncli/cmd_macaroon.go b/cmd/lncli/cmd_macaroon.go index 894e8da6bf..deea4e7ad3 100644 --- a/cmd/lncli/cmd_macaroon.go +++ b/cmd/lncli/cmd_macaroon.go @@ -4,7 +4,6 @@ import ( "bytes" "encoding/hex" "fmt" - "io/ioutil" "net" "os" "strconv" @@ -193,7 +192,7 @@ func bakeMacaroon(ctx *cli.Context) error { // a file or write to the standard output using hex encoding. switch { case savePath != "": - err = ioutil.WriteFile(savePath, macBytes, 0644) + err = os.WriteFile(savePath, macBytes, 0644) if err != nil { return err } @@ -472,7 +471,7 @@ func constrainMacaroon(ctx *cli.Context) error { } // Now we can output the result. - err = ioutil.WriteFile(destMacFile, destMacBytes, 0644) + err = os.WriteFile(destMacFile, destMacBytes, 0644) if err != nil { return fmt.Errorf("error writing destination macaroon file "+ "%s: %v", destMacFile, err) diff --git a/cmd/lncli/profile.go b/cmd/lncli/profile.go index 75dc9ab720..efbdfc147a 100644 --- a/cmd/lncli/profile.go +++ b/cmd/lncli/profile.go @@ -6,7 +6,6 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" "os" "path" "strings" @@ -244,7 +243,8 @@ func saveProfileFile(file string, f *profileFile) error { if err != nil { return fmt.Errorf("could not marshal profile: %w", err) } - return ioutil.WriteFile(file, content, 0644) + + return os.WriteFile(file, content, 0644) } // profileFile is a struct that represents the whole content of a profile file. diff --git a/internal/musig2v040/musig2_test.go b/internal/musig2v040/musig2_test.go index 9ba74f4170..47fd71c76d 100644 --- a/internal/musig2v040/musig2_test.go +++ b/internal/musig2v040/musig2_test.go @@ -10,7 +10,7 @@ import ( "errors" "flag" "fmt" - "io/ioutil" + "os" "sync" "testing" @@ -256,7 +256,7 @@ func TestMuSig2KeyAggTestVectors(t *testing.T) { var formattedJson bytes.Buffer json.Indent(&formattedJson, jsonBytes, "", "\t") - err = ioutil.WriteFile( + err = os.WriteFile( keyAggTestVectorName, formattedJson.Bytes(), 0644, ) if err != nil { @@ -656,7 +656,7 @@ func TestMuSig2SigningTestVectors(t *testing.T) { var formattedJson bytes.Buffer json.Indent(&formattedJson, jsonBytes, "", "\t") - err = ioutil.WriteFile( + err = os.WriteFile( signTestVectorName, formattedJson.Bytes(), 0644, ) if err != nil { @@ -1540,7 +1540,7 @@ func TestMusig2AggregateNoncesTestVectors(t *testing.T) { var formattedJson bytes.Buffer json.Indent(&formattedJson, jsonBytes, "", "\t") - err = ioutil.WriteFile( + err = os.WriteFile( nonceAggTestVectorName, formattedJson.Bytes(), 0644, ) if err != nil { diff --git a/kvdb/backend.go b/kvdb/backend.go index c115c4f7da..e42c02233e 100644 --- a/kvdb/backend.go +++ b/kvdb/backend.go @@ -9,7 +9,6 @@ import ( "encoding/binary" "encoding/hex" "fmt" - "io/ioutil" "os" "path/filepath" "time" @@ -235,7 +234,7 @@ func updateLastCompactionDate(dbFile string) error { byteOrder.PutUint64(tsBytes[:], uint64(time.Now().UnixNano())) tsFile := fmt.Sprintf("%s%s", dbFile, LastCompactionFileNameSuffix) - return ioutil.WriteFile(tsFile, tsBytes[:], 0600) + return os.WriteFile(tsFile, tsBytes[:], 0600) } // GetTestBackend opens (or creates if doesn't exist) a bbolt or etcd diff --git a/lnrpc/chainrpc/chain_server.go b/lnrpc/chainrpc/chain_server.go index 00a30c07c7..1defadafc0 100644 --- a/lnrpc/chainrpc/chain_server.go +++ b/lnrpc/chainrpc/chain_server.go @@ -7,7 +7,6 @@ import ( "bytes" "context" "errors" - "io/ioutil" "os" "path/filepath" "sync" @@ -153,7 +152,7 @@ func New(cfg *Config) (*Server, lnrpc.MacaroonPerms, error) { if err != nil { return nil, nil, err } - err = ioutil.WriteFile(macFilePath, chainNotifierMacBytes, 0644) + err = os.WriteFile(macFilePath, chainNotifierMacBytes, 0644) if err != nil { _ = os.Remove(macFilePath) return nil, nil, err diff --git a/lnrpc/invoicesrpc/invoices_server.go b/lnrpc/invoicesrpc/invoices_server.go index b62538543d..23b8722caf 100644 --- a/lnrpc/invoicesrpc/invoices_server.go +++ b/lnrpc/invoicesrpc/invoices_server.go @@ -7,7 +7,6 @@ import ( "context" "errors" "fmt" - "io/ioutil" "os" "path/filepath" @@ -132,7 +131,7 @@ func New(cfg *Config) (*Server, lnrpc.MacaroonPerms, error) { if err != nil { return nil, nil, err } - err = ioutil.WriteFile(macFilePath, invoicesMacBytes, 0644) + err = os.WriteFile(macFilePath, invoicesMacBytes, 0644) if err != nil { _ = os.Remove(macFilePath) return nil, nil, err diff --git a/lnrpc/routerrpc/router_server.go b/lnrpc/routerrpc/router_server.go index 194bdc996f..090fef0ed5 100644 --- a/lnrpc/routerrpc/router_server.go +++ b/lnrpc/routerrpc/router_server.go @@ -6,7 +6,6 @@ import ( crand "crypto/rand" "errors" "fmt" - "io/ioutil" "os" "path/filepath" "sync/atomic" @@ -216,7 +215,7 @@ func New(cfg *Config) (*Server, lnrpc.MacaroonPerms, error) { if err != nil { return nil, nil, err } - err = ioutil.WriteFile(macFilePath, routerMacBytes, 0644) + err = os.WriteFile(macFilePath, routerMacBytes, 0644) if err != nil { _ = os.Remove(macFilePath) return nil, nil, err diff --git a/lnrpc/signrpc/signer_server.go b/lnrpc/signrpc/signer_server.go index c29d495eb0..4b2ac2c6a8 100644 --- a/lnrpc/signrpc/signer_server.go +++ b/lnrpc/signrpc/signer_server.go @@ -8,7 +8,6 @@ import ( "context" "crypto/sha256" "fmt" - "io/ioutil" "os" "path/filepath" @@ -167,7 +166,7 @@ func New(cfg *Config) (*Server, lnrpc.MacaroonPerms, error) { if err != nil { return nil, nil, err } - err = ioutil.WriteFile(macFilePath, signerMacBytes, 0644) + err = os.WriteFile(macFilePath, signerMacBytes, 0644) if err != nil { _ = os.Remove(macFilePath) return nil, nil, err diff --git a/lnrpc/walletrpc/walletkit_server.go b/lnrpc/walletrpc/walletkit_server.go index d3f5131b08..a00c38207d 100644 --- a/lnrpc/walletrpc/walletkit_server.go +++ b/lnrpc/walletrpc/walletkit_server.go @@ -10,7 +10,6 @@ import ( "encoding/binary" "errors" "fmt" - "io/ioutil" "math" "os" "path/filepath" @@ -289,7 +288,7 @@ func New(cfg *Config) (*WalletKit, lnrpc.MacaroonPerms, error) { if err != nil { return nil, nil, err } - err = ioutil.WriteFile(macFilePath, walletKitMacBytes, 0644) + err = os.WriteFile(macFilePath, walletKitMacBytes, 0644) if err != nil { _ = os.Remove(macFilePath) return nil, nil, err diff --git a/tls_manager.go b/tls_manager.go index 7801279fa2..076cf44bc8 100644 --- a/tls_manager.go +++ b/tls_manager.go @@ -7,7 +7,6 @@ import ( "crypto/x509" "errors" "fmt" - "io/ioutil" "net" "net/http" "os" @@ -279,7 +278,7 @@ func (t *TLSManager) ensureEncryption(keyRing keychain.SecretKeyRing) error { if err != nil { return err } - err = ioutil.WriteFile( + err = os.WriteFile( t.cfg.TLSKeyPath, b.Bytes(), modifyFilePermissions, ) if err != nil { diff --git a/tls_manager_test.go b/tls_manager_test.go index 348f095bc2..42f010411b 100644 --- a/tls_manager_test.go +++ b/tls_manager_test.go @@ -9,7 +9,6 @@ import ( "crypto/x509" "crypto/x509/pkix" "encoding/pem" - "io/ioutil" "math/big" "net" "os" @@ -351,9 +350,9 @@ func writeTestCertFiles(t *testing.T, expiredCert, encryptTLSKey bool, require.NoError(t, err, "failed to encrypt private key") } - err = ioutil.WriteFile(tempDir+"/tls.cert", certBuf.Bytes(), 0644) + err = os.WriteFile(tempDir+"/tls.cert", certBuf.Bytes(), 0644) require.NoError(t, err, "failed to write cert file") - err = ioutil.WriteFile(tempDir+"/tls.key", keyBuf.Bytes(), 0600) + err = os.WriteFile(tempDir+"/tls.key", keyBuf.Bytes(), 0600) require.NoError(t, err, "failed to write key file") return certPath, keyPath, parsedCert diff --git a/tor/cmd_onion.go b/tor/cmd_onion.go index 3ac928b404..6e60504a93 100644 --- a/tor/cmd_onion.go +++ b/tor/cmd_onion.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "os" ) @@ -105,7 +104,7 @@ func (f *OnionFile) StorePrivateKey(privateKey []byte) error { privateKeyContent = b.Bytes() } - err := ioutil.WriteFile( + err := os.WriteFile( f.privateKeyPath, privateKeyContent, f.privateKeyPerm, ) if err != nil {