Skip to content

Commit

Permalink
multi: repleace ioutil.ReadAll
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikEk committed Apr 25, 2024
1 parent 8ce3622 commit 619c8f4
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 16 deletions.
4 changes: 2 additions & 2 deletions chainreg/chainregistry.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"io"
"net"
"net/url"
"os"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions channeldb/migration/lnwire21/announcement_signatures.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package lnwire

import (
"io"
"io/ioutil"
)

// AnnounceSignatures is a direct message between two endpoints of a
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions channeldb/migration/lnwire21/channel_announcement.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package lnwire
import (
"bytes"
"io"
"io/ioutil"

"github.com/btcsuite/btcd/chaincfg/chainhash"
)
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions channeldb/migration/lnwire21/channel_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"

"github.com/btcsuite/btcd/chaincfg/chainhash"
)
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions channeldb/migration/lnwire21/node_announcement.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"image/color"
"io"
"io/ioutil"
"net"
"unicode/utf8"
)
Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/lncli/cmd_payments.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"encoding/hex"
"errors"
"fmt"
"io/ioutil"
"io"
"os"
"runtime"
"strconv"
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 3 additions & 2 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"encoding/hex"
"errors"
"fmt"
"io"
"io/ioutil"
"net"
"os"
Expand Down Expand Up @@ -2006,7 +2007,7 @@ func extractBtcdRPCParams(btcdConfigPath string) (string, string, error) {

// With the file open extract the contents of the configuration file so
// we can attempt to locate the RPC credentials.
configContents, err := ioutil.ReadAll(btcdConfigFile)
configContents, err := io.ReadAll(btcdConfigFile)
if err != nil {
return "", "", err
}
Expand Down Expand Up @@ -2056,7 +2057,7 @@ func extractBitcoindRPCParams(networkName, bitcoindDataDir, bitcoindConfigPath,

// With the file open extract the contents of the configuration file so
// we can attempt to locate the RPC credentials.
configContents, err := ioutil.ReadAll(bitcoindConfigFile)
configContents, err := io.ReadAll(bitcoindConfigFile)
if err != nil {
return "", "", "", "", err
}
Expand Down
3 changes: 1 addition & 2 deletions contractcourt/htlc_incoming_contest_resolver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package contractcourt
import (
"bytes"
"io"
"io/ioutil"
"testing"

sphinx "github.com/lightningnetwork/lightning-onion"
Expand Down Expand Up @@ -291,7 +290,7 @@ type mockOnionProcessor struct {
func (o *mockOnionProcessor) ReconstructHopIterator(r io.Reader, rHash []byte,
_ hop.ReconstructBlindingInfo) (hop.Iterator, error) {

data, err := ioutil.ReadAll(r)
data, err := io.ReadAll(r)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 619c8f4

Please sign in to comment.