Skip to content

Commit

Permalink
Cleans installation process (no more ducktape warnings).
Browse files Browse the repository at this point in the history
  • Loading branch information
web3coach committed Jun 6, 2021
1 parent 4c68886 commit 78ff803
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 76 deletions.
2 changes: 1 addition & 1 deletion cmd/tbb/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

const Major = "1"
const Minor = "3"
const Minor = "8"
const Fix = "2"
const Verbal = "TX Gas"

Expand Down
23 changes: 4 additions & 19 deletions cmd/tbb/wallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ package main

import (
"fmt"
"io/ioutil"
"os"

"github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/console"
"github.com/spf13/cobra"
"github.com/web3coach/the-blockchain-bar/wallet"
"io/ioutil"
"os"
)

func walletCmd() *cobra.Command {
Expand Down Expand Up @@ -98,20 +98,5 @@ func walletPrintPrivKeyCmd() *cobra.Command {
}

func getPassPhrase(prompt string, confirmation bool) string {
password, err := console.Stdin.PromptPassword(prompt)
if err != nil {
utils.Fatalf("Failed to read password: %v", err)
}

if confirmation {
confirm, err := console.Stdin.PromptPassword("Repeat password: ")
if err != nil {
utils.Fatalf("Failed to read password confirmation: %v", err)
}
if password != confirm {
utils.Fatalf("Passwords do not match")
}
}

return password
return utils.GetPassPhrase(prompt, confirmation)
}
27 changes: 0 additions & 27 deletions fs/unicode.go

This file was deleted.

3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ require (
github.com/btcsuite/btcd v0.20.1-beta // indirect
github.com/caddyserver/certmagic v0.11.2
github.com/davecgh/go-spew v1.1.1
github.com/elastic/gosigar v0.10.5 // indirect
github.com/ethereum/go-ethereum v1.9.10
github.com/ethereum/go-ethereum v1.9.25
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222
github.com/spf13/cobra v0.0.3
Expand Down
Loading

0 comments on commit 78ff803

Please sign in to comment.