Skip to content

refactor: replace the deprecated function in the ioutil package #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2025
Merged

refactor: replace the deprecated function in the ioutil package #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions clightning/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package clightning
import (
"encoding/json"
"fmt"
"io/ioutil"
"net/url"
"os"
"path/filepath"
Expand Down Expand Up @@ -186,7 +185,7 @@ func CheckForLegacyClnConfig(plugin *glightning.Plugin) Processor {
// in the running CLN container.
func ReadFromFile() Processor {
return func(c *Config) (*Config, error) {
data, err := ioutil.ReadFile(filepath.Join(c.PeerswapDir, defaultConfigFileName))
data, err := os.ReadFile(filepath.Join(c.PeerswapDir, defaultConfigFileName))
if os.IsNotExist(err) {
return c, nil
}
Expand Down
6 changes: 3 additions & 3 deletions clightning/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package clightning

import (
"io/fs"
"io/ioutil"
"os"
"path/filepath"
"testing"

Expand Down Expand Up @@ -30,7 +30,7 @@ func Test_ReadFromFile(t *testing.T) {

dir := t.TempDir()
fp := filepath.Join(dir, "peerswap.conf")
_ = ioutil.WriteFile(fp, []byte(conf), fs.ModePerm)
_ = os.WriteFile(fp, []byte(conf), fs.ModePerm)

c := &Config{PeerswapDir: dir, Bitcoin: &BitcoinConf{}, Liquid: &LiquidConf{}}
actual, err := ReadFromFile()(c)
Expand Down Expand Up @@ -68,7 +68,7 @@ func Test_ReadFromFile(t *testing.T) {
func Test_ReadFromFile_EmptyFile(t *testing.T) {
dir := t.TempDir()
fp := filepath.Join(dir, "peerswap.conf")
_ = ioutil.WriteFile(fp, []byte{}, fs.ModePerm)
_ = os.WriteFile(fp, []byte{}, fs.ModePerm)

c := &Config{PeerswapDir: dir, Bitcoin: &BitcoinConf{}, Liquid: &LiquidConf{}}
actual, err := ReadFromFile()(c)
Expand Down
3 changes: 1 addition & 2 deletions cmd/peerswaplnd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package peerswaplnd
import (
"errors"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
Expand Down Expand Up @@ -123,7 +122,7 @@ func (o *OnchainConfig) Validate() error {
return errors.New("rpcpass or rpcpasswordfile must be set")
}
if o.RpcPasswordFile != "" {
passBytes, err := ioutil.ReadFile(o.RpcPasswordFile)
passBytes, err := os.ReadFile(o.RpcPasswordFile)
if err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions lnd/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package lnd

import (
"context"
"io/ioutil"
"os"
"time"

"github.com/elementsproject/peerswap/cmd/peerswaplnd"
Expand Down Expand Up @@ -86,7 +86,7 @@ func GetClientConnection(ctx context.Context, cfg *peerswaplnd.LndConfig) (*grpc
if err != nil {
return nil, err
}
macBytes, err := ioutil.ReadFile(cfg.MacaroonPath)
macBytes, err := os.ReadFile(cfg.MacaroonPath)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -148,7 +148,7 @@ func getClientConnectionForTests(ctx context.Context, cfg *peerswaplnd.LndConfig
if err != nil {
return nil, err
}
macBytes, err := ioutil.ReadFile(cfg.MacaroonPath)
macBytes, err := os.ReadFile(cfg.MacaroonPath)
if err != nil {
return nil, err
}
Expand Down
9 changes: 4 additions & 5 deletions policy/policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"crypto/rand"
"encoding/hex"
"fmt"
"io/ioutil"
"os"
"path"
"path/filepath"
Expand Down Expand Up @@ -160,7 +159,7 @@ func Test_AddRemovePeer_Runtime(t *testing.T) {
err = policy.AddToSuspiciousPeerList(pubkeys[1])
assert.NoError(t, err)

policyFile, err := ioutil.ReadFile(policyFilePath)
policyFile, err := os.ReadFile(policyFilePath)
assert.NoError(t, err)
assert.Equal(
t,
Expand All @@ -178,7 +177,7 @@ func Test_AddRemovePeer_Runtime(t *testing.T) {
err = policy.RemoveFromSuspiciousPeerList(pubkeys[1])
assert.NoError(t, err)

policyFile, err = ioutil.ReadFile(policyFilePath)
policyFile, err = os.ReadFile(policyFilePath)
assert.NoError(t, err)
assert.Equal(
t,
Expand Down Expand Up @@ -351,7 +350,7 @@ func Test_AllowSwapRequests(t *testing.T) {
assert.NoError(t, err)
assert.False(t, policy.NewSwapsAllowed())

policyFile, _ := ioutil.ReadFile(policyFilePath)
policyFile, _ := os.ReadFile(policyFilePath)
assert.Equal(
t,
"allow_new_swaps=false\n",
Expand All @@ -362,7 +361,7 @@ func Test_AllowSwapRequests(t *testing.T) {
assert.NoError(t, err)
assert.True(t, policy.NewSwapsAllowed())

policyFile, _ = ioutil.ReadFile(policyFilePath)
policyFile, _ = os.ReadFile(policyFilePath)
assert.Equal(
t,
"allow_new_swaps=true\n",
Expand Down
3 changes: 1 addition & 2 deletions testframework/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"context"
"encoding/base64"
"fmt"
"io/ioutil"
"net/url"
"os"
"path/filepath"
Expand Down Expand Up @@ -201,7 +200,7 @@ func NewLndRpcClient(host, certPath, macaroonPath string, options ...grpc.DialOp
return nil, fmt.Errorf("NewClientTLSFromFile() %w", err)
}

macBytes, err := ioutil.ReadFile(macaroonPath)
macBytes, err := os.ReadFile(macaroonPath)
if err != nil {
return nil, fmt.Errorf("ReadFile() %w", err)
}
Expand Down