storageadapter: Fix tests, more testable diff api

markets/storageadapter/client.go

@@ -9,6 +9,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	cborutil "github.com/filecoin-project/go-cbor-util"
 	"github.com/ipfs/go-cid"
+	cbor "github.com/ipfs/go-ipld-cbor"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-fil-markets/shared"
@@ -22,8 +23,11 @@ import (
 	market2 "github.com/filecoin-project/specs-actors/v2/actors/builtin/market"
 
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/api/apibstore"
 	"github.com/filecoin-project/lotus/build"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
 	marketactor "github.com/filecoin-project/lotus/chain/actors/builtin/market"
+	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/events"
 	"github.com/filecoin-project/lotus/chain/events/state"
 	"github.com/filecoin-project/lotus/chain/market"
@@ -34,9 +38,7 @@ import (
 )
 
 type ClientNodeAdapter struct {
-	full.StateAPI
+	*clientApi
-	full.ChainAPI
-	full.MpoolAPI
 
 	fundmgr   *market.FundManager
 	ev        *events.Events
@@ -46,14 +48,42 @@ type ClientNodeAdapter struct {
 type clientApi struct {
 	full.ChainAPI
 	full.StateAPI
+	full.MpoolAPI
+}
+
+func (ca *clientApi) diffPreCommits(ctx context.Context, actor address.Address, pre, cur types.TipSetKey) (*miner.PreCommitChanges, error) {
+	store := adt.WrapStore(ctx, cbor.NewCborStore(apibstore.NewAPIBlockstore(ca)))
+
+	preAct, err := ca.StateGetActor(ctx, actor, pre)
+	if err != nil {
+		return nil, xerrors.Errorf("getting pre actor: %w", err)
+	}
+	curAct, err := ca.StateGetActor(ctx, actor, cur)
+	if err != nil {
+		return nil, xerrors.Errorf("getting cur actor: %w", err)
+	}
+
+	preSt, err := miner.Load(store, preAct)
+	if err != nil {
+		return nil, xerrors.Errorf("loading miner actor: %w", err)
+	}
+	curSt, err := miner.Load(store, curAct)
+	if err != nil {
+		return nil, xerrors.Errorf("loading miner actor: %w", err)
+	}
+
+	diff, err := miner.DiffPreCommits(preSt, curSt)
+	if err != nil {
+		return nil, xerrors.Errorf("diff precommits: %w", err)
+	}
+
+	return diff, err
 }
 
 func NewClientNodeAdapter(stateapi full.StateAPI, chain full.ChainAPI, mpool full.MpoolAPI, fundmgr *market.FundManager) storagemarket.StorageClientNode {
-	capi := &clientApi{chain, stateapi}
+	capi := &clientApi{chain, stateapi, mpool}
 	return &ClientNodeAdapter{
-		StateAPI: stateapi,
+		clientApi: capi,
-		ChainAPI: chain,
-		MpoolAPI: mpool,
 
 		fundmgr:   fundmgr,
 		ev:        events.NewEvents(context.TODO(), capi),

markets/storageadapter/getcurrentdealinfo.go

@@ -9,6 +9,7 @@ import (
 	"github.com/filecoin-project/go-state-types/exitcode"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"
+	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/ipfs/go-cid"
 	"golang.org/x/xerrors"
@@ -19,9 +20,7 @@ type getCurrentDealInfoAPI interface {
 	StateMarketStorageDeal(context.Context, abi.DealID, types.TipSetKey) (*api.MarketDeal, error)
 	StateSearchMsg(context.Context, cid.Cid) (*api.MsgLookup, error)
 
-	StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error)
+	diffPreCommits(ctx context.Context, actor address.Address, pre, cur types.TipSetKey) (*miner.PreCommitChanges, error)
-	ChainReadObj(context.Context, cid.Cid) ([]byte, error)
-	ChainHasObj(context.Context, cid.Cid) (bool, error)
 }
 
 // GetCurrentDealInfo gets current information on a deal, and corrects the deal ID as needed

markets/storageadapter/getcurrentdealinfo_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/filecoin-project/go-state-types/exitcode"
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"
+	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	test "github.com/filecoin-project/lotus/chain/events/state/mock"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/ipfs/go-cid"
@@ -236,16 +237,8 @@ type mockGetCurrentDealInfoAPI struct {
 	MarketDeals map[marketDealKey]*api.MarketDeal
 }
 
-func (mapi *mockGetCurrentDealInfoAPI) StateGetActor(ctx context.Context, actor address.Address, tsk types.TipSetKey) (*types.Actor, error) {
+func (mapi *mockGetCurrentDealInfoAPI) diffPreCommits(ctx context.Context, actor address.Address, pre, cur types.TipSetKey) (*miner.PreCommitChanges, error) {
-	panic("implement me")
+	return &miner.PreCommitChanges{}, nil
-}
-
-func (mapi *mockGetCurrentDealInfoAPI) ChainReadObj(ctx context.Context, c cid.Cid) ([]byte, error) {
-	panic("implement me")
-}
-
-func (mapi *mockGetCurrentDealInfoAPI) ChainHasObj(ctx context.Context, c cid.Cid) (bool, error) {
-	panic("implement me")
 }
 
 func (mapi *mockGetCurrentDealInfoAPI) StateMarketStorageDeal(ctx context.Context, dealID abi.DealID, ts types.TipSetKey) (*api.MarketDeal, error) {

markets/storageadapter/ondealsectorcommitted.go

@@ -6,16 +6,13 @@ import (
 	"sync"
 
 	"github.com/ipfs/go-cid"
-	cbor "github.com/ipfs/go-ipld-cbor"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-fil-markets/storagemarket"
 	"github.com/filecoin-project/go-state-types/abi"
 
-	"github.com/filecoin-project/lotus/api/apibstore"
 	"github.com/filecoin-project/lotus/build"
-	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/events"
@@ -61,31 +58,9 @@ func OnDealSectorPreCommitted(ctx context.Context, api getCurrentDealInfoAPI, ev
 			}
 		}
 
-		store := adt.WrapStore(ctx, cbor.NewCborStore(apibstore.NewAPIBlockstore(api)))
+		diff, err := api.diffPreCommits(ctx, provider, publishTs, ts.Key())
-
-		publishAct, err := api.StateGetActor(ctx, provider, publishTs)
 		if err != nil {
-			return false, false, xerrors.Errorf("getting provider actor: %w", err)
+			return false, false, err
-		}
-
-		curAct, err := api.StateGetActor(ctx, provider, ts.Key())
-		if err != nil {
-			return false, false, xerrors.Errorf("getting provider actor: %w", err)
-		}
-
-		curSt, err := miner.Load(store, curAct)
-		if err != nil {
-			return false, false, xerrors.Errorf("leading miner actor: %w", err)
-		}
-
-		pubSt, err := miner.Load(store, publishAct)
-		if err != nil {
-			return false, false, xerrors.Errorf("leading miner actor: %w", err)
-		}
-
-		diff, err := miner.DiffPreCommits(pubSt, curSt)
-		if err != nil {
-			return false, false, xerrors.Errorf("diff precommits: %w", err)
 		}
 
 		for _, info := range diff.Added {

markets/storageadapter/ondealsectorcommitted_test.go

@@ -161,8 +161,7 @@ func TestOnDealSectorPreCommitted(t *testing.T) {
 					deals: map[abi.DealID]*api.MarketDeal{},
 				},
 			},
-			expectedCBCallCount: 1,
+			expectedCBCallCount: 0,
-			expectedCBError:     errors.New("handling applied event: something went wrong"),
 			expectedError:       errors.New("failed to set up called handler: something went wrong"),
 		},
 		"proposed deal epoch timeout": {

markets/storageadapter/provider.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/ipfs/go-cid"
+	cbor "github.com/ipfs/go-ipld-cbor"
 	logging "github.com/ipfs/go-log/v2"
 	"golang.org/x/xerrors"
 
@@ -21,9 +22,12 @@ import (
 	"github.com/filecoin-project/go-state-types/exitcode"
 
 	"github.com/filecoin-project/lotus/api"
+	"github.com/filecoin-project/lotus/api/apibstore"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors"
+	"github.com/filecoin-project/lotus/chain/actors/adt"
 	"github.com/filecoin-project/lotus/chain/actors/builtin/market"
+	"github.com/filecoin-project/lotus/chain/actors/builtin/miner"
 	"github.com/filecoin-project/lotus/chain/events"
 	"github.com/filecoin-project/lotus/chain/events/state"
 	"github.com/filecoin-project/lotus/chain/types"
@@ -70,6 +74,35 @@ func NewProviderNodeAdapter(fc *config.MinerFeeConfig) func(dag dtypes.StagingDA
 	}
 }
 
+func (n *ProviderNodeAdapter) diffPreCommits(ctx context.Context, actor address.Address, pre, cur types.TipSetKey) (*miner.PreCommitChanges, error) {
+	store := adt.WrapStore(ctx, cbor.NewCborStore(apibstore.NewAPIBlockstore(n)))
+
+	preAct, err := n.StateGetActor(ctx, actor, pre)
+	if err != nil {
+		return nil, xerrors.Errorf("getting pre actor: %w", err)
+	}
+	curAct, err := n.StateGetActor(ctx, actor, cur)
+	if err != nil {
+		return nil, xerrors.Errorf("getting cur actor: %w", err)
+	}
+
+	preSt, err := miner.Load(store, preAct)
+	if err != nil {
+		return nil, xerrors.Errorf("loading miner actor: %w", err)
+	}
+	curSt, err := miner.Load(store, curAct)
+	if err != nil {
+		return nil, xerrors.Errorf("loading miner actor: %w", err)
+	}
+
+	diff, err := miner.DiffPreCommits(preSt, curSt)
+	if err != nil {
+		return nil, xerrors.Errorf("diff precommits: %w", err)
+	}
+
+	return diff, err
+}
+
 func (n *ProviderNodeAdapter) PublishDeals(ctx context.Context, deal storagemarket.MinerDeal) (cid.Cid, error) {
 	log.Info("publishing deal")