cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge branch 'rvagg-rvagg/list-asks-output' into next

Browse Source
This commit is contained in:
Łukasz Magiera 2021-03-02 13:59:18 +01:00
commit 61005e61e9
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cli/client.go
View File

@ -1195,6 +1195,11 @@ var clientListAsksCmd = &cli.Command{
&cli.BoolFlag{ &cli.BoolFlag{
Name: "by-ping", Name: "by-ping",
}, },
&cli.StringFlag{
Name: "output-format",
Value: "text",
Usage: "Either 'text' or 'csv'",
},
}, },
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
api, closer, err := GetFullNodeAPI(cctx) api, closer, err := GetFullNodeAPI(cctx)
@ -1214,11 +1219,16 @@ var clientListAsksCmd = &cli.Command{
return asks[i].Ping < asks[j].Ping return asks[i].Ping < asks[j].Ping
}) })
} }
pfmt := "%s: min:%s max:%s price:%s/GiB/Epoch verifiedPrice:%s/GiB/Epoch ping:%s\n"
if cctx.String("output-format") == "csv" {
fmt.Printf("Miner,Min,Max,Price,VerifiedPrice,Ping\n")
pfmt = "%s,%s,%s,%s,%s,%s\n"
}
for _, a := range asks { for _, a := range asks {
ask := a.Ask ask := a.Ask
fmt.Printf("%s: min:%s max:%s price:%s/GiB/Epoch verifiedPrice:%s/GiB/Epoch ping:%s\n", ask.Miner, fmt.Printf(pfmt, ask.Miner,
types.SizeStr(types.NewInt(uint64(ask.MinPieceSize))), types.SizeStr(types.NewInt(uint64(ask.MinPieceSize))),
types.SizeStr(types.NewInt(uint64(ask.MaxPieceSize))), types.SizeStr(types.NewInt(uint64(ask.MaxPieceSize))),
types.FIL(ask.Price), types.FIL(ask.Price),
@ -1237,7 +1247,13 @@ type QueriedAsk struct {
} }
func GetAsks(ctx context.Context, api lapi.FullNode) ([]QueriedAsk, error) { func GetAsks(ctx context.Context, api lapi.FullNode) ([]QueriedAsk, error) {
isTTY := true
if fileInfo, _ := os.Stdout.Stat(); (fileInfo.Mode() & os.ModeCharDevice) == 0 {
isTTY = false
}
if isTTY {
color.Blue(".. getting miner list") color.Blue(".. getting miner list")
}
miners, err := api.StateListMiners(ctx, types.EmptyTSK) miners, err := api.StateListMiners(ctx, types.EmptyTSK)
if err != nil { if err != nil {
return nil, xerrors.Errorf("getting miner list: %w", err) return nil, xerrors.Errorf("getting miner list: %w", err)
@ -1282,14 +1298,18 @@ loop:
for { for {
select { select {
case <-time.After(150 * time.Millisecond): case <-time.After(150 * time.Millisecond):
if isTTY {
fmt.Printf("\r* Found %d miners with power", atomic.LoadInt64(&found)) fmt.Printf("\r* Found %d miners with power", atomic.LoadInt64(&found))
}
case <-done: case <-done:
break loop break loop
} }
} }
if isTTY {
fmt.Printf("\r* Found %d miners with power\n", atomic.LoadInt64(&found)) fmt.Printf("\r* Found %d miners with power\n", atomic.LoadInt64(&found))
color.Blue(".. querying asks") color.Blue(".. querying asks")
}
var asks []QueriedAsk var asks []QueriedAsk
var queried, got int64 var queried, got int64
@ -1349,12 +1369,16 @@ loop2:
for { for {
select { select {
case <-time.After(150 * time.Millisecond): case <-time.After(150 * time.Millisecond):
if isTTY {
fmt.Printf("\r* Queried %d asks, got %d responses", atomic.LoadInt64(&queried), atomic.LoadInt64(&got)) fmt.Printf("\r* Queried %d asks, got %d responses", atomic.LoadInt64(&queried), atomic.LoadInt64(&got))
}
case <-done: case <-done:
break loop2 break loop2
} }
} }
if isTTY {
fmt.Printf("\r* Queried %d asks, got %d responses\n", atomic.LoadInt64(&queried), atomic.LoadInt64(&got)) fmt.Printf("\r* Queried %d asks, got %d responses\n", atomic.LoadInt64(&queried), atomic.LoadInt64(&got))
}
sort.Slice(asks, func(i, j int) bool { sort.Slice(asks, func(i, j int) bool {
return asks[i].Ask.Price.LessThan(asks[j].Ask.Price) return asks[i].Ask.Price.LessThan(asks[j].Ask.Price)