Merge branch 'master' into feat/remote-workers

2019-12-03 03:24:00 +01:00
parent 89556819ae a1f676bf30
commit 160e11ce8c
98 changed files with 1589 additions and 865 deletions
@@ -7,8 +7,8 @@ import (
 	"golang.org/x/xerrors"

 	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/chain"
 	"github.com/filecoin-project/lotus/chain/address"
+	"github.com/filecoin-project/lotus/chain/messagepool"
 	"github.com/filecoin-project/lotus/chain/types"
 )

@@ -17,7 +17,7 @@ type MpoolAPI struct {

 	WalletAPI

-	Mpool *chain.MessagePool
+	Mpool *messagepool.MessagePool
 }

 func (a *MpoolAPI) MpoolPending(ctx context.Context, ts *types.TipSet) ([]*types.SignedMessage, error) {