Adds tests for granular token holder.

contracts/RMRK/extension/tokenHolder/ERC1155Holder.sol

@@ -3,12 +3,9 @@
 pragma solidity ^0.8.18;
 
 import "./IERC1155Holder.sol";
+import "./HolderErrors.sol";
 import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 
-error InvalidValueForERC1155();
-error InvalidAddressForERC1155();
-error InsufficientBalance();
-
 abstract contract ERC1155Holder is IERC1155Holder {
     mapping(uint256 tokenHolderId => mapping(address erc1155Address => mapping(uint256 tokenHeldId => uint256 balance)))
         private _balances;
@@ -43,10 +40,10 @@ abstract contract ERC1155Holder is IERC1155Holder {
         bytes memory data
     ) internal {
         if (amount == 0) {
-            revert InvalidValueForERC1155();
+            revert InvalidValue();
         }
         if (to == address(0) || erc1155Contract == address(0)) {
-            revert InvalidAddressForERC1155();
+            revert InvalidAddress();
         }
         if (
             _balances[tokenHolderId][erc1155Contract][tokenToTransferId] <
@@ -100,10 +97,10 @@ abstract contract ERC1155Holder is IERC1155Holder {
         bytes memory data
     ) external {
         if (amount == 0) {
-            revert InvalidValueForERC1155();
+            revert InvalidValue();
         }
         if (erc1155Contract == address(0)) {
-            revert InvalidAddressForERC1155();
+            revert InvalidAddress();
         }
         _beforeTransferERC1155ToToken(
             erc1155Contract,

contracts/RMRK/extension/tokenHolder/ERC20Holder.sol

@@ -3,12 +3,9 @@
 pragma solidity ^0.8.18;
 
 import "./IERC20Holder.sol";
+import "./HolderErrors.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-error InvalidValueForERC20();
-error InvalidAddressForERC20();
-error InsufficientBalanceForERC20();
-
 abstract contract ERC20Holder is IERC20Holder {
     mapping(uint256 tokenId => mapping(address erc20Address => uint256 balance))
         private _balances;
@@ -40,13 +37,13 @@ abstract contract ERC20Holder is IERC20Holder {
         bytes memory data
     ) internal {
         if (amount == 0) {
-            revert InvalidValueForERC20();
+            revert InvalidValue();
         }
         if (to == address(0) || erc20Contract == address(0)) {
-            revert InvalidAddressForERC20();
+            revert InvalidAddress();
         }
         if (_balances[tokenId][erc20Contract] < amount) {
-            revert InsufficientBalanceForERC20();
+            revert InsufficientBalance();
         }
         _beforeTransferHeldERC20FromToken(
             erc20Contract,
@@ -79,10 +76,10 @@ abstract contract ERC20Holder is IERC20Holder {
         bytes memory data
     ) external {
         if (amount == 0) {
-            revert InvalidValueForERC20();
+            revert InvalidValue();
         }
         if (erc20Contract == address(0)) {
-            revert InvalidAddressForERC20();
+            revert InvalidAddress();
         }
         _beforeTransferERC20ToToken(
             erc20Contract,

contracts/RMRK/extension/tokenHolder/ERC721Holder.sol

@@ -3,11 +3,9 @@
 pragma solidity ^0.8.18;
 
 import "./IERC721Holder.sol";
+import "./HolderErrors.sol";
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
-error InvalidAddressForERC721();
-error TokenNotHeldForERC721();
-
 abstract contract ERC721Holder is IERC721Holder {
     mapping(uint256 tokenHolderId => mapping(address erc721Address => mapping(uint256 tokenHeldId => uint256 balance)))
         private _balances;
@@ -40,10 +38,10 @@ abstract contract ERC721Holder is IERC721Holder {
         bytes memory data
     ) internal {
         if (to == address(0) || erc721Contract == address(0)) {
-            revert InvalidAddressForERC721();
+            revert InvalidAddress();
         }
         if (_balances[tokenHolderId][erc721Contract][tokenToTransferId] == 0) {
-            revert TokenNotHeldForERC721();
+            revert TokenNotHeld();
         }
         _beforeTransferHeldERC721FromToken(
             erc721Contract,
@@ -86,7 +84,7 @@ abstract contract ERC721Holder is IERC721Holder {
         bytes memory data
     ) external {
         if (erc721Contract == address(0)) {
-            revert InvalidAddressForERC721();
+            revert InvalidAddress();
         }
         _beforeTransferERC721ToToken(
             erc721Contract,

contracts/RMRK/extension/tokenHolder/HolderErrors.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.21;
+
+error InvalidValue();
+error InvalidAddress();
+error InsufficientBalance();
+error TokenNotHeld();

contracts/mocks/extensions/tokenHolder/RMRKUniversalHolderMock.sol

@@ -24,6 +24,10 @@ contract RMRKUniversalHolderMock is
         string memory symbol
     ) ERC721(name, symbol) {}
 
+    function mint(address to, uint256 tokenId) public {
+        _mint(to, tokenId);
+    }
+
     function supportsInterface(
         bytes4 interfaceId
     )

docs/RMRK/extension/tokenHolder/ERC1155Holder.md

@@ -171,21 +171,21 @@ Used to notify the listeners that the ERC-1155 tokens have been transferred.
 
 ## Errors
 
-### InvalidAddressForERC1155
+### InvalidAddress
 
 ```solidity
-error InvalidAddressForERC1155()
+error InvalidAddress()
 ```
 
 
 
 
 
 
-### InvalidValueForERC1155
+### InvalidValue
 
 ```solidity
-error InvalidValueForERC1155()
+error InvalidValue()
 ```
 
 

docs/RMRK/extension/tokenHolder/ERC20Holder.md

@@ -140,21 +140,21 @@ Used to notify the listeners that the ERC-20 tokens have been transferred.
 
 ## Errors
 
-### InvalidAddressForERC20
+### InvalidAddress
 
 ```solidity
-error InvalidAddressForERC20()
+error InvalidAddress()
 ```
 
 
 
 
 
 
-### InvalidValueForERC20
+### InvalidValue
 
 ```solidity
-error InvalidValueForERC20()
+error InvalidValue()
 ```
 
 

docs/RMRK/extension/tokenHolder/ERC721Holder.md

@@ -166,10 +166,10 @@ Used to notify the listeners that the ERC-721 tokens have been transferred.
 
 ## Errors
 
-### InvalidAddressForERC721
+### InvalidAddress
 
 ```solidity
-error InvalidAddressForERC721()
+error InvalidAddress()
 ```
 
 

docs/mocks/extensions/tokenHolder/RMRKERC1155HolderMock.md

@@ -487,21 +487,21 @@ error InsufficientBalance()
 
 
 
-### InvalidAddressForERC1155
+### InvalidAddress
 
 ```solidity
-error InvalidAddressForERC1155()
+error InvalidAddress()
 ```
 
 
 
 
 
 
-### InvalidValueForERC1155
+### InvalidValue
 
 ```solidity
-error InvalidValueForERC1155()
+error InvalidValue()
 ```
 
 

docs/mocks/extensions/tokenHolder/RMRKERC20HolderMock.md

@@ -445,32 +445,32 @@ Used to notify the listeners that the ERC-20 tokens have been transferred.
 
 ## Errors
 
-### InsufficientBalanceForERC20
+### InsufficientBalance
 
 ```solidity
-error InsufficientBalanceForERC20()
+error InsufficientBalance()
 ```
 
 
 
 
 
 
-### InvalidAddressForERC20
+### InvalidAddress
 
 ```solidity
-error InvalidAddressForERC20()
+error InvalidAddress()
 ```
 
 
 
 
 
 
-### InvalidValueForERC20
+### InvalidValue
 
 ```solidity
-error InvalidValueForERC20()
+error InvalidValue()
 ```
 
 

docs/mocks/extensions/tokenHolder/RMRKERC721HolderMock.md

@@ -471,10 +471,10 @@ Used to notify the listeners that the ERC-721 tokens have been transferred.
 
 ## Errors
 
-### InvalidAddressForERC721
+### InvalidAddress
 
 ```solidity
-error InvalidAddressForERC721()
+error InvalidAddress()
 ```
 
 
@@ -493,10 +493,10 @@ error OnlyNFTOwnerCanTransferTokensFromIt()
 
 
 
-### TokenNotHeldForERC721
+### TokenNotHeld
 
 ```solidity
-error TokenNotHeldForERC721()
+error TokenNotHeld()
 ```