fixup! pm: refresh ticket params before expiry from sender side

livepeer · May 18, 2021 · 42ffe1d · 42ffe1d
1 parent 52229de
commit 42ffe1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pm/sender.go b/pm/sender.go
@@ -156,8 +156,8 @@ func (s *sender) validateTicketParams(ticketParams *TicketParams, numTickets int
 
 	latestBlock := s.timeManager.LastSeenBlock()
 
-	currentBuffer := new(big.Int).Sub(latestBlock, ticketParams.ExpirationBlock).Int64()
-	if currentBuffer > paramsExpiryBuffer {
+	currentBuffer := new(big.Int).Sub(ticketParams.ExpirationBlock, latestBlock).Int64()
+	if currentBuffer <= paramsExpiryBuffer {
 		return ErrTicketParamsExpired
 	}
 

diff --git a/pm/sender_test.go b/pm/sender_test.go
@@ -266,7 +266,7 @@ func TestCreateTicketBatch_UsesSessionParamsInBatch(t *testing.T) {
 		WinProb:           big.NewInt(2222),
 		Seed:              big.NewInt(3333),
 		RecipientRandHash: recipientRandHash,
-		ExpirationBlock:   big.NewInt(1),
+		ExpirationBlock:   big.NewInt(2),
 		PricePerPixel:     big.NewRat(1, 1),
 		ExpirationParams:  expectedExpParams,
 	}
@@ -295,7 +295,7 @@ func TestCreateTicketBatch_UsesSessionParamsInBatch(t *testing.T) {
 		WinProb:           big.NewInt(2222),
 		Seed:              big.NewInt(3333),
 		RecipientRandHash: recipientRandHash,
-		ExpirationBlock:   big.NewInt(1),
+		ExpirationBlock:   big.NewInt(2),
 		PricePerPixel:     big.NewRat(1, 1),
 		ExpirationParams:  &TicketExpirationParams{},
 	}
@@ -316,7 +316,7 @@ func TestCreateTicketBatch_UsesSessionParamsInBatch(t *testing.T) {
 		WinProb:           big.NewInt(2222),
 		Seed:              big.NewInt(3333),
 		RecipientRandHash: recipientRandHash,
-		ExpirationBlock:   big.NewInt(1),
+		ExpirationBlock:   big.NewInt(2),
 		PricePerPixel:     big.NewRat(1, 1),
 		ExpirationParams:  nil,
 	}
@@ -506,10 +506,10 @@ func TestValidateTicketParams_ExpiredParams_ReturnsError(t *testing.T) {
 	err := sender.ValidateTicketParams(&ticketParams)
 	assert.EqualError(t, err, ErrTicketParamsExpired.Error())
 
-	// test within 10% of expiry
+	// test within expiry buffer
 	ticketParams.ExpirationBlock = big.NewInt(99)
 	err = sender.ValidateTicketParams(&ticketParams)
-	assert.Nil(t, err)
+	assert.EqualError(t, err, ErrTicketParamsExpired.Error())
 
 	// test nil
 	ticketParams.ExpirationBlock = big.NewInt(105)