Merge remote-tracking branch 'origin/master' into testnet/3

2020-02-06 20:32:25 +01:00
parent 72c89ab89b 44c1e3a347
commit 604c234484
3 changed files with 11 additions and 4 deletions
@@ -120,12 +120,15 @@ var statePowerCmd = &cli.Command{
 			return err
 		}

-		res := power.TotalPower
+		tp := power.TotalPower
 		if cctx.Args().Present() {
-			res = power.MinerPower
+			mp := power.MinerPower
+			percI := types.BigDiv(types.BigMul(mp, types.NewInt(1000000)), tp)
+			fmt.Printf("%s(%s) / %s(%s) ~= %0.4f%%\n", mp.String(), mp.SizeStr(), tp.String(), tp.SizeStr(), float64(percI.Int64())/10000)
+		} else {
+			fmt.Printf("%s(%s)\n", tp.String(), tp.SizeStr())
 		}

-		fmt.Println(res.String())
 		return nil
 	},
 }