Merge pull request #7765 from ErikEk/retire-io-ioutil-dep

Remove io/ioutil package dependency

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

cert/selfsigned_test.go

@@ -1,7 +1,7 @@
 package cert_test
 
 import (
- "io/ioutil"
+ "os"
  "path/filepath"
  "testing"
  "time"
@@ -42,10 +42,10 @@ func TestIsOutdatedCert(t *testing.T) {
  // number of IPs and domains.
  for numIPs := 1; numIPs <= len(extraIPs); numIPs++ {
  for numDomains := 1; numDomains <= len(extraDomains); numDomains++ {
- certBytes, err := ioutil.ReadFile(certPath)
+ certBytes, err := os.ReadFile(certPath)
  require.NoError(t, err)
 
- keyBytes, err := ioutil.ReadFile(keyPath)
+ keyBytes, err := os.ReadFile(keyPath)
  require.NoError(t, err)
 
  _, parsedCert, err := cert.LoadCertFromBytes(
@@ -98,10 +98,10 @@ func TestIsOutdatedPermutation(t *testing.T) {
  err = cert.WriteCertPair(certPath, keyPath, certBytes, keyBytes)
  require.NoError(t, err)
 
- certBytes, err = ioutil.ReadFile(certPath)
+ certBytes, err = os.ReadFile(certPath)
  require.NoError(t, err)
 
- keyBytes, err = ioutil.ReadFile(keyPath)
+ keyBytes, err = os.ReadFile(keyPath)
  require.NoError(t, err)
 
  _, parsedCert, err := cert.LoadCertFromBytes(certBytes, keyBytes)
@@ -171,10 +171,10 @@ func TestTLSDisableAutofill(t *testing.T) {
  require.NoError(t, err)
 
  // Read certs from disk.
- certBytes, err = ioutil.ReadFile(certPath)
+ certBytes, err = os.ReadFile(certPath)
  require.NoError(t, err)
 
- keyBytes, err = ioutil.ReadFile(keyPath)
+ keyBytes, err = os.ReadFile(keyPath)
  require.NoError(t, err)
 
  // Load the certificate.
@@ -230,10 +230,10 @@ func TestTLSConfig(t *testing.T) {
  err = cert.WriteCertPair(certPath, keyPath, certBytes, keyBytes)
  require.NoError(t, err)
 
- certBytes, err = ioutil.ReadFile(certPath)
+ certBytes, err = os.ReadFile(certPath)
  require.NoError(t, err)
 
- keyBytes, err = ioutil.ReadFile(keyPath)
+ keyBytes, err = os.ReadFile(keyPath)
  require.NoError(t, err)
 
  // Load the certificate.

cert/tls.go

@@ -3,7 +3,7 @@ package cert
 import (
  "crypto/tls"
  "crypto/x509"
- "io/ioutil"
+ "os"
  "sync"
 )
 
@@ -31,11 +31,11 @@ var (
 func GetCertBytesFromPath(certPath, keyPath string) (certBytes,
  keyBytes []byte, err error) {
 
- certBytes, err = ioutil.ReadFile(certPath)
+ certBytes, err = os.ReadFile(certPath)
  if err != nil {
  return nil, nil, err
  }
- keyBytes, err = ioutil.ReadFile(keyPath)
+ keyBytes, err = os.ReadFile(keyPath)
  if err != nil {
  return nil, nil, err
  }

chainreg/chainregistry.go

@@ -5,7 +5,7 @@ import (
  "encoding/json"
  "errors"
  "fmt"
- "io/ioutil"
+ "io"
  "net"
  "net/url"
  "os"
@@ -547,7 +547,7 @@ func NewPartialChainControl(cfg *Config) (*PartialChainControl, func(), error) {
  if err != nil {
  return nil, nil, err
  }
- rpcCert, err = ioutil.ReadAll(certFile)
+ rpcCert, err = io.ReadAll(certFile)
  if err != nil {
  return nil, nil, err
  }

chanbackup/backupfile.go

@@ -2,7 +2,6 @@ package chanbackup
 
 import (
  "fmt"
- "io/ioutil"
  "os"
  "path/filepath"
 
@@ -138,7 +137,7 @@ func (b *MultiFile) ExtractMulti(keyChain keychain.KeyRing) (*Multi, error) {
  // Now that we've confirmed the target file is populated, we'll read
  // all the contents of the file. This function ensures that file is
  // always closed, even if we can't read the contents.
- multiBytes, err := ioutil.ReadFile(b.fileName)
+ multiBytes, err := os.ReadFile(b.fileName)
  if err != nil {
  return nil, err
  }

chanbackup/backupfile_test.go

@@ -3,7 +3,6 @@ package chanbackup
 import (
  "bytes"
  "fmt"
- "io/ioutil"
  "math/rand"
  "os"
  "path/filepath"
@@ -27,7 +26,7 @@ func assertBackupMatches(t *testing.T, filePath string,
 
  t.Helper()
 
- packedBackup, err := ioutil.ReadFile(filePath)
+ packedBackup, err := os.ReadFile(filePath)
  require.NoError(t, err, "unable to test file")
 
  if !bytes.Equal(packedBackup, currentBackup) {

channeldb/migration/lnwire21/announcement_signatures.go

@@ -2,7 +2,6 @@ package lnwire
 
 import (
  "io"
- "io/ioutil"
 )
 
 // AnnounceSignatures is a direct message between two endpoints of a
@@ -66,7 +65,7 @@ func (a *AnnounceSignatures) Decode(r io.Reader, pver uint32) error {
  // we'll collect the remainder into the ExtraOpaqueData field. If there
  // aren't any bytes, then we'll snip off the slice to avoid carrying
  // around excess capacity.
- a.ExtraOpaqueData, err = ioutil.ReadAll(r)
+ a.ExtraOpaqueData, err = io.ReadAll(r)
  if err != nil {
  return err
  }

channeldb/migration/lnwire21/channel_announcement.go

@@ -3,7 +3,6 @@ package lnwire
 import (
  "bytes"
  "io"
- "io/ioutil"
 
  "github.com/btcsuite/btcd/chaincfg/chainhash"
 )
@@ -89,7 +88,7 @@ func (a *ChannelAnnouncement) Decode(r io.Reader, pver uint32) error {
  // we'll collect the remainder into the ExtraOpaqueData field. If there
  // aren't any bytes, then we'll snip off the slice to avoid carrying
  // around excess capacity.
- a.ExtraOpaqueData, err = ioutil.ReadAll(r)
+ a.ExtraOpaqueData, err = io.ReadAll(r)
  if err != nil {
  return err
  }

channeldb/migration/lnwire21/channel_update.go

@@ -4,7 +4,6 @@ import (
  "bytes"
  "fmt"
  "io"
- "io/ioutil"
 
  "github.com/btcsuite/btcd/chaincfg/chainhash"
 )
@@ -160,7 +159,7 @@ func (a *ChannelUpdate) Decode(r io.Reader, pver uint32) error {
  // we'll collect the remainder into the ExtraOpaqueData field. If there
  // aren't any bytes, then we'll snip off the slice to avoid carrying
  // around excess capacity.
- a.ExtraOpaqueData, err = ioutil.ReadAll(r)
+ a.ExtraOpaqueData, err = io.ReadAll(r)
  if err != nil {
  return err
  }

channeldb/migration/lnwire21/node_announcement.go

@@ -5,7 +5,6 @@ import (
  "fmt"
  "image/color"
  "io"
- "io/ioutil"
  "net"
  "unicode/utf8"
 )
@@ -127,7 +126,7 @@ func (a *NodeAnnouncement) Decode(r io.Reader, pver uint32) error {
  // we'll collect the remainder into the ExtraOpaqueData field. If there
  // aren't any bytes, then we'll snip off the slice to avoid carrying
  // around excess capacity.
- a.ExtraOpaqueData, err = ioutil.ReadAll(r)
+ a.ExtraOpaqueData, err = io.ReadAll(r)
  if err != nil {
  return err
  }

cmd/lncli/cmd_macaroon.go

@@ -4,8 +4,8 @@ import (
  "bytes"
  "encoding/hex"
  "fmt"
- "io/ioutil"
  "net"
+ "os"
  "strconv"
  "strings"
  "unicode"
@@ -192,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
  }
@@ -352,7 +352,7 @@ func printMacaroon(ctx *cli.Context) error {
  macPath := lncfg.CleanAndExpandPath(ctx.String("macaroon_file"))
 
  // Load the specified macaroon file.
- macBytes, err = ioutil.ReadFile(macPath)
+ macBytes, err = os.ReadFile(macPath)
  if err != nil {
  return fmt.Errorf("unable to read macaroon path %v: %v",
  macPath, err)
@@ -441,7 +441,7 @@ func constrainMacaroon(ctx *cli.Context) error {
  sourceMacFile := lncfg.CleanAndExpandPath(args.First())
  args = args.Tail()
 
- sourceMacBytes, err := ioutil.ReadFile(sourceMacFile)
+ sourceMacBytes, err := os.ReadFile(sourceMacFile)
  if err != nil {
  return fmt.Errorf("error trying to read source macaroon file "+
  "%s: %v", sourceMacFile, err)
@@ -471,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)

cmd/lncli/cmd_open_channel.go

@@ -9,7 +9,6 @@ import (
  "encoding/json"
  "fmt"
  "io"
- "io/ioutil"
  "os"
  "strconv"
  "strings"
@@ -1016,7 +1015,7 @@ func readTerminalOrFile(quit chan struct{}) (string, error) {
 
  // If it's a path to an existing file and it's small enough, let's try
  // to read its content now.
- content, err := ioutil.ReadFile(maybeFile)
+ content, err := os.ReadFile(maybeFile)
  if err != nil {
  return "", err
  }

cmd/lncli/cmd_payments.go

@@ -7,7 +7,7 @@ import (
  "encoding/hex"
  "errors"
  "fmt"
- "io/ioutil"
+ "io"
  "os"
  "runtime"
  "strconv"
@@ -987,7 +987,7 @@ func sendToRoute(ctx *cli.Context) error {
  // The user is signalling that we should read stdin in order to parse
  // the set of target routes.
  case args.Present() && args.First() == "-":
- b, err := ioutil.ReadAll(os.Stdin)
+ b, err := io.ReadAll(os.Stdin)
  if err != nil {
  return err
  }

cmd/lncli/cmd_profile.go

@@ -2,7 +2,6 @@ package main
 
 import (
  "fmt"
- "io/ioutil"
  "os"
  "path"
  "strings"
@@ -423,7 +422,7 @@ func profileAddMacaroon(ctx *cli.Context) error {
 
  // Now load and possibly encrypt the macaroon file.
  macPath := lncfg.CleanAndExpandPath(ctx.GlobalString("macaroonpath"))
- macBytes, err := ioutil.ReadFile(macPath)
+ macBytes, err := os.ReadFile(macPath)
  if err != nil {
  return fmt.Errorf("unable to read macaroon path: %w", err)
  }

cmd/lncli/cmd_walletunlocker.go

@@ -5,7 +5,6 @@ import (
  "bytes"
  "encoding/hex"
  "fmt"
- "io/ioutil"
  "os"
  "strconv"
  "strings"
@@ -712,7 +711,7 @@ func createWatchOnly(ctx *cli.Context) error {
  }
 
  jsonFile := lncfg.CleanAndExpandPath(ctx.Args().First())
- jsonBytes, err := ioutil.ReadFile(jsonFile)
+ jsonBytes, err := os.ReadFile(jsonFile)
  if err != nil {
  return fmt.Errorf("error reading JSON from file %v: %v",
  jsonFile, err)

cmd/lncli/commands.go

@@ -9,7 +9,6 @@ import (
  "errors"
  "fmt"
  "io"
- "io/ioutil"
  "math"
  "os"
  "strconv"
@@ -2833,7 +2832,7 @@ func parseChanBackups(ctx *cli.Context) (*lnrpc.RestoreChanBackupRequest, error)
  }, nil
 
  case ctx.IsSet("multi_file"):
- packedMulti, err := ioutil.ReadFile(ctx.String("multi_file"))
+ packedMulti, err := os.ReadFile(ctx.String("multi_file"))
  if err != nil {
  return nil, fmt.Errorf("unable to decode multi packed "+
  "backup: %v", err)