Skip to content

Commit

Permalink
Switch from forked to upstream flags package.
Browse files Browse the repository at this point in the history
In btcsuite#419 (comment)
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.
jrick committed May 6, 2016
1 parent 00deaec commit 7704a6d
Showing 5 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cmd/dropwtxmgr/main.go
Original file line number Diff line number Diff line change
@@ -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
// license that can be found in the LICENSE file.

@@ -13,7 +13,7 @@ import (
"github.com/btcsuite/btcutil"
"github.com/btcsuite/btcwallet/walletdb"
_ "github.com/btcsuite/btcwallet/walletdb/bdb"
"github.com/btcsuite/go-flags"
"github.com/jessevdk/go-flags"
)

const defaultNet = "mainnet"
2 changes: 1 addition & 1 deletion cmd/sweepaccount/main.go
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ import (
"github.com/btcsuite/btcwallet/netparams"
"github.com/btcsuite/btcwallet/wallet/txauthor"
"github.com/btcsuite/btcwallet/wallet/txrules"
"github.com/btcsuite/go-flags"
"github.com/btcsuite/golangcrypto/ssh/terminal"
"github.com/jessevdk/go-flags"
)

var (
2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ import (
"github.com/btcsuite/btcwallet/internal/legacy/keystore"
"github.com/btcsuite/btcwallet/netparams"
"github.com/btcsuite/btcwallet/wallet"
flags "github.com/btcsuite/go-flags"
flags "github.com/jessevdk/go-flags"
)

const (
8 changes: 4 additions & 4 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ import:
subpackages:
- hdkeychain
- package: github.com/btcsuite/fastsha256
- package: github.com/btcsuite/go-flags
- package: github.com/btcsuite/golangcrypto
subpackages:
- nacl/secretbox
@@ -35,3 +34,5 @@ import:
- codes
- credentials
- grpclog
- package: github.com/jessevdk/go-flags
version: 1679536dcc895411a9f5848d9a0250be7856448c

0 comments on commit 7704a6d

Please sign in to comment.