[#218] adm: Refactor helper
in part of reading alphabet wallets
Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
parent
72ab373b71
commit
36eab4059c
1 changed files with 30 additions and 27 deletions
|
@ -40,45 +40,48 @@ func openAlphabetWallets(v *viper.Viper, walletDir string) ([]*wallet.Wallet, er
|
|||
return nil, fmt.Errorf("can't read alphabet wallets dir: %w", err)
|
||||
}
|
||||
|
||||
var size int
|
||||
loop:
|
||||
for i := 0; i < len(walletFiles); i++ {
|
||||
name := innerring.GlagoliticLetter(i).String() + ".json"
|
||||
for j := range walletFiles {
|
||||
if walletFiles[j].Name() == name {
|
||||
size++
|
||||
continue loop
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
if size == 0 {
|
||||
return nil, errors.New("alphabet wallets dir is empty (run `generate-alphabet` command first)")
|
||||
}
|
||||
|
||||
wallets := make([]*wallet.Wallet, size)
|
||||
for i := 0; i < size; i++ {
|
||||
letter := innerring.GlagoliticLetter(i).String()
|
||||
var wallets []*wallet.Wallet
|
||||
var letter string
|
||||
for i := 0; i < constants.MaxAlphabetNodes; i++ {
|
||||
letter = innerring.GlagoliticLetter(i).String()
|
||||
p := filepath.Join(walletDir, letter+".json")
|
||||
w, err := wallet.NewWalletFromFile(p)
|
||||
var w *wallet.Wallet
|
||||
w, err = wallet.NewWalletFromFile(p)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("can't open wallet: %w", err)
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
err = nil
|
||||
} else {
|
||||
err = fmt.Errorf("can't open wallet: %w", err)
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
password, err := config.GetPassword(v, letter)
|
||||
var password string
|
||||
password, err = config.GetPassword(v, letter)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("can't fetch password: %w", err)
|
||||
err = fmt.Errorf("can't fetch password: %w", err)
|
||||
break
|
||||
}
|
||||
|
||||
for i := range w.Accounts {
|
||||
if err := w.Accounts[i].Decrypt(password, keys.NEP2ScryptParams()); err != nil {
|
||||
return nil, fmt.Errorf("can't unlock wallet: %w", err)
|
||||
if err = w.Accounts[i].Decrypt(password, keys.NEP2ScryptParams()); err != nil {
|
||||
err = fmt.Errorf("can't unlock wallet: %w", err)
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
wallets[i] = w
|
||||
wallets = append(wallets, w)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("can't read wallet for letter '%s': %w", letter, err)
|
||||
}
|
||||
if len(wallets) == 0 {
|
||||
err = errors.New("there are no alphabet wallets in dir (run `generate-alphabet` command first)")
|
||||
if len(walletFiles) > 0 {
|
||||
err = fmt.Errorf("use glagolitic names for wallets(run `print-alphabet`): %w", err)
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return wallets, nil
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue