BYOC: fix payment ticket count calc

server/job_rpc.go

@@ -808,7 +808,7 @@ func createPayment(ctx context.Context, jobReq *JobRequest, orchToken JobToken,
 
 		totalEV := big.NewRat(0, 1)
 		senderParams := make([]*net.TicketSenderParams, len(tickets.SenderParams))
-		for i := 0; i < len(senderParams); i++ {
+		for i := 0; i < len(tickets.SenderParams); i++ {
 			senderParams[i] = &net.TicketSenderParams{
 				SenderNonce: tickets.SenderParams[i].SenderNonce,
 				Sig:         tickets.SenderParams[i].Sig,
@@ -819,14 +819,20 @@ func createPayment(ctx context.Context, jobReq *JobRequest, orchToken JobToken,
 		payment.TicketSenderParams = senderParams
 
 		ratPrice, _ := common.RatPriceInfo(payment.ExpectedPrice)
+		balanceForOrch := node.Balances.Balance(orchAddr, core.ManifestID(jobReq.Capability))
+		balanceForOrchStr := ""
+		if balanceForOrch != nil {
+			balanceForOrchStr = balanceForOrch.FloatString(3)
+		}
+
 		clog.V(common.DEBUG).Infof(ctx, "Created new payment - capability=%v recipient=%v faceValue=%v winProb=%v price=%v numTickets=%v balance=%v",
 			jobReq.Capability,
 			tickets.Recipient.Hex(),
 			eth.FormatUnits(tickets.FaceValue, "ETH"),
 			tickets.WinProbRat().FloatString(10),
 			ratPrice.FloatString(3)+" wei/unit",
 			ticketCnt,
-			node.Balances.Balance(orchAddr, core.ManifestID(jobReq.Capability)).FloatString(3),
+			balanceForOrchStr,
 		)
 	}
 

server/job_rpc_test.go

@@ -20,14 +20,17 @@ import (
 	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	ethcrypto "github.com/ethereum/go-ethereum/crypto"
+	"github.com/golang/protobuf/proto"
 	"github.com/livepeer/go-livepeer/ai/worker"
 	"github.com/livepeer/go-livepeer/common"
 	"github.com/livepeer/go-livepeer/core"
 
 	"github.com/livepeer/go-livepeer/net"
+	"github.com/livepeer/go-livepeer/pm"
 	"github.com/livepeer/go-tools/drivers"
 	"github.com/livepeer/lpms/stream"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
 type mockJobOrchestrator struct {
@@ -902,6 +905,100 @@ func TestSubmitJob_MethodNotAllowed(t *testing.T) {
 	assert.Equal(t, http.StatusMethodNotAllowed, resp.StatusCode)
 }
 
+func TestCreatePayment(t *testing.T) {
+	ctx := context.TODO()
+	node, _ := core.NewLivepeerNode(nil, "/tmp/thisdirisnotactuallyusedinthistest", nil)
+	mockSender := pm.MockSender{}
+	mockSender.On("StartSession", mock.Anything).Return("foo").Times(4)
+	node.Sender = &mockSender
+
+	node.Balances = core.NewAddressBalances(10)
+	defer node.Balances.StopCleanup()
+
+	jobReq := JobRequest{
+		Capability: "test-payment-cap",
+	}
+	sender := JobSender{
+		Addr: "0x1111111111111111111111111111111111111111",
+		Sig:  "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+	}
+
+	orchTocken := JobToken{
+		TicketParams: &net.TicketParams{
+			Recipient:         ethcommon.HexToAddress("0x1111111111111111111111111111111111111111").Bytes(),
+			FaceValue:         big.NewInt(1000).Bytes(),
+			WinProb:           big.NewInt(1).Bytes(),
+			RecipientRandHash: []byte("hash"),
+			Seed:              big.NewInt(1234).Bytes(),
+			ExpirationBlock:   big.NewInt(100000).Bytes(),
+		},
+		SenderAddress: &sender,
+		Balance:       0,
+		Price: &net.PriceInfo{
+			PricePerUnit:  10,
+			PixelsPerUnit: 1,
+		},
+	}
+
+	var pmTickets net.Payment
+
+	//payment with one ticket
+	jobReq.Timeout = 1
+	mockSender.On("CreateTicketBatch", "foo", jobReq.Timeout).Return(mockTicketBatch(jobReq.Timeout), nil).Once()
+	payment, err := createPayment(ctx, &jobReq, orchTocken, node)
+	assert.Nil(t, err)
+	pmPayment, err := base64.StdEncoding.DecodeString(payment)
+	assert.Nil(t, err)
+	err = proto.Unmarshal(pmPayment, &pmTickets)
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(pmTickets.TicketSenderParams))
+
+	//test 2 tickets
+	jobReq.Timeout = 2
+	mockSender.On("CreateTicketBatch", "foo", jobReq.Timeout).Return(mockTicketBatch(jobReq.Timeout), nil).Once()
+	payment, err = createPayment(ctx, &jobReq, orchTocken, node)
+	assert.Nil(t, err)
+	pmPayment, err = base64.StdEncoding.DecodeString(payment)
+	assert.Nil(t, err)
+	err = proto.Unmarshal(pmPayment, &pmTickets)
+	assert.Nil(t, err)
+	assert.Equal(t, 2, len(pmTickets.TicketSenderParams))
+
+	//test 600 tickets
+	jobReq.Timeout = 600
+	mockSender.On("CreateTicketBatch", "foo", jobReq.Timeout).Return(mockTicketBatch(jobReq.Timeout), nil).Once()
+	payment, err = createPayment(ctx, &jobReq, orchTocken, node)
+	assert.Nil(t, err)
+	pmPayment, err = base64.StdEncoding.DecodeString(payment)
+	assert.Nil(t, err)
+	err = proto.Unmarshal(pmPayment, &pmTickets)
+	assert.Nil(t, err)
+	assert.Equal(t, 600, len(pmTickets.TicketSenderParams))
+}
+
+func mockTicketBatch(count int) *pm.TicketBatch {
+	senderParams := make([]*pm.TicketSenderParams, count)
+	for i := 0; i < count; i++ {
+		senderParams[i] = &pm.TicketSenderParams{
+			SenderNonce: uint32(i + 1),
+			Sig:         pm.RandBytes(42),
+		}
+	}
+
+	return &pm.TicketBatch{
+		TicketParams: &pm.TicketParams{
+			Recipient:       pm.RandAddress(),
+			FaceValue:       big.NewInt(1234),
+			WinProb:         big.NewInt(5678),
+			Seed:            big.NewInt(7777),
+			ExpirationBlock: big.NewInt(1000),
+		},
+		TicketExpirationParams: &pm.TicketExpirationParams{},
+		Sender:                 pm.RandAddress(),
+		SenderParams:           senderParams,
+	}
+}
+
 func TestSubmitJob_OrchestratorSelectionParams(t *testing.T) {
 	// Create mock HTTP servers for orchestrators
 	mockServers := make([]*httptest.Server, 5)