From ef381e6b5080f744d38a360c265daab4d3ec0ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Cuesta=20Ca=C3=B1ada?= <mail@albertocuesta.es>
Date: Mon, 20 Jan 2020 22:32:50 +0000
Subject: [PATCH] Moved EnumerableSet to `utils`.

---
 contracts/mocks/EnumerableSetMock.sol         |  2 +-
 contracts/{drafts => utils}/EnumerableSet.sol |  0
 test/{drafts => utils}/EnumerableSet.test.js  | 34 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)
 rename contracts/{drafts => utils}/EnumerableSet.sol (100%)
 rename test/{drafts => utils}/EnumerableSet.test.js (51%)

diff --git a/contracts/mocks/EnumerableSetMock.sol b/contracts/mocks/EnumerableSetMock.sol
index 7e4b9d085..b4a1f3e79 100644
--- a/contracts/mocks/EnumerableSetMock.sol
+++ b/contracts/mocks/EnumerableSetMock.sol
@@ -1,5 +1,5 @@
 pragma solidity ^0.5.10;
-import "../drafts/EnumerableSet.sol";
+import "../utils/EnumerableSet.sol";
 
 
 /**
diff --git a/contracts/drafts/EnumerableSet.sol b/contracts/utils/EnumerableSet.sol
similarity index 100%
rename from contracts/drafts/EnumerableSet.sol
rename to contracts/utils/EnumerableSet.sol
diff --git a/test/drafts/EnumerableSet.test.js b/test/utils/EnumerableSet.test.js
similarity index 51%
rename from test/drafts/EnumerableSet.test.js
rename to test/utils/EnumerableSet.test.js
index 49a92fc0c..7353cfe3d 100644
--- a/test/drafts/EnumerableSet.test.js
+++ b/test/utils/EnumerableSet.test.js
@@ -11,41 +11,41 @@ const c = '0x0000000000000000000000000000000000000003';
 /** @test {EnumerableSet} contract */
 describe('EnumerableSet', function () {
   beforeEach(async function () {
-    this.enumerableSet = await EnumerableSetMock.new();
+    this.set = await EnumerableSetMock.new();
   });
 
   it('contains can return false.', async function () {
-    expect(await this.enumerableSet.testContains(a)).to.be.false;
+    expect(await this.set.testContains(a)).to.be.false;
   });
 
   it('adds an value.', async function () {
-    await this.enumerableSet.testAdd(a);
-    expect(await this.enumerableSet.testContains(a)).to.be.true;
+    await this.set.testAdd(a);
+    expect(await this.set.testContains(a)).to.be.true;
   });
 
   it('adds several values.', async function () {
-    await this.enumerableSet.testAdd(a);
-    await this.enumerableSet.testAdd(b);
-    expect(await this.enumerableSet.testContains(a)).to.be.true;
-    expect(await this.enumerableSet.testContains(b)).to.be.true;
-    expect(await this.enumerableSet.testContains(c)).to.be.false;
+    await this.set.testAdd(a);
+    await this.set.testAdd(b);
+    expect(await this.set.testContains(a)).to.be.true;
+    expect(await this.set.testContains(b)).to.be.true;
+    expect(await this.set.testContains(c)).to.be.false;
   });
 
   it('removes values.', async function () {
-    await this.enumerableSet.testAdd(a);
-    await this.enumerableSet.testRemove(a);
-    expect(await this.enumerableSet.testContains(a)).to.be.false;
+    await this.set.testAdd(a);
+    await this.set.testRemove(a);
+    expect(await this.set.testContains(a)).to.be.false;
   });
 
   it('Retrieve an empty array', async function () {
-    expect(await this.enumerableSet.testEnumerate()).to.be.empty;
+    expect(await this.set.testEnumerate()).to.be.empty;
   });
 
   it('Retrieve an array of values', async function () {
-    await this.enumerableSet.testAdd(a);
-    await this.enumerableSet.testAdd(b);
-    await this.enumerableSet.testAdd(c);
-    const result = (await this.enumerableSet.testEnumerate());
+    await this.set.testAdd(a);
+    await this.set.testAdd(b);
+    await this.set.testAdd(c);
+    const result = (await this.set.testEnumerate());
     expect(result.length).to.be.equal(3);
     expect(result[0]).to.be.equal(a);
     expect(result[1]).to.be.equal(b);