From 586a612388fc3b5eba7a49c5a0a4d01d122cb84b Mon Sep 17 00:00:00 2001
From: Adrien Waksberg <git@waks.be>
Date: Sun, 9 Mar 2025 19:36:01 +0100
Subject: [PATCH] fix: remove deprecated ioutil lib
---
internal/gpm/cli.go | 21 ++++++++++-----------
internal/gpm/config.go | 5 ++---
internal/gpm/config_test.go | 5 ++---
internal/gpm/wallet.go | 5 ++---
internal/gpm/wallet_test.go | 7 +++----
5 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/internal/gpm/cli.go b/internal/gpm/cli.go
index e514c96..d8e58f5 100644
--- a/internal/gpm/cli.go
+++ b/internal/gpm/cli.go
@@ -1,15 +1,14 @@
package gpm
import (
- "fmt"
"flag"
- "io/ioutil"
+ "fmt"
"os"
"time"
+ "github.com/atotto/clipboard"
ui "github.com/gizak/termui/v3"
"github.com/gizak/termui/v3/widgets"
- "github.com/atotto/clipboard"
)
// Options
@@ -104,7 +103,7 @@ func (c *Cli) InputBox(title string, input string, hidden bool) string {
if hidden {
secret = ""
- for i := 1; i <= int(float64(len(input)) * 1.75); i++ {
+ for i := 1; i <= int(float64(len(input))*1.75); i++ {
secret = secret + "*"
}
p.Text = secret
@@ -472,7 +471,7 @@ func (c *Cli) ImportWallet() error {
return err
}
- data, err := ioutil.ReadFile(*IMPORT)
+ data, err := os.ReadFile(*IMPORT)
if err != nil {
return err
}
@@ -497,7 +496,7 @@ func (c *Cli) ExportWallet() error {
return err
}
- err = ioutil.WriteFile(*EXPORT, data, 0600)
+ err = os.WriteFile(*EXPORT, data, 0600)
if err != nil {
return err
}
@@ -553,12 +552,12 @@ func Run() {
for {
select {
- case res := <-c1:
- if res {
- return
- }
- case <-time.After(300 * time.Second):
+ case res := <-c1:
+ if res {
return
+ }
+ case <-time.After(300 * time.Second):
+ return
}
}
}
diff --git a/internal/gpm/config.go b/internal/gpm/config.go
index 69188f9..8dbfa85 100644
--- a/internal/gpm/config.go
+++ b/internal/gpm/config.go
@@ -17,7 +17,6 @@ package gpm
import (
"encoding/json"
"fmt"
- "io/ioutil"
"os"
"os/user"
"runtime"
@@ -69,7 +68,7 @@ func (c *Config) Load(path string) error {
}
- data, err := ioutil.ReadFile(path)
+ data, err := os.ReadFile(path)
if err != nil {
return err
}
@@ -95,7 +94,7 @@ func (c *Config) Save(path string) error {
return err
}
- err = ioutil.WriteFile(path, []byte(data), 0644)
+ err = os.WriteFile(path, []byte(data), 0644)
if err != nil {
return err
}
diff --git a/internal/gpm/config_test.go b/internal/gpm/config_test.go
index 124366c..dc75513 100644
--- a/internal/gpm/config_test.go
+++ b/internal/gpm/config_test.go
@@ -1,7 +1,6 @@
package gpm
import (
- "io/ioutil"
"os"
"testing"
)
@@ -38,7 +37,7 @@ func TestInit(t *testing.T) {
func TestSave(t *testing.T) {
var config Config
- tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
+ tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
defer os.Remove(tmpFile.Name())
config.Init()
@@ -51,7 +50,7 @@ func TestSave(t *testing.T) {
func TestLoadWithFile(t *testing.T) {
var config Config
- tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
+ tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
defer os.Remove(tmpFile.Name())
config.Init()
diff --git a/internal/gpm/wallet.go b/internal/gpm/wallet.go
index 6187f6b..d7a7b70 100644
--- a/internal/gpm/wallet.go
+++ b/internal/gpm/wallet.go
@@ -17,7 +17,6 @@ package gpm
import (
"encoding/json"
"fmt"
- "io/ioutil"
"os"
"regexp"
"sort"
@@ -49,7 +48,7 @@ func (w *Wallet) Load() error {
return nil
}
- content, err := ioutil.ReadFile(w.Path)
+ content, err := os.ReadFile(w.Path)
if err != nil {
return err
}
@@ -95,7 +94,7 @@ func (w *Wallet) Save() error {
return err
}
- err = ioutil.WriteFile(w.Path, content, 0600)
+ err = os.WriteFile(w.Path, content, 0600)
if err != nil {
return err
}
diff --git a/internal/gpm/wallet_test.go b/internal/gpm/wallet_test.go
index 3aa905a..23d19b0 100644
--- a/internal/gpm/wallet_test.go
+++ b/internal/gpm/wallet_test.go
@@ -2,7 +2,6 @@ package gpm
import (
"fmt"
- "io/ioutil"
"os"
"testing"
)
@@ -173,7 +172,7 @@ func TestExportAndImport(t *testing.T) {
}
func TestSaveWallet(t *testing.T) {
- tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
+ tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
defer os.Remove(tmpFile.Name())
wallet := generateWalletWithEntries()
@@ -189,7 +188,7 @@ func TestSaveWallet(t *testing.T) {
func TestLoadWalletWithGoodPassword(t *testing.T) {
var loadWallet Wallet
- tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
+ tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
defer os.Remove(tmpFile.Name())
wallet := generateWalletWithEntries()
@@ -213,7 +212,7 @@ func TestLoadWalletWithGoodPassword(t *testing.T) {
func TestLoadWalletWithBadPassword(t *testing.T) {
var loadWallet Wallet
- tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
+ tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
defer os.Remove(tmpFile.Name())
wallet := generateWalletWithEntries()