Skip to content

Commit

Permalink
Merge pull request #9873 from filecoin-project/gstuart/print-addr-key…
Browse files Browse the repository at this point in the history
…-not-found

feat: wallet: Print addr when key not found
  • Loading branch information
arajasek authored Dec 14, 2022
2 parents 1ddbb41 + 8c566c3 commit a264893
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions chain/wallet/multi.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,22 @@ func (m MultiWallet) WalletSign(ctx context.Context, signer address.Address, toS
return nil, err
}
if w == nil {
return nil, xerrors.Errorf("key not found")
return nil, xerrors.Errorf("key not found for %s", signer)
}

return w.WalletSign(ctx, signer, toSign, meta)
}

func (m MultiWallet) WalletExport(ctx context.Context, address address.Address) (*types.KeyInfo, error) {
w, err := m.find(ctx, address, m.Remote, m.Local)
func (m MultiWallet) WalletExport(ctx context.Context, addr address.Address) (*types.KeyInfo, error) {
w, err := m.find(ctx, addr, m.Remote, m.Local)
if err != nil {
return nil, err
}
if w == nil {
return nil, xerrors.Errorf("key not found")
return nil, xerrors.Errorf("key not found for %s", addr)
}

return w.WalletExport(ctx, address)
return w.WalletExport(ctx, addr)
}

func (m MultiWallet) WalletImport(ctx context.Context, info *types.KeyInfo) (address.Address, error) {
Expand Down
2 changes: 1 addition & 1 deletion chain/wallet/wallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (w *LocalWallet) WalletExport(ctx context.Context, addr address.Address) (*
return nil, xerrors.Errorf("failed to find key to export: %w", err)
}
if k == nil {
return nil, xerrors.Errorf("key not found")
return nil, xerrors.Errorf("key not found for %s", addr)
}

return &k.KeyInfo, nil
Expand Down

0 comments on commit a264893

Please sign in to comment.