supleed2/COMP70017-PoDL-CW
1
0
Fork 0
mirror of https://github.com/supleed2/COMP70017-PoDL-CW.git synced 2024-09-19 20:56:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Comments

Browse source
This commit is contained in:
Aadi Desai 2023-02-20 15:53:43 +00:00
parent 1abdf8893c
commit 94e9786b88
No known key found for this signature in database
GPG key ID: CFFFE425830EF4D9
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/contracts/TicketNFT.sol
View file

@ -165,7 +165,6 @@ contract TicketNFT is ITicketNFT, IPrimaryMarket, ISecondaryMarket {
require(price > 0, "listTicket: price cannot be 0"); require(price > 0, "listTicket: price cannot be 0");
_listers[ticketID] = msg.sender; _listers[ticketID] = msg.sender;
_prices[ticketID] = price; _prices[ticketID] = price;
// This uses a message call but is required as `transferFrom` is declared as `external`
this.transferFrom(msg.sender, address(this), ticketID); this.transferFrom(msg.sender, address(this), ticketID);
emit Listing(ticketID, msg.sender, price); emit Listing(ticketID, msg.sender, price);
} }
@ -193,13 +192,11 @@ contract TicketNFT is ITicketNFT, IPrimaryMarket, ISecondaryMarket {
ticketRevenue ticketRevenue
); );
_purchaseToken.transferFrom(msg.sender, _admin, ticketFee); _purchaseToken.transferFrom(msg.sender, _admin, ticketFee);
// This uses a message call but is required as `transferFrom` is declared as `external`
this.transferFrom(address(this), msg.sender, ticketID); this.transferFrom(address(this), msg.sender, ticketID);
_listers[ticketID] = address(0); _listers[ticketID] = address(0);
_prices[ticketID] = 0; _prices[ticketID] = 0;
_holderNames[ticketID] = name; _holderNames[ticketID] = name;
emit Purchase(msg.sender, ticketID, ticketPrice, name); emit Purchase(msg.sender, ticketID, ticketPrice, name);
// emit Delisting(ticketID); // TODO: Apparently not needed in this coursework?
} }
function delistTicket(uint256 ticketID) external { function delistTicket(uint256 ticketID) external {

1
test/TicketNFT.t.sol
View file

@ -2,7 +2,6 @@
pragma solidity ^0.8.10; pragma solidity ^0.8.10;
import "forge-std/Test.sol"; import "forge-std/Test.sol";
import "forge-std/console.sol";
import "../src/contracts/PurchaseToken.sol"; import "../src/contracts/PurchaseToken.sol";
import "../src/contracts/TicketNFT.sol"; import "../src/contracts/TicketNFT.sol";