From fd45a43677e5fc24643d644706cbc0da625766aa Mon Sep 17 00:00:00 2001 From: donosonaumczuk Date: Tue, 31 Jan 2023 14:04:34 -0300 Subject: [PATCH] misc: untieAndWrap/unwrapAndTie renamed to simply wrap/unwrap --- contracts/core/FollowNFT.sol | 6 +- contracts/interfaces/IFollowNFT.sol | 12 +-- test/foundry/FollowNFTTest.t.sol | 130 ++++++++++++++-------------- test/foundry/FollowTest.t.sol | 2 +- test/foundry/UnfollowTest.t.sol | 2 +- 5 files changed, 75 insertions(+), 77 deletions(-) diff --git a/contracts/core/FollowNFT.sol b/contracts/core/FollowNFT.sol index dd8c352..3bd643a 100644 --- a/contracts/core/FollowNFT.sol +++ b/contracts/core/FollowNFT.sol @@ -150,9 +150,9 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF } /// @inheritdoc IFollowNFT - function untieAndWrap(uint256 followTokenId) external override { + function wrap(uint256 followTokenId) external override { if (_isFollowTokenWrapped(followTokenId)) { - revert AlreadyUntiedAndWrapped(); + revert AlreadyWrapped(); } uint256 followerProfileId = _followDataByFollowTokenId[followTokenId].followerProfileId; address wrappedTokenReceiver; @@ -174,7 +174,7 @@ contract FollowNFT is HubRestricted, LensNFTBase, ERC2981CollectionRoyalties, IF } /// @inheritdoc IFollowNFT - function unwrapAndTie(uint256 followTokenId) external override { + function unwrap(uint256 followTokenId) external override { if (_followDataByFollowTokenId[followTokenId].followerProfileId == 0) { revert NotFollowing(); } diff --git a/contracts/interfaces/IFollowNFT.sol b/contracts/interfaces/IFollowNFT.sol index 5ba006b..f911207 100644 --- a/contracts/interfaces/IFollowNFT.sol +++ b/contracts/interfaces/IFollowNFT.sol @@ -14,7 +14,7 @@ interface IFollowNFT { error AlreadyFollowing(); error NotFollowing(); error FollowTokenDoesNotExist(); - error AlreadyUntiedAndWrapped(); + error AlreadyWrapped(); error OnlyWrappedFollowTokens(); error DoesNotHavePermissions(); @@ -94,20 +94,20 @@ interface IFollowNFT { function approveFollow(uint256 approvedProfileId, uint256 followTokenId) external; /** - * @notice Unties the follow token from the follower's profile token, and wraps it into the ERC-721 untied follow - * tokens collection. + * @notice Unties the follow token from the follower's profile one, and wraps it into the ERC-721 untied follow + * tokens collection. Untied follow tokens will NOT be automatically transferred with their follower profile. * * @param followTokenId The ID of the follow token to untie and wrap. */ - function untieAndWrap(uint256 followTokenId) external; + function wrap(uint256 followTokenId) external; /** * @notice Unwraps the follow token from the ERC-721 untied follow tokens collection, and ties it to the follower's - * profile token. + * profile token. Tokens that are tied to the follower profile will be automatically transferred with it. * * @param followTokenId The ID of the follow token to unwrap and tie to its follower. */ - function unwrapAndTie(uint256 followTokenId) external; + function unwrap(uint256 followTokenId) external; /** * @notice Processes logic when the given profile is being blocked. If it was following the targeted profile, diff --git a/test/foundry/FollowNFTTest.t.sol b/test/foundry/FollowNFTTest.t.sol index 7fb9efa..650b075 100644 --- a/test/foundry/FollowNFTTest.t.sol +++ b/test/foundry/FollowNFTTest.t.sol @@ -46,7 +46,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { function _mintERC721(address to) internal virtual override returns (uint256) { uint256 tokenId = _follow(to, _createProfile(to), targetProfileId, 0, '')[0]; vm.prank(to); - followNFT.untieAndWrap(tokenId); + followNFT.wrap(tokenId); return tokenId; } @@ -244,7 +244,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom(alreadyFollowingProfileOwner, followerProfileOwner, followTokenId); @@ -272,7 +272,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom(alreadyFollowingProfileOwner, followerProfileOwner, followTokenId); @@ -300,7 +300,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom( @@ -329,7 +329,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.setApprovalForAll(followerProfileOwner, true); @@ -358,7 +358,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.setApprovalForAll(executorAsApprovedDelegatee, true); @@ -383,7 +383,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.approveFollow(followerProfileId, followTokenId); @@ -413,7 +413,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.approveFollow(followerProfileId, followTokenId); @@ -506,7 +506,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom(alreadyFollowingProfileOwner, unrelatedAddress, followTokenId); @@ -526,7 +526,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom(alreadyFollowingProfileOwner, followHolder, followTokenId); @@ -544,7 +544,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { function testUnfollowAsFollowerProfileOwnerWhenTokenIsWrapped() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(address(hub)); @@ -566,7 +566,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(address(hub)); @@ -586,7 +586,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom(alreadyFollowingProfileOwner, followTokenOwner, followTokenId); @@ -611,7 +611,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.setApprovalForAll(approvedForAll, true); @@ -666,7 +666,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { function testRemoveFollower() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom(alreadyFollowingProfileOwner, followHolder, followTokenId); @@ -680,29 +680,29 @@ contract FollowNFTTest is BaseTest, ERC721Test { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////// - // Untie & Wrap - Negatives + // Wrap - Negatives ////////////////////////////////////////////////////////// - function testCannotUntieAndWrapIfAlreadyWrapped() public { + function testCannotWrapIfAlreadyWrapped() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); - vm.expectRevert(IFollowNFT.AlreadyUntiedAndWrapped.selector); - followNFT.untieAndWrap(followTokenId); + vm.expectRevert(IFollowNFT.AlreadyWrapped.selector); + followNFT.wrap(followTokenId); } - function testCannotUntieAndWrapIfTokenDoesNotExist(uint256 unexistentTokenId) public { + function testCannotWrapIfTokenDoesNotExist(uint256 unexistentTokenId) public { vm.assume(followNFT.getFollowerProfileId(unexistentTokenId) == 0); vm.assume(!followNFT.exists(unexistentTokenId)); vm.expectRevert(IFollowNFT.FollowTokenDoesNotExist.selector); - followNFT.untieAndWrap(unexistentTokenId); + followNFT.wrap(unexistentTokenId); } - function testCannotUntieAndWrapIfSenderIsNotFollowerOwner(address notFollowerOwner) public { + function testCannotWrapIfSenderIsNotFollowerOwner(address notFollowerOwner) public { vm.assume(notFollowerOwner != alreadyFollowingProfileOwner); vm.assume(notFollowerOwner != address(0)); @@ -711,12 +711,10 @@ contract FollowNFTTest is BaseTest, ERC721Test { vm.prank(notFollowerOwner); vm.expectRevert(IFollowNFT.DoesNotHavePermissions.selector); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); } - function testCannotUntieAndWrapRecoveringWhenTheProfileAllowedToRecoverDoesNotExistAnymore() - public - { + function testCannotWrapRecoveringWhenTheProfileAllowedToRecoverDoesNotExistAnymore() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(address(hub)); @@ -732,10 +730,10 @@ contract FollowNFTTest is BaseTest, ERC721Test { vm.prank(alreadyFollowingProfileOwner); vm.expectRevert(Errors.ERC721Time_OwnerQueryForNonexistantToken.selector); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); } - function testCannotUntieAndWrapRecoveringWhenTheSenderDoesNotOwnTheProfileAllowedToRecover( + function testCannotWrapRecoveringWhenTheSenderDoesNotOwnTheProfileAllowedToRecover( address unrelatedAddress ) public { vm.assume(unrelatedAddress != address(0)); @@ -760,18 +758,18 @@ contract FollowNFTTest is BaseTest, ERC721Test { vm.prank(alreadyFollowingProfileOwner); vm.expectRevert(IFollowNFT.DoesNotHavePermissions.selector); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); } ////////////////////////////////////////////////////////// - // Untie & Wrap - Scenarios + // Wrap - Scenarios ////////////////////////////////////////////////////////// function testWrappedTokenOwnerIsFollowerProfileOwnerAfterUntyingAndWrapping() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); assertEq(followNFT.ownerOf(followTokenId), alreadyFollowingProfileOwner); } @@ -791,7 +789,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { }); vm.prank(followerProfileOwner); - followNFT.untieAndWrap(assignedTokenId); + followNFT.wrap(assignedTokenId); assertEq(followNFT.ownerOf(assignedTokenId), followerProfileOwner); @@ -821,7 +819,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { assertEq(followNFT.getProfileIdAllowedToRecover(followTokenId), alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); assertEq(followNFT.ownerOf(followTokenId), alreadyFollowingProfileOwner); assertEq(followNFT.getProfileIdAllowedToRecover(followTokenId), 0); @@ -851,7 +849,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { }); vm.prank(unrelatedAddress); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); assertEq(followNFT.ownerOf(followTokenId), unrelatedAddress); assertEq(followNFT.getProfileIdAllowedToRecover(followTokenId), 0); @@ -860,14 +858,14 @@ contract FollowNFTTest is BaseTest, ERC721Test { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////// - // Unwrap & Tie - Negatives + // Unwrap - Negatives ////////////////////////////////////////////////////////// - function testCannotUnwrapAndTieIfTokenDoesNotHaveAFollowerSet() public { + function testCannotUnwrapIfTokenDoesNotHaveAFollowerSet() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(address(hub)); followNFT.unfollow({ @@ -877,18 +875,18 @@ contract FollowNFTTest is BaseTest, ERC721Test { vm.expectRevert(IFollowNFT.NotFollowing.selector); vm.prank(alreadyFollowingProfileOwner); - followNFT.unwrapAndTie(followTokenId); + followNFT.unwrap(followTokenId); } - function testCannotUnwrapAndTieIfTokenIsAlreadyUnwrappedAndTied() public { + function testCannotUnwrapIfTokenIsAlreadyUnwrapped() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.expectRevert(Errors.ERC721Time_OperatorQueryForNonexistantToken.selector); vm.prank(alreadyFollowingProfileOwner); - followNFT.unwrapAndTie(followTokenId); + followNFT.unwrap(followTokenId); } - function testCannotUnwrapAndTieIfSenderIsNotTokenOwnerOrApprovedOrApprovedForAll(address sender) + function testCannotUnwrapIfSenderIsNotTokenOwnerOrApprovedOrApprovedForAll(address sender) public { // You can't approve a token that is not wrapped, so no need to check for `followNFT.getApproved(followTokenId)` @@ -899,29 +897,29 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.expectRevert(Errors.NotOwnerOrApproved.selector); vm.prank(sender); - followNFT.unwrapAndTie(followTokenId); + followNFT.unwrap(followTokenId); } ////////////////////////////////////////////////////////// - // Unwrap & Tie - Scenarios + // Unwrap - Scenarios ////////////////////////////////////////////////////////// - function testTokenOwnerCanUnwrapAndTieIt() public { + function testTokenOwnerCanUnwrapIt() public { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); - followNFT.unwrapAndTie(followTokenId); + followNFT.unwrap(followTokenId); assertFalse(followNFT.exists(followTokenId)); } - function testApprovedForAllCanUnwrapAndTieAToken(address approvedForAll) public { + function testApprovedForAllCanUnwrapAToken(address approvedForAll) public { vm.assume(approvedForAll != alreadyFollowingProfileOwner); vm.assume(approvedForAll != address(0)); @@ -930,27 +928,27 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(approvedForAll); - followNFT.unwrapAndTie(followTokenId); + followNFT.unwrap(followTokenId); assertFalse(followNFT.exists(followTokenId)); } - function testApprovedForATokenCanUnwrapAndTieIt(address approved) public { + function testApprovedForATokenCanUnwrapIt(address approved) public { vm.assume(approved != alreadyFollowingProfileOwner); vm.assume(approved != address(0)); uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.approve(approved, followTokenId); vm.prank(approved); - followNFT.unwrapAndTie(followTokenId); + followNFT.unwrap(followTokenId); assertFalse(followNFT.exists(followTokenId)); } @@ -982,7 +980,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { assertEq(followerProfileIdSet, followNFT.getFollowerProfileId(assignedTokenId)); vm.prank(newFollowerProfileOwner); - followNFT.untieAndWrap(assignedTokenId); + followNFT.wrap(assignedTokenId); assertEq(followNFT.ownerOf(assignedTokenId), newFollowerProfileOwner); } @@ -1020,7 +1018,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); assertTrue(followNFT.isFollowing(alreadyFollowingProfileId)); @@ -1053,7 +1051,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(address(hub)); followNFT.unfollow({ @@ -1077,7 +1075,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.transferFrom(alreadyFollowingProfileOwner, followerProfileOwner, followTokenId); @@ -1127,7 +1125,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.expectRevert(IFollowNFT.DoesNotHavePermissions.selector); vm.prank(sender); @@ -1151,7 +1149,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.approveFollow(followerProfileId, followTokenId); @@ -1167,7 +1165,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.setApprovalForAll(approvedForAll, true); @@ -1182,7 +1180,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.approveFollow(followerProfileId, followTokenId); @@ -1190,14 +1188,14 @@ contract FollowNFTTest is BaseTest, ERC721Test { assertEq(followNFT.getFollowApproved(followTokenId), followerProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.unwrapAndTie(followTokenId); + followNFT.unwrap(followTokenId); assertEq(followNFT.getFollowApproved(followTokenId), 0); // Wraps again and checks that it keeps being clear. vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); assertEq(followNFT.getFollowApproved(followTokenId), 0); } @@ -1206,7 +1204,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.approveFollow(followerProfileId, followTokenId); @@ -1230,7 +1228,7 @@ contract FollowNFTTest is BaseTest, ERC721Test { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.prank(alreadyFollowingProfileOwner); followNFT.approveFollow(followerProfileId, followTokenId); diff --git a/test/foundry/FollowTest.t.sol b/test/foundry/FollowTest.t.sol index 9ceb684..2514177 100644 --- a/test/foundry/FollowTest.t.sol +++ b/test/foundry/FollowTest.t.sol @@ -150,7 +150,7 @@ contract FollowTest is BaseTest { uint256 followTokenId = followNFT.getFollowTokenId(alreadyFollowingProfileId); vm.prank(alreadyFollowingProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.expectRevert(Errors.ExecutorInvalid.selector); diff --git a/test/foundry/UnfollowTest.t.sol b/test/foundry/UnfollowTest.t.sol index d587df6..0281605 100644 --- a/test/foundry/UnfollowTest.t.sol +++ b/test/foundry/UnfollowTest.t.sol @@ -130,7 +130,7 @@ contract UnfollowTest is BaseTest { uint256 followTokenId = followNFT.getFollowTokenId(unfollowerProfileId); vm.prank(unfollowerProfileOwner); - followNFT.untieAndWrap(followTokenId); + followNFT.wrap(followTokenId); vm.expectRevert(Errors.ExecutorInvalid.selector);