cleanup

pooltogether · Mar 18, 2022 · 4db11e4 · 4db11e4
1 parent ed4433d
commit 4db11e4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 31 deletions.
diff --git a/contracts/PrizeTierHistoryV2.sol b/contracts/PrizeTierHistoryV2.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.6;
 import "@pooltogether/owner-manager-contracts/contracts/Manageable.sol";
-import "./abstract/IdBinarySearchLib.sol";
+import "./abstract/IdBinarySearch.sol";
 
-contract PrizeTierHistoryV2 is IdBinarySearchLib, Manageable {
+contract PrizeTierHistoryV2 is IdBinarySearch, Manageable {
 
     struct PrizeTier {
         uint8 bitRangeSize;

diff --git a/contracts/abstract/DrawIDBinarySearch.sol b/contracts/abstract/DrawIDBinarySearch.sol
diff --git a/contracts/abstract/IdBinarySearchLib.sol → contracts/abstract/IdBinarySearch.sol b/contracts/abstract/IdBinarySearchLib.sol → contracts/abstract/IdBinarySearch.sol
@@ -2,13 +2,13 @@
 pragma solidity 0.8.6;
 
 /**
- * @title  PoolTogether V4 IdBinarySearchLib
+ * @title  PoolTogether V4 IdBinarySearch
  * @author PoolTogether Inc Team
- * @notice IdBinarySearchLib uses binary search to find a parent contract struct with the drawId parameter
+ * @notice IdBinarySearch uses binary search to find a parent contract struct with the drawId parameter
  * @dev    The implementing contract must provider access to a struct (i.e. PrizeTier) list with is both
  *         sorted and indexed by the drawId field for binary search to work.
  */
-abstract contract IdBinarySearchLib {
+abstract contract IdBinarySearch {
     /**
      * @notice Get newest index in array
      */
@@ -28,7 +28,7 @@ abstract contract IdBinarySearchLib {
         uint32 oldestDrawId = getIdForIndex(leftSide);
         uint32 newestDrawId = getIdForIndex(rightSide);
 
-        require(_drawId >= oldestDrawId, "IdBinarySearchLib/draw-id-out-of-range");
+        require(_drawId >= oldestDrawId, "IdBinarySearch/draw-id-out-of-range");
         if (_drawId >= newestDrawId) return rightSide;
         if (_drawId == oldestDrawId) return leftSide;
 

diff --git a/contracts/test/DrawIDAndStructMappingBinarySearch.sol b/contracts/test/DrawIDAndStructMappingBinarySearch.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.6;
-import "../abstract/IdBinarySearchLib.sol";
+import "../abstract/IdBinarySearch.sol";
 
-contract DrawIDAndStructMappingBinarySearch is IdBinarySearchLib {
+contract DrawIDAndStructMappingBinarySearch is IdBinarySearch {
     struct Draw {
         uint32 drawId;
         uint256 randomNumber;

diff --git a/test/PrizeTierHistoryV2.test.ts b/test/PrizeTierHistoryV2.test.ts
@@ -103,7 +103,7 @@ describe('PrizeTierHistoryV2', () => {
         it('should fail to get a PrizeTer after history range', async () => {
             await prizeTierHistory.push(prizeTiers[2]);
             await expect(prizeTierHistory.getPrizeTier(4)).to.be.revertedWith(
-                'IdBinarySearchLib/draw-id-out-of-range',
+                'IdBinarySearch/draw-id-out-of-range',
             );
         });
     });