LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

Move keystore to legacy directory.

Browse source
This commit is contained in:
Dave Collins 2014-10-13 17:57:57 -05:00 committed by Josh Rickmar
parent f704c58114
commit 130e44c761
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chain/chain.go
View file

@ -26,7 +26,7 @@ import (
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/keystore" "github.com/btcsuite/btcwallet/legacy/keystore"
"github.com/btcsuite/btcwallet/txstore" "github.com/btcsuite/btcwallet/txstore"
) )

2
chainntfns.go
View file

@ -20,7 +20,7 @@ import (
"github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/keystore" "github.com/btcsuite/btcwallet/legacy/keystore"
"github.com/btcsuite/btcwallet/txstore" "github.com/btcsuite/btcwallet/txstore"
) )

2
createtx.go
View file

@ -27,7 +27,7 @@ import (
"github.com/btcsuite/btcd/txscript" "github.com/btcsuite/btcd/txscript"
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/keystore" "github.com/btcsuite/btcwallet/legacy/keystore"
"github.com/btcsuite/btcwallet/txstore" "github.com/btcsuite/btcwallet/txstore"
) )

10
keystore/keystore.go → legacy/keystore/keystore.go
View file

@ -45,7 +45,7 @@ import (
) )
const ( const (
filename = "wallet.bin" Filename = "wallet.bin"
// Length in bytes of KDF output. // Length in bytes of KDF output.
kdfOutputBytes = 32 kdfOutputBytes = 32
@ -587,9 +587,9 @@ func New(dir string, desc string, passphrase []byte, net *chaincfg.Params,
// Create and fill key store. // Create and fill key store.
s := &Store{ s := &Store{
path: filepath.Join(dir, filename), path: filepath.Join(dir, Filename),
dir: dir, dir: dir,
file: filename, file: Filename,
vers: VersCurrent, vers: VersCurrent,
net: (*netParams)(net), net: (*netParams)(net),
flags: walletFlags{ flags: walletFlags{
@ -878,7 +878,7 @@ func (s *Store) WriteIfDirty() error {
// be checked with os.IsNotExist to differentiate missing file errors from // be checked with os.IsNotExist to differentiate missing file errors from
// others (including deserialization). // others (including deserialization).
func OpenDir(dir string) (*Store, error) { func OpenDir(dir string) (*Store, error) {
path := filepath.Join(dir, filename) path := filepath.Join(dir, Filename)
fi, err := os.OpenFile(path, os.O_RDONLY, 0) fi, err := os.OpenFile(path, os.O_RDONLY, 0)
if err != nil { if err != nil {
return nil, err return nil, err
@ -891,7 +891,7 @@ func OpenDir(dir string) (*Store, error) {
} }
store.path = path store.path = path
store.dir = dir store.dir = dir
store.file = filename store.file = Filename
return store, nil return store, nil
} }

0
keystore/keystore_test.go → legacy/keystore/keystore_test.go
View file

2
rescan.go
View file

@ -20,7 +20,7 @@ import (
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/keystore" "github.com/btcsuite/btcwallet/legacy/keystore"
) )
// RescanProgressMsg reports the current progress made by a rescan for a // RescanProgressMsg reports the current progress made by a rescan for a

2
rpcserver.go
View file

@ -45,7 +45,7 @@ import (
"github.com/btcsuite/btcrpcclient" "github.com/btcsuite/btcrpcclient"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/keystore" "github.com/btcsuite/btcwallet/legacy/keystore"
"github.com/btcsuite/btcwallet/txstore" "github.com/btcsuite/btcwallet/txstore"
"github.com/btcsuite/websocket" "github.com/btcsuite/websocket"
) )

2
wallet.go
View file

@ -32,7 +32,7 @@ import (
"github.com/btcsuite/btcd/wire" "github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/chain" "github.com/btcsuite/btcwallet/chain"
"github.com/btcsuite/btcwallet/keystore" "github.com/btcsuite/btcwallet/legacy/keystore"
"github.com/btcsuite/btcwallet/txstore" "github.com/btcsuite/btcwallet/txstore"
) )