aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

wallet: do not store file handle

Browse source 
Close immediately after read/write. This can be a bit slower but
we store everything in memory anyway and code size is smaller.
`wallet.Close()` method is now a no-op.

Signed-off-by: Evgeniy Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgeniy Stratonikov 2021-09-27 10:45:42 +03:00
parent 7b6203d0d4
commit cb5b075e7d
1 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
pkg/wallet/wallet.go
View file

@ -4,6 +4,7 @@ import (
"encoding/json"
"errors"
"io"
"io/ioutil"
"os"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
@ -34,9 +35,6 @@ type Wallet struct {
// Path where the wallet file is located..
path string
// ReadWriter for reading and writing wallet data.
rw io.ReadWriter
}
// Extra stores imported token contracts.
@ -51,6 +49,7 @@ func NewWallet(location string) (*Wallet, error) {
if err != nil {
return nil, err
}
defer file.Close()
return newWallet(file), nil
}
@ -80,7 +79,6 @@ func newWallet(rw io.ReadWriter) *Wallet {
Version: walletVersion,
Accounts: []*Account{},
Scrypt: keys.NEP2ScryptParams(),
rw: rw,
path: path,
}
}
@ -163,37 +161,7 @@ func (w *Wallet) savePretty() error {
}
func (w *Wallet) writeRaw(data []byte) error {
if w.rw == nil {
f, err := os.OpenFile(w.path, os.O_RDWR, os.ModeAppend)
if err != nil {
return err
}
w.rw = f
}
if err := w.rewind(); err != nil {
return err
}
_, err := w.rw.Write(data)
if err != nil {
return err
}
if f, ok := w.rw.(*os.File); ok {
if err := f.Truncate(int64(len(data))); err != nil {
return err
}
}
return nil
}
func (w *Wallet) rewind() error {
if s, ok := w.rw.(io.Seeker); ok {
if _, err := s.Seek(0, io.SeekStart); err != nil {
return err
}
}
return nil
return ioutil.WriteFile(w.path, data, 0644)
}
// JSON outputs a pretty JSON representation of the wallet.
@ -203,9 +171,6 @@ func (w *Wallet) JSON() ([]byte, error) {
// Close closes the internal rw if its an io.ReadCloser.
func (w *Wallet) Close() {
if rc, ok := w.rw.(io.ReadCloser); ok {
rc.Close()
}
}
// GetAccount returns account corresponding to the provided scripthash.