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

Jump to bottom

fix:cli:Continue instead of return error if no valid value is filled #8131

Merged
merged 6 commits into from
Feb 20, 2022
Merged

fix:cli:Continue instead of return error if no valid value is filled #8131

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d32a2f
Update client.go
FlorianRuen Feb 17, 2022
78817bd
Fix #8100
FlorianRuen Feb 17, 2022
ddd369e
lint reported errors on CircleCI
FlorianRuen Feb 17, 2022
6ce9321
lint reported errors on CircleCI
FlorianRuen Feb 17, 2022
1c39730
Fix #8095
FlorianRuen Feb 18, 2022
623272a
Merge branch 'master' of https://github.com/FlorianRuen/lotus
FlorianRuen Feb 18, 2022
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
8 changes: 6 additions & 2 deletions cli/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,8 @@ uiLoop:

state = "miner"
case "miner":
maddrs = maddrs[:0]
ask = ask[:0]
afmt.Print("Miner Addresses (f0.. f0..), none to find: ")

_maddrsStr, _, err := rl.ReadLine()
Expand Down Expand Up @@ -802,7 +804,8 @@ uiLoop:

dealCount, err = strconv.ParseInt(string(dealcStr), 10, 64)
if err != nil {
return err
printErr(xerrors.Errorf("reading deal count: invalid number"))
continue
}

color.Blue(".. Picking miners")
Expand Down Expand Up @@ -859,12 +862,13 @@ uiLoop:

a, err := api.ClientQueryAsk(ctx, *mi.PeerId, maddr)
if err != nil {
printErr(xerrors.Errorf("failed to query ask: %w", err))
printErr(xerrors.Errorf("failed to query ask for miner %s: %w", maddr.String(), err))
state = "miner"
continue uiLoop
}

ask = append(ask, *a)

}

// TODO: run more validation
Expand Down