Merge pull request #2838 from filecoin-project/feat/message-pool-selection

New message pool selection logic

cli/state.go

@@ -36,7 +36,6 @@ import (
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/miner"
 )
 
 var stateCmd = &cli.Command{
@@ -857,12 +856,7 @@ var stateComputeStateCmd = &cli.Command{
 
 		var msgs []*types.Message
 		if cctx.Bool("apply-mpool-messages") {
-			pmsgs, err := api.MpoolPending(ctx, ts.Key())
-			if err != nil {
-				return err
-			}
-
-			pmsgs, err = miner.SelectMessages(ctx, api.StateGetActor, ts, pmsgs)
+			pmsgs, err := api.MpoolSelect(ctx, ts.Key())
 			if err != nil {
 				return err
 			}
@@ -942,7 +936,7 @@ var compStateTemplate = `
     font-size: 12px;
     border-collapse: collapse;
    }
-   tr { 
+   tr {
    	border-top: 1px solid black;
    	border-bottom: 1px solid black;
    }
@@ -961,7 +955,7 @@ var compStateTemplate = `
    /**
    Checked State
    **/
-   
+
    .ellipsis-toggle input:checked + .ellipsis {
      display: none;
    }
@@ -1014,7 +1008,7 @@ var compStateMsg = `
   <div><pre class="params">{{JsonParams ($code) (.Msg.Method) (.Msg.Params) | html}}</pre></div>
  {{end}}
  <div><span class="slow-{{IsSlow .Duration}}-{{IsVerySlow .Duration}}">Took {{.Duration}}</span>, <span class="exit{{IntExit .MsgRct.ExitCode}}">Exit: <b>{{.MsgRct.ExitCode}}</b></span>{{if gt (len .MsgRct.Return) 0}}, Return{{end}}</div>
- 
+
  {{if gt (len .MsgRct.Return) 0}}
   <div><pre class="ret">{{JsonReturn ($code) (.Msg.Method) (.MsgRct.Return) | html}}</pre></div>
  {{end}}