nishiki/gpm
1
0
Fork 0
Code Issues3 Pull requests Releases5 Wiki Activity

fix: remove deprecated ioutil lib

Browse source
This commit is contained in:
Adrien Waksberg 2025-03-09 19:36:01 +01:00
parent d72e124a47
commit 586a612388
5 changed files with 19 additions and 24 deletions

21
internal/gpm/cli.go
View file

@ -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
}
}
}

5
internal/gpm/config.go
View file

@ -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
}

5
internal/gpm/config_test.go
View file

@ -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()

5
internal/gpm/wallet.go
View file

@ -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
}

7
internal/gpm/wallet_test.go
View file

@ -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()