Merge pull request #144 from bosonprotocol/ID_to_Id

bosonprotocol · Sep 27, 2021 · 13cacd5 · 13cacd5
2 parents 07c065a + 8744960
commit 13cacd5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 22 deletions.
diff --git a/contracts/BosonRouter.sol b/contracts/BosonRouter.sol
@@ -945,7 +945,7 @@ contract BosonRouter is
         uint256 _tokensSent
     ) internal returns (uint256) {
         uint256 tokenIdSupply = IVoucherKernel(voucherKernel)
-            .createTokenSupplyID(
+            .createTokenSupplyId(
                 msg.sender,
                 metadata[0],
                 metadata[1],

diff --git a/contracts/Gate.sol b/contracts/Gate.sol
@@ -94,20 +94,20 @@ contract Gate is IGate, Ownable, Pausable {
     /**
      * @notice Registers connection between setID and tokenID
      * @param _tokenIdSupply an ID of a supply token (ERC-1155) [voucherSetID]
-     * @param _nftTokenID an ID of a quest token
+     * @param _nftTokenId an ID of a quest token
      */
-    function registerVoucherSetId(uint256 _tokenIdSupply, uint256 _nftTokenID)
+    function registerVoucherSetId(uint256 _tokenIdSupply, uint256 _nftTokenId)
         external
         override
         whenNotPaused
         onlyOwner
     {
-        require(_nftTokenID != 0, "TOKEN_ID_0_NOT_ALLOWED");
+        require(_nftTokenId != 0, "TOKEN_ID_0_NOT_ALLOWED");
         require(_tokenIdSupply != 0, "INVALID_TOKEN_SUPPLY");
 
-        voucherToToken[_tokenIdSupply] = _nftTokenID;
+        voucherToToken[_tokenIdSupply] = _nftTokenId;
 
-        emit LogVoucherSetRegistered(_tokenIdSupply, _nftTokenID);
+        emit LogVoucherSetRegistered(_tokenIdSupply, _nftTokenId);
     }
 
     /**

diff --git a/contracts/VoucherKernel.sol b/contracts/VoucherKernel.sol
@@ -210,7 +210,7 @@ contract VoucherKernel is IVoucherKernel, Ownable, Pausable, UsingHelpers {
      * @param _depositSe   Seller's deposit
      * @param _depositBu   Buyer's deposit
      */
-    function createTokenSupplyID(
+    function createTokenSupplyId(
         address _seller,
         uint256 _validFrom,
         uint256 _validTo,

diff --git a/contracts/interfaces/IGate.sol b/contracts/interfaces/IGate.sol
@@ -13,7 +13,7 @@ interface IGate {
     );
     event LogVoucherSetRegistered(
         uint256 indexed _tokenIdSupply,
-        uint256 indexed _nftTokenID
+        uint256 indexed _nftTokenId
     );
     event LogUserVoucherDeactivated(
         address indexed _user,
@@ -47,18 +47,17 @@ interface IGate {
     /**
      * @notice Registers connection between setID and tokenID
      * @param _tokenIdSupply an ID of a supply token (ERC-1155)
-     * @param _nftTokenID an ID of a quest token
+     * @param _nftTokenId an ID of a quest token
      */
+    function registerVoucherSetId(uint256 _tokenIdSupply, uint256 _nftTokenId)
+        external;
 
     /**
      * @notice Gets the contract address, where gate contract checks if quest NFT token exists
      * @return Address of contract that hold non transferable NFTs (quest NFTs)
      */
     function getNonTransferableTokenContract() external view returns (address);
 
-    function registerVoucherSetId(uint256 _tokenIdSupply, uint256 _nftTokenID)
-        external;
-
     /**
      * @notice Checks if user possesses the required quest NFT token for given voucher set
      * @param _user user address

diff --git a/contracts/interfaces/IVoucherKernel.sol b/contracts/interfaces/IVoucherKernel.sol
@@ -25,7 +25,7 @@ interface IVoucherKernel {
      * @param _depositSe   Seller's deposit
      * @param _depositBu   Buyer's deposit
      */
-    function createTokenSupplyID(
+    function createTokenSupplyId(
         address _seller,
         uint256 _validFrom,
         uint256 _validTo,

diff --git a/contracts/mocks/MockBosonRouter.sol b/contracts/mocks/MockBosonRouter.sol
@@ -154,7 +154,7 @@ contract MockBosonRouter is
         //hex"54" FISSION.code(FISSION.Category.Finance, FISSION.Status.InsufficientFunds)
 
         uint256 tokenIdSupply =
-            IVoucherKernel(voucherKernel).createTokenSupplyID(
+            IVoucherKernel(voucherKernel).createTokenSupplyId(
                 msg.sender,
                 metadata[0],
                 metadata[1],
@@ -208,7 +208,7 @@ contract MockBosonRouter is
         );
 
         uint256 tokenIdSupply =
-            IVoucherKernel(voucherKernel).createTokenSupplyID(
+            IVoucherKernel(voucherKernel).createTokenSupplyId(
                 msg.sender,
                 metadata[0],
                 metadata[1],
@@ -332,7 +332,7 @@ contract MockBosonRouter is
         );
 
         uint256 tokenIdSupply =
-            IVoucherKernel(voucherKernel).createTokenSupplyID(
+            IVoucherKernel(voucherKernel).createTokenSupplyId(
                 msg.sender,
                 metadata[0],
                 metadata[1],
@@ -378,7 +378,7 @@ contract MockBosonRouter is
         //hex"54" FISSION.code(FISSION.Category.Finance, FISSION.Status.InsufficientFunds)
 
         uint256 tokenIdSupply =
-            IVoucherKernel(voucherKernel).createTokenSupplyID(
+            IVoucherKernel(voucherKernel).createTokenSupplyId(
                 msg.sender,
                 metadata[0],
                 metadata[1],

diff --git a/contracts/mocks/MockGate.sol b/contracts/mocks/MockGate.sol
@@ -87,20 +87,20 @@ contract MockGate is IGate, Ownable, Pausable {
     /**
      * @notice Registers connection between setID and tokenID
      * @param _tokenIdSupply an ID of a supply token (ERC-1155) [voucherSetID]
-     * @param _nftTokenID an ID of a quest token
+     * @param _nftTokenId an ID of a quest token
      */
-    function registerVoucherSetId(uint256 _tokenIdSupply, uint256 _nftTokenID)
+    function registerVoucherSetId(uint256 _tokenIdSupply, uint256 _nftTokenId)
         external
         override
         whenNotPaused
         onlyFromRouter
     {
-        require(_nftTokenID != 0, "TOKEN_ID_0_NOT_ALLOWED");
+        require(_nftTokenId != 0, "TOKEN_ID_0_NOT_ALLOWED");
         require(_tokenIdSupply != 0, "INVALID_TOKEN_SUPPLY");
 
-        voucherToToken[_tokenIdSupply] = _nftTokenID;
+        voucherToToken[_tokenIdSupply] = _nftTokenId;
 
-        emit LogVoucherSetRegistered(_tokenIdSupply, _nftTokenID);
+        emit LogVoucherSetRegistered(_tokenIdSupply, _nftTokenId);
     }
 
     /**