Switch from forked to upstream flags package.

In https://github.com/btcsuite/btcwallet/pull/419#issuecomment-212482492
I mentioned that btcwallet should wait until btcd also switches back
to upstream package paths so that duplicate packages are not included
in and bloat the btcwallet binary.  Even while btcd has not yet
switched to the upstream flags package, this change can still be made
now since it is only used by btcd's main package, which is not
included in btcwallet.
This commit is contained in:
Josh Rickmar 2016-05-06 11:53:12 -04:00
parent 00deaece98
commit 7704a6d5c3
5 changed files with 10 additions and 9 deletions

View file

@ -1,4 +1,4 @@
// Copyright (c) 2015 The btcsuite developers // Copyright (c) 2015-2016 The btcsuite developers
// Use of this source code is governed by an ISC // Use of this source code is governed by an ISC
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -13,7 +13,7 @@ import (
"github.com/btcsuite/btcutil" "github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/walletdb" "github.com/btcsuite/btcwallet/walletdb"
_ "github.com/btcsuite/btcwallet/walletdb/bdb" _ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/btcsuite/go-flags" "github.com/jessevdk/go-flags"
) )
const defaultNet = "mainnet" const defaultNet = "mainnet"

View file

@ -19,8 +19,8 @@ import (
"github.com/btcsuite/btcwallet/netparams" "github.com/btcsuite/btcwallet/netparams"
"github.com/btcsuite/btcwallet/wallet/txauthor" "github.com/btcsuite/btcwallet/wallet/txauthor"
"github.com/btcsuite/btcwallet/wallet/txrules" "github.com/btcsuite/btcwallet/wallet/txrules"
"github.com/btcsuite/go-flags"
"github.com/btcsuite/golangcrypto/ssh/terminal" "github.com/btcsuite/golangcrypto/ssh/terminal"
"github.com/jessevdk/go-flags"
) )
var ( var (

View file

@ -19,7 +19,7 @@ import (
"github.com/btcsuite/btcwallet/internal/legacy/keystore" "github.com/btcsuite/btcwallet/internal/legacy/keystore"
"github.com/btcsuite/btcwallet/netparams" "github.com/btcsuite/btcwallet/netparams"
"github.com/btcsuite/btcwallet/wallet" "github.com/btcsuite/btcwallet/wallet"
flags "github.com/btcsuite/go-flags" flags "github.com/jessevdk/go-flags"
) )
const ( const (

8
glide.lock generated
View file

@ -1,5 +1,5 @@
hash: 340dfe35ff5fb371aef999130fa60b2d7c84384c0c23bed06bbfd712139a6b3e hash: 6a47c00739ba9fbc894ee07dfb332058610482cdbc5d57ca22114b1df8d14a77
updated: 2016-04-19T15:13:03.285169879-04:00 updated: 2016-05-06T12:41:29.3972329-04:00
imports: imports:
- name: github.com/btcsuite/bolt - name: github.com/btcsuite/bolt
version: 38b9bbfde72d4b62b6a038a3adfca64c44da0133 version: 38b9bbfde72d4b62b6a038a3adfca64c44da0133
@ -24,8 +24,6 @@ imports:
- base58 - base58
- name: github.com/btcsuite/fastsha256 - name: github.com/btcsuite/fastsha256
version: 302ad4db268b46f9ebda3078f6f7397f96047735 version: 302ad4db268b46f9ebda3078f6f7397f96047735
- name: github.com/btcsuite/go-flags
version: 6c288d648c1cc1befcb90cb5511dcacf64ae8e61
- name: github.com/btcsuite/go-socks - name: github.com/btcsuite/go-socks
version: cfe8b59e565c1a5bd4e2005d77cd9aa8b2e14524 version: cfe8b59e565c1a5bd4e2005d77cd9aa8b2e14524
subpackages: subpackages:
@ -48,6 +46,8 @@ imports:
version: 2ebff28ac76fb19e2d25e5ddd4885708dfdd5611 version: 2ebff28ac76fb19e2d25e5ddd4885708dfdd5611
subpackages: subpackages:
- proto - proto
- name: github.com/jessevdk/go-flags
version: 1679536dcc895411a9f5848d9a0250be7856448c
- name: golang.org/x/net - name: golang.org/x/net
version: fb93926129b8ec0056f2f458b1f519654814edf0 version: fb93926129b8ec0056f2f458b1f519654814edf0
subpackages: subpackages:

View file

@ -15,7 +15,6 @@ import:
subpackages: subpackages:
- hdkeychain - hdkeychain
- package: github.com/btcsuite/fastsha256 - package: github.com/btcsuite/fastsha256
- package: github.com/btcsuite/go-flags
- package: github.com/btcsuite/golangcrypto - package: github.com/btcsuite/golangcrypto
subpackages: subpackages:
- nacl/secretbox - nacl/secretbox
@ -35,3 +34,5 @@ import:
- codes - codes
- credentials - credentials
- grpclog - grpclog
- package: github.com/jessevdk/go-flags
version: 1679536dcc895411a9f5848d9a0250be7856448c