Move keystore to legacy directory.

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

View file

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

View file

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

View file

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

View file

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

View file

@ -20,7 +20,7 @@ import (
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcutil"
"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

View file

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

View file

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