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

add color for token amount #5352

Merged
merged 2 commits into from
Jan 19, 2021
Merged

add color for token amount #5352

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3224c84
add color for token amount
deaswang Jan 14, 2021
7747bcd
remove some colorTokenAmount
deaswang Jan 15, 2021
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
32 changes: 21 additions & 11 deletions cmd/lotus-storage-miner/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,28 +218,28 @@ func infoCmdAct(cctx *cli.Context) error {
}
spendable = big.Add(spendable, availBalance)

fmt.Printf("Miner Balance: %s\n", color.YellowString("%s", types.FIL(mact.Balance).Short()))
fmt.Printf(" PreCommit: %s\n", types.FIL(lockedFunds.PreCommitDeposits).Short())
fmt.Printf(" Pledge: %s\n", types.FIL(lockedFunds.InitialPledgeRequirement).Short())
fmt.Printf(" Vesting: %s\n", types.FIL(lockedFunds.VestingFunds).Short())
color.Green(" Available: %s", types.FIL(availBalance).Short())
colorTokenAmount("Miner Balance: %s\n", mact.Balance)
colorTokenAmount(" PreCommit: %s\n", lockedFunds.PreCommitDeposits)
colorTokenAmount(" Pledge: %s\n", lockedFunds.InitialPledgeRequirement)
colorTokenAmount(" Vesting: %s\n", lockedFunds.VestingFunds)
deaswang marked this conversation as resolved.
Show resolved Hide resolved
colorTokenAmount(" Available: %s\n", availBalance)

mb, err := api.StateMarketBalance(ctx, maddr, types.EmptyTSK)
if err != nil {
return xerrors.Errorf("getting market balance: %w", err)
}
spendable = big.Add(spendable, big.Sub(mb.Escrow, mb.Locked))

fmt.Printf("Market Balance: %s\n", types.FIL(mb.Escrow).Short())
fmt.Printf(" Locked: %s\n", types.FIL(mb.Locked).Short())
color.Green(" Available: %s\n", types.FIL(big.Sub(mb.Escrow, mb.Locked)).Short())
colorTokenAmount("Market Balance: %s\n", mb.Escrow)
colorTokenAmount(" Locked: %s\n", mb.Locked)
colorTokenAmount(" Available: %s\n", big.Sub(mb.Escrow, mb.Locked))

wb, err := api.WalletBalance(ctx, mi.Worker)
if err != nil {
return xerrors.Errorf("getting worker balance: %w", err)
}
spendable = big.Add(spendable, wb)
color.Cyan("Worker Balance: %s", types.FIL(wb).Short())
colorTokenAmount("Worker Balance: %s\n", wb)
if len(mi.ControlAddresses) > 0 {
cbsum := big.Zero()
for _, ca := range mi.ControlAddresses {
Expand All @@ -251,9 +251,9 @@ func infoCmdAct(cctx *cli.Context) error {
}
spendable = big.Add(spendable, cbsum)

fmt.Printf(" Control: %s\n", types.FIL(cbsum).Short())
colorTokenAmount(" Control: %s\n", cbsum)
}
fmt.Printf("Total Spendable: %s\n", color.YellowString(types.FIL(spendable).Short()))
colorTokenAmount("Total Spendable: %s\n", spendable)

fmt.Println()

Expand Down Expand Up @@ -355,3 +355,13 @@ func sectorsInfo(ctx context.Context, napi api.StorageMiner) error {

return nil
}

func colorTokenAmount(format string, amount abi.TokenAmount) {
if amount.GreaterThan(big.Zero()) {
fmt.Printf(format, color.GreenString("%s", types.FIL(amount).Short()))
} else if amount.Equals(big.Zero()) {
fmt.Printf(format, color.YellowString("%s", types.FIL(amount).Short()))
} else {
fmt.Printf(format, color.RedString("%s", types.FIL(amount).Short()))
}
}