Merge pull request #7 from OwlOfMoistness/feat/remove_contract_prefix

Remove contract prefix

Author: OwlOfMoistness

brownie-config.yaml

@@ -9,7 +9,7 @@ compiler:
   solc:
     version: 0.8.17
     remappings:
-      - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.9.0"
-      - "@openzeppelinupgrade=OpenZeppelin/openzeppelin-contracts-upgradeable@4.9.0"
+      - "@openzeppelin=OpenZeppelin/openzeppelin-contracts@4.9.0/contracts"
+      - "@openzeppelinupgrade=OpenZeppelin/openzeppelin-contracts-upgradeable@4.9.0/contracts"
 
 autofetch_sources: true

contracts/ERC721x.sol

@@ -8,7 +8,7 @@ pragma solidity ^0.8.17;
  *    -"-"-
  */
 
-import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import "@openzeppelin/token/ERC721/ERC721.sol";
 import "./LockRegistry.sol";
 import "./interfaces/IERC721x.sol";
 
@@ -48,17 +48,17 @@ contract ERC721x is ERC721, LockRegistry {
 		ERC721.safeTransferFrom(_from, _to, _tokenId, _data);
 	}
 
-	function lockId(uint256 _id) external override virtual {
+	function lockId(uint256 _id) public override virtual {
 		require(_exists(_id), "Token !exist");
 		_lockId(_id);
 	}
 
-	function unlockId(uint256 _id) external override virtual {
+	function unlockId(uint256 _id) public override virtual {
 		require(_exists(_id), "Token !exist");
 		_unlockId(_id);
 	}
 
-	function freeId(uint256 _id, address _contract) external override virtual {
+	function freeId(uint256 _id, address _contract) public override virtual {
 		require(_exists(_id), "Token !exist");
 		_freeId(_id, _contract);
 	}

contracts/ERC721xUpgradeable.sol

@@ -8,7 +8,7 @@ pragma solidity ^0.8.17;
  *    -"-"-
  */
 
-import "@openzeppelinupgrade/contracts/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";
+import "@openzeppelinupgrade/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";
 import "./LockRegistryUpgradeable.sol";
 import "./interfaces/IERC721x.sol";
 
@@ -50,17 +50,17 @@ contract ERC721xUpgradeable is ERC721EnumerableUpgradeable, LockRegistryUpgradea
 		ERC721Upgradeable.safeTransferFrom(_from, _to, _tokenId, _data);
 	}
 
-	function lockId(uint256 _id) external override virtual {
+	function lockId(uint256 _id) public override virtual {
 		require(_exists(_id), "Token !exist");
 		_lockId(_id);
 	}
 
-	function unlockId(uint256 _id) external override virtual {
+	function unlockId(uint256 _id) public override virtual {
 		require(_exists(_id), "Token !exist");
 		_unlockId(_id);
 	}
 
-	function freeId(uint256 _id, address _contract) external override virtual {
+	function freeId(uint256 _id, address _contract) public override virtual {
 		require(_exists(_id), "Token !exist");
 		_freeId(_id, _contract);
 	}

contracts/LockRegistry.sol

@@ -8,7 +8,7 @@ pragma solidity ^0.8.17;
  *    -"-"-
  */
 
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "@openzeppelin/access/Ownable.sol";
 import "./interfaces/IERC721x.sol";
 
 abstract contract LockRegistry is Ownable, IERC721x {

contracts/LockRegistryUpgradeable.sol

@@ -8,8 +8,7 @@ pragma solidity ^0.8.17;
  *    -"-"-
  */
 
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelinupgrade/contracts/access/OwnableUpgradeable.sol";
+import "@openzeppelinupgrade/access/OwnableUpgradeable.sol";
 import "./interfaces/IERC721x.sol";
 
 abstract contract LockRegistryUpgradeable is OwnableUpgradeable, IERC721x {