Do not create CAR file when propsing a storage deal using Manual Tran…

…sfer (#183)

storagemarket/impl/clientutils/clientutils.go

@@ -24,6 +24,10 @@ func CommP(ctx context.Context, pieceIO pieceio.PieceIO, rt abi.RegisteredProof,
 	if data.PieceCid != nil {
 		return *data.PieceCid, data.PieceSize, nil
 	}
+
+	if data.TransferType == storagemarket.TTManual {
+		return cid.Undef, 0, xerrors.New("Piece CID and size must be set for manual transfer")
+	}
 	ssb := builder.NewSelectorSpecBuilder(ipldfree.NodeBuilder())
 
 	// entire DAG selector

storagemarket/integration_test.go

@@ -3,6 +3,7 @@ package storagemarket_test
 import (
 	"bytes"
 	"context"
+	"github.com/filecoin-project/go-fil-markets/pieceio"
 	"io/ioutil"
 	"reflect"
 	"testing"
@@ -201,6 +202,19 @@ func TestMakeDealOffline(t *testing.T) {
 		TransferType: storagemarket.TTManual,
 		Root:         payloadCid,
 	}
+
+	carBuf := new(bytes.Buffer)
+
+	err = cario.NewCarIO().WriteCar(ctx, td.Bs1, payloadCid, td.AllSelector, carBuf)
+	require.NoError(t, err)
+
+	commP, size, err := pieceio.GeneratePieceCommitment(abi.RegisteredProof_StackedDRG2KiBPoSt, carBuf, uint64(carBuf.Len()))
+
+	assert.NoError(t, err)
+
+	dataRef.PieceCid = &commP
+	dataRef.PieceSize = size
+
 	result, err := client.ProposeStorageDeal(ctx, providerAddr, &providerInfo, dataRef, abi.ChainEpoch(epoch+100), abi.ChainEpoch(epoch+20100), big.NewInt(1), big.NewInt(0), abi.RegisteredProof_StackedDRG2KiBPoSt)
 	assert.NoError(t, err)
 
@@ -219,8 +233,6 @@ func TestMakeDealOffline(t *testing.T) {
 	assert.True(t, pd.ProposalCid.Equals(proposalCid))
 	assert.Equal(t, pd.State, storagemarket.StorageDealWaitingForData)
 
-	carBuf := new(bytes.Buffer)
-
 	err = cario.NewCarIO().WriteCar(ctx, td.Bs1, payloadCid, td.AllSelector, carBuf)
 	require.NoError(t, err)
 	err = provider.ImportDataForDeal(ctx, pd.ProposalCid, carBuf)

storagemarket/types.go

@@ -395,8 +395,8 @@ type DataRef struct {
 	TransferType string
 	Root         cid.Cid
 
-	PieceCid  *cid.Cid // Optional, will be recomputed from the data if not given
-	PieceSize abi.UnpaddedPieceSize
+	PieceCid  *cid.Cid              // Optional for non-manual transfer, will be recomputed from the data if not given
+	PieceSize abi.UnpaddedPieceSize // Optional for non-manual transfer, will be recomputed from the data if not given
 }
 
 // The interface provided by the module to the outside world for storage clients.