Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix all bits broken by viper API changes #5982

Merged
merged 8 commits into from
Apr 14, 2020
Merged

fix all bits broken by viper API changes #5982

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df25f87
client/context: rely on trust-node defaults instead of using viper.Is…
Apr 10, 2020
a5abc08
client/keys: don't use viper.IsSet()
Apr 10, 2020
f4de656
Merge branch 'master' into alessio/dont-use-viper-isset
Apr 11, 2020
890f678
don't use viper.IsSet()
Apr 14, 2020
c0eaa6f
don't test verifier connectivity
Apr 14, 2020
63db075
Fix tests
Apr 14, 2020
7000110
update changelog
Apr 14, 2020
769a6c2
Merge branch 'master' into alessio/dont-use-viper-isset
Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
client/keys: don't use viper.IsSet()
  • Loading branch information
Alessio Treglia committed Apr 10, 2020
commit a5abc08cf0913e4c9ae92882934cf36e8c763617
10 changes: 3 additions & 7 deletions client/keys/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,20 +190,16 @@ func RunAddCmd(cmd *cobra.Command, args []string, kb keyring.Keyring, inBuf *buf
coinType := uint32(viper.GetInt(flagCoinType))
account := uint32(viper.GetInt(flagAccount))
index := uint32(viper.GetInt(flagIndex))
hdPath := viper.GetString(flagHDPath)

useBIP44 := !viper.IsSet(flagHDPath)
var hdPath string

if useBIP44 {
if len(hdPath) == 0 {
hdPath = hd.CreateHDPath(coinType, account, index).String()
} else {
hdPath = viper.GetString(flagHDPath)
}

// If we're using ledger, only thing we need is the path and the bech32 prefix.
if viper.GetBool(flags.FlagUseLedger) {

if !useBIP44 {
if len(hdPath) != 0 {
return errors.New("cannot set custom bip32 path with ledger")
}

Expand Down