cmd/lotus-shed/msg.go

@@ -96,28 +96,39 @@ var msgCmd = &cli.Command{
 			}
 
 			if cctx.Bool("gas-stats") {
-				var printTrace func(descPfx string, trace types.ExecutionTrace)
-				printTrace = func(descPfx string, trace types.ExecutionTrace) {
+				var printTrace func(descPfx string, trace types.ExecutionTrace) error
+				printTrace = func(descPfx string, trace types.ExecutionTrace) error {
 					typ := "Message"
 					if descPfx != "" {
 						typ = "Subcall"
 					}
 					_, _ = fmt.Fprintln(cctx.App.Writer, color.New(color.Bold).Sprint(fmt.Sprintf("%s (%s%s) gas charges:", typ, descPfx, trace.Msg.To)))
-					statsTable(cctx.App.Writer, trace, false)
+					if err := statsTable(cctx.App.Writer, trace, false); err != nil {
+						return err
+					}
 					for _, subtrace := range trace.Subcalls {
 						_, _ = fmt.Fprintln(cctx.App.Writer)
-						printTrace(descPfx+trace.Msg.To.String()+"➜", subtrace)
+						if err := printTrace(descPfx+trace.Msg.To.String()+"➜", subtrace); err != nil {
+							return err
+						}
 					}
+					return nil
+				}
+				if err := printTrace("", res.ExecutionTrace); err != nil {
+					return err
 				}
-				printTrace("", res.ExecutionTrace)
 				if len(res.ExecutionTrace.Subcalls) > 0 {
 					_, _ = fmt.Fprintln(cctx.App.Writer)
 					_, _ = fmt.Fprintln(cctx.App.Writer, color.New(color.Bold).Sprint("Total gas charges:"))
-					statsTable(cctx.App.Writer, res.ExecutionTrace, true)
+					if err := statsTable(cctx.App.Writer, res.ExecutionTrace, true); err != nil {
+						return err
+					}
 					perCallTrace := gasTracesPerCall(res.ExecutionTrace)
 					_, _ = fmt.Fprintln(cctx.App.Writer)
 					_, _ = fmt.Fprintln(cctx.App.Writer, color.New(color.Bold).Sprint("Gas charges per call:"))
-					statsTable(cctx.App.Writer, perCallTrace, false)
+					if err := statsTable(cctx.App.Writer, perCallTrace, false); err != nil {
+						return err
+					}
 				}
 			}
 		}
@@ -408,7 +419,7 @@ func accumGasTallies(charges map[string]*gasTally, totals *gasTally, trace types
 	}
 }
 
-func statsTable(out io.Writer, trace types.ExecutionTrace, recurse bool) {
+func statsTable(out io.Writer, trace types.ExecutionTrace, recurse bool) error {
 	tw := tablewriter.New(
 		tablewriter.Col("Type"),
 		tablewriter.Col("Count", tablewriter.RightAlign()),
@@ -454,7 +465,7 @@ func statsTable(out io.Writer, trace types.ExecutionTrace, recurse bool) {
 		"Total Gas":   totals.storageGas + totals.computeGas,
 		"T%":          "100.00",
 	})
-	tw.Flush(out, tablewriter.WithBorders())
+	return tw.Flush(out, tablewriter.WithBorders())
 }
 
 // Takes an execution trace and returns a new trace that groups all the gas charges by the message