supleed2/COMP70017-PoDL-CW
1
0
Fork 0
mirror of https://github.com/supleed2/COMP70017-PoDL-CW.git synced 2024-12-22 13:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix expiry boundry condition

Browse source
This commit is contained in:
Aadi Desai 2023-02-21 12:40:18 +00:00
parent 3afe735333
commit dfde0b0320
No known key found for this signature in database
GPG key ID: CFFFE425830EF4D9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/contracts/TicketNFT.sol
View file

@ -121,7 +121,7 @@ contract TicketNFT is ITicketNFT, IPrimaryMarket, ISecondaryMarket {
require(ticketID <= _totalSupply, "setUsed: ticket doesn't exist"); require(ticketID <= _totalSupply, "setUsed: ticket doesn't exist");
require(_ticketUsed[ticketID] == false, "setUsed: ticket already used"); require(_ticketUsed[ticketID] == false, "setUsed: ticket already used");
require( require(
_expiryTimes[ticketID] > block.timestamp, _expiryTimes[ticketID] >= block.timestamp,
"setUsed: ticket expired" "setUsed: ticket expired"
); );
_ticketUsed[ticketID] = true; _ticketUsed[ticketID] = true;
@ -133,7 +133,7 @@ contract TicketNFT is ITicketNFT, IPrimaryMarket, ISecondaryMarket {
"isExpiredOrUsed: ticket doesn't exist" "isExpiredOrUsed: ticket doesn't exist"
); );
return (_ticketUsed[ticketID] || return (_ticketUsed[ticketID] ||
_expiryTimes[ticketID] <= block.timestamp); _expiryTimes[ticketID] < block.timestamp);
} }
function admin() external view returns (address) { function admin() external view returns (address) {
@ -159,7 +159,7 @@ contract TicketNFT is ITicketNFT, IPrimaryMarket, ISecondaryMarket {
); );
require( require(
_ticketUsed[ticketID] == false && _ticketUsed[ticketID] == false &&
_expiryTimes[ticketID] > block.timestamp, _expiryTimes[ticketID] >= block.timestamp,
"listTicket: ticket is expired/used" "listTicket: ticket is expired/used"
); );
require(price > 0, "listTicket: price cannot be 0"); require(price > 0, "listTicket: price cannot be 0");
@ -179,7 +179,7 @@ contract TicketNFT is ITicketNFT, IPrimaryMarket, ISecondaryMarket {
uint256 ticketRevenue = ticketPrice - ticketFee; uint256 ticketRevenue = ticketPrice - ticketFee;
require( require(
_ticketUsed[ticketID] == false && _ticketUsed[ticketID] == false &&
_expiryTimes[ticketID] > block.timestamp, _expiryTimes[ticketID] >= block.timestamp,
"purchase: ticket is expired/used" "purchase: ticket is expired/used"
); );
require( require(

8
test/TicketNFT.t.sol
View file

@ -220,7 +220,7 @@ contract TicketNFTTest is BaseTicketNFTTest {
function testExpiry() public { function testExpiry() public {
_buyTicket(alice, "alice"); _buyTicket(alice, "alice");
assertEq(nft.isExpiredOrUsed(1), false); assertEq(nft.isExpiredOrUsed(1), false);
vm.warp(block.timestamp + 10 days - 1); vm.warp(block.timestamp + 10 days);
assertEq(nft.isExpiredOrUsed(1), false); assertEq(nft.isExpiredOrUsed(1), false);
vm.warp(block.timestamp + 1); vm.warp(block.timestamp + 1);
assertEq(nft.isExpiredOrUsed(1), true); assertEq(nft.isExpiredOrUsed(1), true);
@ -253,7 +253,7 @@ contract TicketNFTTest is BaseTicketNFTTest {
function testSetUsedExpired() public { function testSetUsedExpired() public {
_buyTicket(alice, "alice"); _buyTicket(alice, "alice");
assertEq(nft.isExpiredOrUsed(1), false); assertEq(nft.isExpiredOrUsed(1), false);
vm.warp(block.timestamp + 10 days); vm.warp(block.timestamp + 10 days + 1);
vm.prank(address(this)); vm.prank(address(this));
vm.expectRevert("setUsed: ticket expired"); vm.expectRevert("setUsed: ticket expired");
nft.setUsed(1); nft.setUsed(1);
@ -377,7 +377,7 @@ contract SecondaryMarketTest is BaseTicketNFTTest {
function testListExpired() public { function testListExpired() public {
_buyTicket(alice, "alice"); _buyTicket(alice, "alice");
vm.warp(block.timestamp + 10 days); vm.warp(block.timestamp + 10 days + 1);
vm.prank(alice); vm.prank(alice);
vm.expectRevert("listTicket: ticket is expired/used"); vm.expectRevert("listTicket: ticket is expired/used");
nft.listTicket(1, 200e19); nft.listTicket(1, 200e19);
@ -473,7 +473,7 @@ contract SecondaryMarketTest is BaseTicketNFTTest {
vm.prank(alice); vm.prank(alice);
nft.listTicket(1, 200e18); nft.listTicket(1, 200e18);
_topUpTokens(bob, 2); _topUpTokens(bob, 2);
vm.warp(block.timestamp + 10 days); vm.warp(block.timestamp + 10 days + 1);
vm.prank(bob); vm.prank(bob);
token.approve(address(nft), 200e18); token.approve(address(nft), 200e18);
vm.prank(bob); vm.prank(bob);