Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
This commit is contained in:
commit
4a2dd306c7
@ -6,30 +6,35 @@ import (
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func InitWords() []string {
|
||||
_, thisfile, _, _ := runtime.Caller(1)
|
||||
filename := path.Join(path.Dir(thisfile), "mnemonic.words.lst")
|
||||
func InitWords(wordsPath string) {
|
||||
filename := path.Join(wordsPath, "mnemonic.words.lst")
|
||||
if _, err := os.Stat(filename); os.IsNotExist(err) {
|
||||
fmt.Printf("reading mnemonic word list file 'mnemonic.words.lst' from source folder failed, looking in current folder.")
|
||||
fmt.Printf("reading mnemonic word list file from supplied path not found. Looked in %s. Trying next option.\n", filename)
|
||||
|
||||
dir := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "eth-go", "ethcrypto")
|
||||
filename = path.Join(dir, "mnemonic.words.lst")
|
||||
if _, err := os.Stat(filename); os.IsNotExist(err) {
|
||||
fmt.Printf("reading mnemonic word list file 'mnemonic.words.lst' from source folder failed: %s.\n", filename)
|
||||
dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("problem getting current folder: ", err))
|
||||
}
|
||||
filename = path.Join(dir, "mnemonic.words.lst")
|
||||
}
|
||||
}
|
||||
|
||||
content, err := ioutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("reading mnemonic word list file 'mnemonic.words.lst' failed: ", err))
|
||||
panic(fmt.Errorf("All options for finding the mnemonic word list file 'mnemonic.words.lst' failed: ", err))
|
||||
}
|
||||
return strings.Split(string(content), "\n")
|
||||
words = strings.Split(string(content), "\n")
|
||||
}
|
||||
|
||||
var words = InitWords()
|
||||
var words []string
|
||||
|
||||
// TODO: See if we can refactor this into a shared util lib if we need it multiple times
|
||||
func IndexOf(slice []string, value string) int64 {
|
||||
|
Loading…
Reference in New Issue
Block a user