fix

CHANGELOG.md

@@ -9,12 +9,6 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/)
 
 ### Changed
 
-- Replace deprecated ioutil lib
-
-## v2.0.1 - 2024-10-12
-
-### Changed
-
 - Update libs
 
 ### Fixed

internal/gpm/cli.go

@@ -1,14 +1,15 @@
 package gpm
 
 import (
-	"flag"
 	"fmt"
+	"flag"
+	"io/ioutil"
 	"os"
 	"time"
 
-	"github.com/atotto/clipboard"
 	ui "github.com/gizak/termui/v3"
 	"github.com/gizak/termui/v3/widgets"
+	"github.com/atotto/clipboard"
 )
 
 // Options
@@ -103,7 +104,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
@@ -471,7 +472,7 @@ func (c *Cli) ImportWallet() error {
 		return err
 	}
 
-	data, err := os.ReadFile(*IMPORT)
+	data, err := ioutil.ReadFile(*IMPORT)
 	if err != nil {
 		return err
 	}
@@ -496,7 +497,7 @@ func (c *Cli) ExportWallet() error {
 		return err
 	}
 
-	err = os.WriteFile(*EXPORT, data, 0600)
+	err = ioutil.WriteFile(*EXPORT, data, 0600)
 	if err != nil {
 		return err
 	}
@@ -552,12 +553,12 @@ func Run() {
 
 		for {
 			select {
-			case res := <-c1:
-				if res {
+				case res := <-c1:
+					if res {
+						return
+					}
+				case <-time.After(300 * time.Second):
 					return
-				}
-			case <-time.After(300 * time.Second):
-				return
 			}
 		}
 	}

internal/gpm/config.go

@@ -17,6 +17,7 @@ package gpm
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/user"
 	"runtime"
@@ -68,7 +69,7 @@ func (c *Config) Load(path string) error {
 
 		}
 
-		data, err := os.ReadFile(path)
+		data, err := ioutil.ReadFile(path)
 		if err != nil {
 			return err
 		}
@@ -94,7 +95,7 @@ func (c *Config) Save(path string) error {
 		return err
 	}
 
-	err = os.WriteFile(path, []byte(data), 0644)
+	err = ioutil.WriteFile(path, []byte(data), 0644)
 	if err != nil {
 		return err
 	}

internal/gpm/config_test.go

@@ -1,6 +1,7 @@
 package gpm
 
 import (
+	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -37,7 +38,7 @@ func TestInit(t *testing.T) {
 func TestSave(t *testing.T) {
 	var config Config
 
-	tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
+	tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
 	defer os.Remove(tmpFile.Name())
 
 	config.Init()
@@ -50,7 +51,7 @@ func TestSave(t *testing.T) {
 func TestLoadWithFile(t *testing.T) {
 	var config Config
 
-	tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
+	tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
 	defer os.Remove(tmpFile.Name())
 
 	config.Init()

internal/gpm/wallet.go

@@ -17,6 +17,7 @@ package gpm
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"regexp"
 	"sort"
@@ -48,7 +49,7 @@ func (w *Wallet) Load() error {
 		return nil
 	}
 
-	content, err := os.ReadFile(w.Path)
+	content, err := ioutil.ReadFile(w.Path)
 	if err != nil {
 		return err
 	}
@@ -94,7 +95,7 @@ func (w *Wallet) Save() error {
 		return err
 	}
 
-	err = os.WriteFile(w.Path, content, 0600)
+	err = ioutil.WriteFile(w.Path, content, 0600)
 	if err != nil {
 		return err
 	}

internal/gpm/wallet_test.go

@@ -2,6 +2,7 @@ package gpm
 
 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"testing"
 )
@@ -172,7 +173,7 @@ func TestExportAndImport(t *testing.T) {
 }
 
 func TestSaveWallet(t *testing.T) {
-	tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
+	tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
 	defer os.Remove(tmpFile.Name())
 
 	wallet := generateWalletWithEntries()
@@ -188,7 +189,7 @@ func TestSaveWallet(t *testing.T) {
 func TestLoadWalletWithGoodPassword(t *testing.T) {
 	var loadWallet Wallet
 
-	tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
+	tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
 	defer os.Remove(tmpFile.Name())
 
 	wallet := generateWalletWithEntries()
@@ -212,7 +213,7 @@ func TestLoadWalletWithGoodPassword(t *testing.T) {
 func TestLoadWalletWithBadPassword(t *testing.T) {
 	var loadWallet Wallet
 
-	tmpFile, _ := os.CreateTemp(os.TempDir(), "gpm_test-")
+	tmpFile, _ := ioutil.TempFile(os.TempDir(), "gpm_test-")
 	defer os.Remove(tmpFile.Name())
 
 	wallet := generateWalletWithEntries()