From f993ff1ab839d826a5bf7175fc0b11529774cfbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Fri, 31 Jul 2020 20:56:47 +0200 Subject: [PATCH] make lotus-miner storage-deals list less bad --- cmd/lotus-storage-miner/market.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/cmd/lotus-storage-miner/market.go b/cmd/lotus-storage-miner/market.go index 8bc00ae49..a7d01302b 100644 --- a/cmd/lotus-storage-miner/market.go +++ b/cmd/lotus-storage-miner/market.go @@ -2,7 +2,6 @@ package main import ( "bufio" - "encoding/json" "fmt" "os" "path/filepath" @@ -347,13 +346,24 @@ var dealsListCmd = &cli.Command{ return err } - data, err := json.MarshalIndent(deals, "", " ") - if err != nil { - return err + w := tabwriter.NewWriter(os.Stdout, 2, 4, 2, ' ', 0) + + _, _ = fmt.Fprintf(w, "ProposalCid\tDealId\tState\tClient\tSize\tPrice\tDuration\n") + + for _, deal := range deals { + pc, err := deal.Proposal.Cid() + if err != nil { + return err + } + propcid := pc.String() + propcid = "..." + propcid[len(propcid)-8:] + + fil := types.FIL(types.BigMul(deal.Proposal.StoragePricePerEpoch, types.NewInt(uint64(deal.Proposal.Duration())))) + + _, _ = fmt.Fprintf(w, "%s\t%d\t%s\t%s\t%s\t%s\t%s\n", propcid, deal.DealID, storagemarket.DealStates[deal.State], deal.Proposal.Client, units.BytesSize(float64(deal.Proposal.PieceSize)), fil, deal.Proposal.Duration()) } - fmt.Println(string(data)) - return nil + return w.Flush() }, }