paych: Api to reuse open channels for new payments

node/impl/full/client.go

@@ -86,26 +86,14 @@ func (a *ClientAPI) ClientStartDeal(ctx context.Context, data cid.Cid, miner add
 	total := types.BigMul(price, types.NewInt(blocksDuration))
 
 	// TODO: at least ping the miner before creating paych / locking the money
-	paych, paychMsg, err := a.paychCreate(ctx, self, miner, total)
-	if err != nil {
-		return nil, err
+	extra := &types.ModVerifyParams{
+		Actor:  miner,
+		Method: actors.MAMethods.PaymentVerifyInclusion,
+		Data:   voucherData,
 	}
 
 	head := a.Chain.GetHeaviestTipSet()
-
-	voucher := types.SignedVoucher{ // TODO: split into smaller payments
-		TimeLock: head.Height() + blocksDuration,
-		Extra: &types.ModVerifyParams{
-			Actor:  miner,
-			Method: actors.MAMethods.PaymentVerifyInclusion,
-			Data:   voucherData,
-		},
-		Lane:           0, // TODO: some api to make this easy
-		Amount:         total,
-		MinCloseHeight: head.Height() + blocksDuration, // TODO: some way to start this after initial piece inclusion by actor? Using actors.PieceInclVoucherData?
-	}
-
-	sv, err := a.paychVoucherCreate(ctx, paych, voucher)
+	payment, err := a.PaychNewPayment(ctx, self, miner, total, extra, head.Height()+blocksDuration, head.Height()+blocksDuration)
 	if err != nil {
 		return nil, err
 	}
@@ -115,10 +103,9 @@ func (a *ClientAPI) ClientStartDeal(ctx context.Context, data cid.Cid, miner add
 		TotalPrice: total,
 		Duration:   blocksDuration,
 		Payment: actors.PaymentInfo{
-			PayChActor:     paych,
-			Payer:          self,
-			ChannelMessage: paychMsg,
-			Vouchers:       []*types.SignedVoucher{sv},
+			PayChActor: payment.Channel,
+			Payer:      self,
+			Vouchers:   []*types.SignedVoucher{payment.Voucher},
 		},
 		MinerAddress:  miner,
 		ClientAddress: self,