diff --git a/test/foundry/Events.t.sol b/test/foundry/Events.t.sol index 9c2155f..6040440 100644 --- a/test/foundry/Events.t.sol +++ b/test/foundry/Events.t.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.13; import 'test/foundry/base/BaseTest.t.sol'; import {Events} from 'contracts/libraries/constants/Events.sol'; -import {MockFollowModule} from 'contracts/mocks/MockFollowModule.sol'; +import {MockFollowModule} from 'test/mocks/MockFollowModule.sol'; contract EventTest is BaseTest { address profileOwnerTwo = address(0x2222); diff --git a/test/foundry/FollowTest.t.sol b/test/foundry/FollowTest.t.sol index ac6b2bc..d7ec7c6 100644 --- a/test/foundry/FollowTest.t.sol +++ b/test/foundry/FollowTest.t.sol @@ -5,7 +5,7 @@ import 'test/foundry/base/BaseTest.t.sol'; import 'test/foundry/MetaTxNegatives.t.sol'; import {Strings} from '@openzeppelin/contracts/utils/Strings.sol'; import {IFollowNFT} from 'contracts/interfaces/IFollowNFT.sol'; -import 'contracts/mocks/MockFollowModuleWithRevertFlag.sol'; +import 'test/mocks/MockFollowModuleWithRevertFlag.sol'; import {Typehash} from 'contracts/libraries/constants/Typehash.sol'; contract FollowTest is BaseTest { @@ -109,9 +109,9 @@ contract FollowTest is BaseTest { }); } - function testCannotFollowWithUnwrappedTokenIfExecutorIsNotTheProfileOwnerOrHisApprovedExecutor(uint256 executorPk) - public - { + function testCannotFollowWithUnwrappedTokenIfExecutorIsNotTheProfileOwnerOrHisApprovedExecutor( + uint256 executorPk + ) public { executorPk = bound(executorPk, 1, ISSECP256K1_CURVE_ORDER - 1); address executor = vm.addr(executorPk); vm.assume(executor != address(0)); @@ -133,9 +133,9 @@ contract FollowTest is BaseTest { }); } - function testCannotFollowWithWrappedTokenIfExecutorIsNotTheProfileOwnerOrHisApprovedExecutor(uint256 executorPk) - public - { + function testCannotFollowWithWrappedTokenIfExecutorIsNotTheProfileOwnerOrHisApprovedExecutor( + uint256 executorPk + ) public { executorPk = bound(executorPk, 1, ISSECP256K1_CURVE_ORDER - 1); address executor = vm.addr(executorPk); vm.assume(executor != address(0)); @@ -437,11 +437,7 @@ contract FollowMetaTxTest is FollowTest, MetaTxNegatives { }); } - function _executeMetaTx( - uint256 signerPk, - uint256 nonce, - uint256 deadline - ) internal virtual override { + function _executeMetaTx(uint256 signerPk, uint256 nonce, uint256 deadline) internal virtual override { hub.followWithSig({ followerProfileId: testFollowerProfileId, idsOfProfilesToFollow: _toUint256Array(targetProfileId), diff --git a/test/foundry/Misc.t.sol b/test/foundry/Misc.t.sol index 66cddd5..da401e5 100644 --- a/test/foundry/Misc.t.sol +++ b/test/foundry/Misc.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.13; import 'test/foundry/base/BaseTest.t.sol'; -import 'contracts/mocks/MockFollowModule.sol'; +import 'test/mocks/MockFollowModule.sol'; // Original Misc contract NFTTransferEmittersTest is BaseTest { diff --git a/test/foundry/SetFollowModule.t.sol b/test/foundry/SetFollowModule.t.sol index 5e71525..44385dd 100644 --- a/test/foundry/SetFollowModule.t.sol +++ b/test/foundry/SetFollowModule.t.sol @@ -2,7 +2,7 @@ pragma solidity ^0.8.13; import 'test/foundry/base/BaseTest.t.sol'; -import 'contracts/mocks/MockFollowModule.sol'; +import 'test/mocks/MockFollowModule.sol'; import 'test/foundry/helpers/SignatureHelpers.sol'; // TODO: Refactor out all `hub.` calls (if we decide to go this route) diff --git a/test/foundry/base/TestSetup.t.sol b/test/foundry/base/TestSetup.t.sol index 09193e6..131e8ff 100644 --- a/test/foundry/base/TestSetup.t.sol +++ b/test/foundry/base/TestSetup.t.sol @@ -14,8 +14,8 @@ import {Types} from 'contracts/libraries/constants/Types.sol'; import {Errors} from 'contracts/libraries/constants/Errors.sol'; import {Events} from 'contracts/libraries/constants/Events.sol'; import {ProfileTokenURILib} from 'contracts/libraries/ProfileTokenURILib.sol'; -import {MockCollectModule} from 'contracts/mocks/MockCollectModule.sol'; -import {MockReferenceModule} from 'contracts/mocks/MockReferenceModule.sol'; +import {MockCollectModule} from 'test/mocks/MockCollectModule.sol'; +import {MockReferenceModule} from 'test/mocks/MockReferenceModule.sol'; import 'test/foundry/helpers/ForkManagement.sol'; import 'test/foundry/Constants.sol'; import {Typehash} from 'contracts/libraries/constants/Typehash.sol'; diff --git a/test/foundry/fork/UpgradeForkTest.t.sol b/test/foundry/fork/UpgradeForkTest.t.sol index e2a4754..74e5d0e 100644 --- a/test/foundry/fork/UpgradeForkTest.t.sol +++ b/test/foundry/fork/UpgradeForkTest.t.sol @@ -6,12 +6,12 @@ import '@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol'; import '@openzeppelin/contracts/token/ERC721/IERC721.sol'; import 'forge-std/console2.sol'; import 'test/foundry/base/BaseTest.t.sol'; -import 'contracts/mocks/MockReferenceModule.sol'; -import 'contracts/mocks/MockDeprecatedReferenceModule.sol'; -import 'contracts/mocks/MockCollectModule.sol'; -import 'contracts/mocks/MockDeprecatedCollectModule.sol'; -import 'contracts/mocks/MockFollowModule.sol'; -import 'contracts/mocks/MockDeprecatedFollowModule.sol'; +import 'test/mocks/MockReferenceModule.sol'; +import 'test/mocks/MockDeprecatedReferenceModule.sol'; +import 'test/mocks/MockCollectModule.sol'; +import 'test/mocks/MockDeprecatedCollectModule.sol'; +import 'test/mocks/MockFollowModule.sol'; +import 'test/mocks/MockDeprecatedFollowModule.sol'; import 'contracts/interfaces/IERC721Time.sol'; import 'contracts/interfaces/ILensMultiState.sol'; import {Typehash} from 'contracts/libraries/constants/Typehash.sol'; @@ -41,11 +41,7 @@ interface IOldHub { function follow(uint256[] calldata profileIds, bytes[] calldata datas) external; - function collect( - uint256 profileId, - uint256 pubId, - bytes calldata data - ) external; + function collect(uint256 profileId, uint256 pubId, bytes calldata data) external; } contract UpgradeForkTest is BaseTest { @@ -173,11 +169,7 @@ contract UpgradeForkTest is BaseTest { return profileId; } - function _fullPublishSequence( - uint256 profileId, - address gov, - ILensHub hub - ) private { + function _fullPublishSequence(uint256 profileId, address gov, ILensHub hub) private { // First check if the new interface works, if not, use the old interface. // Set the proper initial params, these must be redundantly reset as they may have been set @@ -303,11 +295,7 @@ contract UpgradeForkTest is BaseTest { } } - function _fullFollowCollectSequence( - uint256 profileId, - address gov, - ILensHub hub - ) private { + function _fullFollowCollectSequence(uint256 profileId, address gov, ILensHub hub) private { // First check if the new interface works, if not, use the old interface. uint256[] memory profileIds = new uint256[](1); profileIds[0] = profileId; diff --git a/contracts/mocks/BadMockEIP1271Implementer.sol b/test/mocks/BadMockEIP1271Implementer.sol similarity index 100% rename from contracts/mocks/BadMockEIP1271Implementer.sol rename to test/mocks/BadMockEIP1271Implementer.sol diff --git a/contracts/mocks/Currency.sol b/test/mocks/Currency.sol similarity index 100% rename from contracts/mocks/Currency.sol rename to test/mocks/Currency.sol diff --git a/contracts/mocks/Helper.sol b/test/mocks/Helper.sol similarity index 100% rename from contracts/mocks/Helper.sol rename to test/mocks/Helper.sol diff --git a/contracts/mocks/MockCollectModule.sol b/test/mocks/MockCollectModule.sol similarity index 100% rename from contracts/mocks/MockCollectModule.sol rename to test/mocks/MockCollectModule.sol diff --git a/contracts/mocks/MockDeprecatedCollectModule.sol b/test/mocks/MockDeprecatedCollectModule.sol similarity index 100% rename from contracts/mocks/MockDeprecatedCollectModule.sol rename to test/mocks/MockDeprecatedCollectModule.sol diff --git a/contracts/mocks/MockDeprecatedFollowModule.sol b/test/mocks/MockDeprecatedFollowModule.sol similarity index 100% rename from contracts/mocks/MockDeprecatedFollowModule.sol rename to test/mocks/MockDeprecatedFollowModule.sol diff --git a/contracts/mocks/MockDeprecatedReferenceModule.sol b/test/mocks/MockDeprecatedReferenceModule.sol similarity index 100% rename from contracts/mocks/MockDeprecatedReferenceModule.sol rename to test/mocks/MockDeprecatedReferenceModule.sol diff --git a/contracts/mocks/MockEIP1271Implementer.sol b/test/mocks/MockEIP1271Implementer.sol similarity index 100% rename from contracts/mocks/MockEIP1271Implementer.sol rename to test/mocks/MockEIP1271Implementer.sol diff --git a/contracts/mocks/MockFollowModule.sol b/test/mocks/MockFollowModule.sol similarity index 100% rename from contracts/mocks/MockFollowModule.sol rename to test/mocks/MockFollowModule.sol diff --git a/contracts/mocks/MockFollowModuleWithRevertFlag.sol b/test/mocks/MockFollowModuleWithRevertFlag.sol similarity index 100% rename from contracts/mocks/MockFollowModuleWithRevertFlag.sol rename to test/mocks/MockFollowModuleWithRevertFlag.sol diff --git a/contracts/mocks/MockLensHubV2.sol b/test/mocks/MockLensHubV2.sol similarity index 92% rename from contracts/mocks/MockLensHubV2.sol rename to test/mocks/MockLensHubV2.sol index b9e134e..056fc44 100644 --- a/contracts/mocks/MockLensHubV2.sol +++ b/test/mocks/MockLensHubV2.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.15; import {LensNFTBase} from 'contracts/core/base/LensNFTBase.sol'; import {LensMultiState} from 'contracts/core/base/LensMultiState.sol'; import {VersionedInitializable} from 'contracts/upgradeability/VersionedInitializable.sol'; -import {MockLensHubV2Storage} from 'contracts/mocks/MockLensHubV2Storage.sol'; +import {MockLensHubV2Storage} from 'test/mocks/MockLensHubV2Storage.sol'; /** * @dev A mock upgraded LensHub contract that is used mainly to validate that the initializer works as expected and diff --git a/contracts/mocks/MockLensHubV2BadRevision.sol b/test/mocks/MockLensHubV2BadRevision.sol similarity index 93% rename from contracts/mocks/MockLensHubV2BadRevision.sol rename to test/mocks/MockLensHubV2BadRevision.sol index 7e4ada8..94c07cd 100644 --- a/contracts/mocks/MockLensHubV2BadRevision.sol +++ b/test/mocks/MockLensHubV2BadRevision.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.15; import {LensNFTBase} from 'contracts/core/base/LensNFTBase.sol'; import {LensMultiState} from 'contracts/core/base/LensMultiState.sol'; import {VersionedInitializable} from 'contracts/upgradeability/VersionedInitializable.sol'; -import {MockLensHubV2Storage} from 'contracts/mocks/MockLensHubV2Storage.sol'; +import {MockLensHubV2Storage} from 'test/mocks/MockLensHubV2Storage.sol'; /** * @dev A mock upgraded LensHub contract that is used to validate that the initializer cannot be called with the same revision. diff --git a/contracts/mocks/MockLensHubV2Storage.sol b/test/mocks/MockLensHubV2Storage.sol similarity index 100% rename from contracts/mocks/MockLensHubV2Storage.sol rename to test/mocks/MockLensHubV2Storage.sol diff --git a/contracts/mocks/MockProfileCreationProxy.sol b/test/mocks/MockProfileCreationProxy.sol similarity index 100% rename from contracts/mocks/MockProfileCreationProxy.sol rename to test/mocks/MockProfileCreationProxy.sol diff --git a/contracts/mocks/MockReferenceModule.sol b/test/mocks/MockReferenceModule.sol similarity index 100% rename from contracts/mocks/MockReferenceModule.sol rename to test/mocks/MockReferenceModule.sol