feat: reverting not needed changes (#194)

Signed-off-by: Mariusz Jasuwienas <[email protected]>
hashgraph · Jan 23, 2025 · 666f83b · 666f83b
1 parent 7798a0a
commit 666f83b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/contracts/HtsSystemContract.sol b/contracts/HtsSystemContract.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.0;
 
 import {IERC20Events, IERC20} from "./IERC20.sol";
-import {IERC721Events, IERC721} from "./IERC721.sol";
+import {IERC721, IERC721Events} from "./IERC721.sol";
 import {IHRC719} from "./IHRC719.sol";
 import {IHederaTokenService} from "./IHederaTokenService.sol";
 import {HederaResponseCodes} from "./HederaResponseCodes.sol";

diff --git a/test/ERC721.t.sol b/test/ERC721.t.sol
@@ -3,8 +3,7 @@ pragma solidity ^0.8.0;
 
 import {HtsSystemContract} from "../contracts/HtsSystemContract.sol";
 import {Test, console} from "forge-std/Test.sol";
-import {IERC721} from "../contracts/IERC721.sol";
-import {IERC721Events} from "../contracts/IERC721.sol";
+import {IERC721, IERC721Events} from "../contracts/IERC721.sol";
 import {TestSetup} from "./lib/TestSetup.sol";
 
 contract ERC721TokenTest is Test, TestSetup {

diff --git a/test/HTS.t.sol b/test/HTS.t.sol
@@ -674,6 +674,8 @@ contract HTSTest is Test, TestSetup {
         address to = makeAddr("recipient");
         uint256 serialId = 1;
         vm.startPrank(CFNFTFF_TREASURY);
+        vm.expectEmit(CFNFTFF);
+        emit IERC20Events.Transfer(CFNFTFF_TREASURY, to, serialId);
         IHederaTokenService(HTS_ADDRESS).transferNFT(CFNFTFF, CFNFTFF_TREASURY, to, int64(int256(serialId)));
         vm.stopPrank();
         assertEq(IERC721(CFNFTFF).ownerOf(serialId), to);
@@ -683,6 +685,8 @@ contract HTSTest is Test, TestSetup {
         address to = makeAddr("recipient");
         uint256 serialId = 1;
         vm.startPrank(CFNFTFF_TREASURY);
+        vm.expectEmit(CFNFTFF);
+        emit IERC20Events.Transfer(CFNFTFF_TREASURY, to, serialId);
         IHederaTokenService(HTS_ADDRESS).transferFromNFT(CFNFTFF, CFNFTFF_TREASURY, to, serialId);
         vm.stopPrank();
         assertEq(IERC721(CFNFTFF).ownerOf(serialId), to);
@@ -754,6 +758,8 @@ contract HTSTest is Test, TestSetup {
         address[] memory to = new address[](1);
         to[0] = makeAddr("recipient");
         vm.startPrank(CFNFTFF_TREASURY);
+        vm.expectEmit(CFNFTFF);
+        emit IERC20Events.Transfer(CFNFTFF_TREASURY, to[0], serialId[0]);
         IHederaTokenService(HTS_ADDRESS).transferNFT(CFNFTFF, from[0], to[0], int64(int256(serialId[0])));
         vm.stopPrank();
         assertEq(IERC721(CFNFTFF).ownerOf(serialId[0]), to[0]);
@@ -793,6 +799,8 @@ contract HTSTest is Test, TestSetup {
         address newSpender = makeAddr("NEW_SPENDER");
         assertNotEq(IERC721(token).getApproved(1), newSpender);
         vm.prank(CFNFTFF_TREASURY);
+        vm.expectEmit(token);
+        emit IERC20Events.Approval(CFNFTFF_TREASURY, newSpender, 1);
         int64 responseCodeApprove = HtsSystemContract(HTS_ADDRESS).approveNFT(token, newSpender, 1);
         assertEq(responseCodeApprove, HederaResponseCodes.SUCCESS);
         assertEq(IERC721(token).getApproved(1), newSpender);
@@ -815,6 +823,8 @@ contract HTSTest is Test, TestSetup {
         address operator = makeAddr("operator");
         assertFalse(IERC721(CFNFTFF).isApprovedForAll(CFNFTFF_TREASURY, operator));
         vm.prank(CFNFTFF_TREASURY);
+        vm.expectEmit(CFNFTFF);
+        emit IERC721Events.ApprovalForAll(CFNFTFF_TREASURY, operator, true);
         int64 setApprovalForAllResponseCode = HtsSystemContract(HTS_ADDRESS)
             .setApprovalForAll(CFNFTFF, operator, true);
         assertEq(setApprovalForAllResponseCode, HederaResponseCodes.SUCCESS);