From 0ac83ce289987ad4250f67e5fc61af0f47650096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Cuesta=20Ca=C3=B1ada?=
 <38806121+albertocuestacanada@users.noreply.github.com>
Date: Thu, 30 Jan 2020 18:42:21 +0000
Subject: [PATCH] Fix EnumerableSetMock for 2.5.rc1 (#2069)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Drafted Enumerable.sol.

* Drafted test framework.

* Tweaked the tests to follow oz structure.

* Coded EnumerableSet.

* Moved EnumerableSet to `utils`.

* Fixed linting.

* Improved comments.

* Tweaked contract description.

* Renamed struct to AddressSet.

* Relaxed version pragma to 0.5.0

* Removed events.

* Revert on useless operations.

* Small comment.

* Created AddressSet factory method.

* Failed transactions return false.

* Transactions now return false on failure.

* Remove comments from mock

* Rename mock functions

* Adapt tests to code style, use test-helpers

* Fix bug in remove, improve tests.

* Add changelog entry

* Add entry on Utils doc

* Add optimization for removal of last slot

* Update docs

* Fix headings of utilities documentation

* Simplified mock.

* Fixed comment.

* Revert "Fixed comment."

This reverts commit 39627f9a6f90d48be20ca1449fe03e1699b48173.

* Revert "Simplified mock."

This reverts commit 67468e464b038736251f18e1dc2e368c9091a87a.

* Simplified mock.

Co-authored-by: Nicolás Venturo <nicolas.venturo@gmail.com>
(cherry picked from commit 8975289c6b85caeedae815ebada00c6236a4ecce)
---
 contracts/mocks/EnumerableSetMock.sol | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contracts/mocks/EnumerableSetMock.sol b/contracts/mocks/EnumerableSetMock.sol
index 407ee6c15..4ef4fa04a 100644
--- a/contracts/mocks/EnumerableSetMock.sol
+++ b/contracts/mocks/EnumerableSetMock.sol
@@ -14,20 +14,20 @@ contract EnumerableSetMock{
     }
 
     function contains(address value) public view returns (bool) {
-        return EnumerableSet.contains(set, value);
+        return set.contains(value);
     }
 
     function add(address value) public {
-        bool result = EnumerableSet.add(set, value);
+        bool result = set.add(value);
         emit TransactionResult(result);
     }
 
     function remove(address value) public {
-        bool result = EnumerableSet.remove(set, value);
+        bool result = set.remove(value);
         emit TransactionResult(result);
     }
 
     function enumerate() public view returns (address[] memory) {
-        return EnumerableSet.enumerate(set);
+        return set.enumerate();
     }
 }