From 0ecce3094ae0133bbbe34e37c3f233ac5018e4a2 Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Mon, 28 Nov 2022 11:52:16 +0100 Subject: [PATCH] [utils] Remove Utils No longer required --- contracts/Marketplace.sol | 2 -- contracts/libs/Utils.sol | 27 --------------------------- 2 files changed, 29 deletions(-) delete mode 100644 contracts/libs/Utils.sol diff --git a/contracts/Marketplace.sol b/contracts/Marketplace.sol index dc511a9..d2152da 100644 --- a/contracts/Marketplace.sol +++ b/contracts/Marketplace.sol @@ -6,11 +6,9 @@ import "@openzeppelin/contracts/utils/math/Math.sol"; import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import "./Collateral.sol"; import "./Proofs.sol"; -import "./libs/Utils.sol"; contract Marketplace is Collateral, Proofs { using EnumerableSet for EnumerableSet.Bytes32Set; - using Utils for EnumerableSet.Bytes32Set; type RequestId is bytes32; type SlotId is bytes32; diff --git a/contracts/libs/Utils.sol b/contracts/libs/Utils.sol deleted file mode 100644 index 12ed64e..0000000 --- a/contracts/libs/Utils.sol +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.8; - -import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; - -library Utils { - using EnumerableSet for EnumerableSet.Bytes32Set; - - function filter( - EnumerableSet.Bytes32Set storage set, - function(bytes32) internal view returns (bool) include - ) internal view returns (bytes32[] memory result) { - bytes32[] memory selected = new bytes32[](set.length()); - uint256 amount = 0; - - for (uint256 i = 0; i < set.length(); i++) { - if (include(set.at(i))) { - selected[amount++] = set.at(i); - } - } - - result = new bytes32[](amount); - for (uint256 i = 0; i < result.length; i++) { - result[i] = selected[i]; - } - } -}