move error

Signed-off-by: Adam Wolf <[email protected]>

Author: wolfy-nft

contracts/common/ErrorsAndEvents.sol

@@ -24,7 +24,10 @@ interface ErrorsAndEvents {
     error NewSupplyLessThanTotalSupply();
     error NotTransferable();
     error InitialOwnerCannotBeZero();
+    error TransfersAreFrozen();
+    error ContractAlreadySetup();
 
+    event SetFrozen(bool frozen);
     event SetMintable(bool mintable);
     event SetActiveStage(uint256 activeStage);
     event SetBaseURI(string baseURI);

contracts/nft/erc721m/interfaces/IERC721MInitializable.sol

@@ -11,12 +11,6 @@ import {ERC721MErrorsAndEvents} from "../ERC721MErrorsAndEvents.sol";
  * contract is for use with EIP-1167 Minimal Proxies (Clones).
  */
 interface IERC721MInitializable is IERC721AQueryableUpgradeable, ERC721MErrorsAndEvents {
-    event SetFrozen(bool frozen);
-
-    error TransfersAreFrozen();
-
-    error ContractAlreadySetup();
-
     function getNumberStages() external view returns (uint256);
 
     function getGlobalWalletLimit() external view returns (uint256);

test/erc721m/ERC721CMInitializableTest.t.sol

@@ -203,7 +203,7 @@ contract ERC721CMInitializableTest is Test {
 
     function testSetupLockedRevert() public {
         vm.startPrank(owner);
-        vm.expectRevert(IERC721MInitializable.ContractAlreadySetup.selector);
+        vm.expectRevert(ErrorsAndEvents.ContractAlreadySetup.selector);
         nft.setup(
             "base_uri_",
             ".json",

test/erc721m/ERC721MInitializableTest.t.sol

@@ -74,7 +74,7 @@ contract ERC721MInitializableTest is Test {
         nft.ownerMint(1, minter);
         vm.stopPrank();
 
-        vm.expectRevert(IERC721MInitializable.TransfersAreFrozen.selector);
+        vm.expectRevert(ErrorsAndEvents.TransfersAreFrozen.selector);
         vm.prank(minter);
         nft.safeTransferFrom(minter, readonly, 0);
     }
@@ -109,7 +109,7 @@ contract ERC721MInitializableTest is Test {
 
     function testSetupLockedRevert() public {
         vm.startPrank(owner);
-        vm.expectRevert(IERC721MInitializable.ContractAlreadySetup.selector);
+        vm.expectRevert(ErrorsAndEvents.ContractAlreadySetup.selector);
         nft.setup(
             "base_uri_",
             ".json",