Draft and lifecycles directories cleanup (#2122)

* Move Pausable into utils

* Move Strings into utils

* Move Counters into utils

* Move SignedSafeMath into math

* Remove ERC1046

* Make ERC20Snapshot.snapshot internal

* Move ERC20Snapshot into ERC20

* Add drafts deprecation notice

* Remove drafts directory

* Add changelog entry

* Apply suggestions from code review

Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>

Co-authored-by: Francisco Giordano <frangio.1@gmail.com>

test/utils/Counters.test.js

@@ -0,0 +1,61 @@
+const { contract } = require('@openzeppelin/test-environment');
+const { expectRevert } = require('@openzeppelin/test-helpers');
+
+const { expect } = require('chai');
+
+const CountersImpl = contract.fromArtifact('CountersImpl');
+
+describe('Counters', function () {
+  beforeEach(async function () {
+    this.counter = await CountersImpl.new();
+  });
+
+  it('starts at zero', async function () {
+    expect(await this.counter.current()).to.be.bignumber.equal('0');
+  });
+
+  describe('increment', function () {
+    it('increments the current value by one', async function () {
+      await this.counter.increment();
+      expect(await this.counter.current()).to.be.bignumber.equal('1');
+    });
+
+    it('can be called multiple times', async function () {
+      await this.counter.increment();
+      await this.counter.increment();
+      await this.counter.increment();
+
+      expect(await this.counter.current()).to.be.bignumber.equal('3');
+    });
+  });
+
+  describe('decrement', function () {
+    beforeEach(async function () {
+      await this.counter.increment();
+      expect(await this.counter.current()).to.be.bignumber.equal('1');
+    });
+
+    it('decrements the current value by one', async function () {
+      await this.counter.decrement();
+      expect(await this.counter.current()).to.be.bignumber.equal('0');
+    });
+
+    it('reverts if the current value is 0', async function () {
+      await this.counter.decrement();
+      await expectRevert(this.counter.decrement(), 'SafeMath: subtraction overflow');
+    });
+
+    it('can be called multiple times', async function () {
+      await this.counter.increment();
+      await this.counter.increment();
+
+      expect(await this.counter.current()).to.be.bignumber.equal('3');
+
+      await this.counter.decrement();
+      await this.counter.decrement();
+      await this.counter.decrement();
+
+      expect(await this.counter.current()).to.be.bignumber.equal('0');
+    });
+  });
+});

test/utils/Pausable.test.js

@@ -0,0 +1,91 @@
+const { accounts, contract } = require('@openzeppelin/test-environment');
+
+const { expectEvent, expectRevert } = require('@openzeppelin/test-helpers');
+
+const { expect } = require('chai');
+
+const PausableMock = contract.fromArtifact('PausableMock');
+
+describe('Pausable', function () {
+  const [ pauser ] = accounts;
+
+  beforeEach(async function () {
+    this.pausable = await PausableMock.new();
+  });
+
+  context('when unpaused', function () {
+    beforeEach(async function () {
+      expect(await this.pausable.paused()).to.equal(false);
+    });
+
+    it('can perform normal process in non-pause', async function () {
+      expect(await this.pausable.count()).to.be.bignumber.equal('0');
+
+      await this.pausable.normalProcess();
+      expect(await this.pausable.count()).to.be.bignumber.equal('1');
+    });
+
+    it('cannot take drastic measure in non-pause', async function () {
+      await expectRevert(this.pausable.drasticMeasure(),
+        'Pausable: not paused'
+      );
+      expect(await this.pausable.drasticMeasureTaken()).to.equal(false);
+    });
+
+    context('when paused', function () {
+      beforeEach(async function () {
+        ({ logs: this.logs } = await this.pausable.pause({ from: pauser }));
+      });
+
+      it('emits a Paused event', function () {
+        expectEvent.inLogs(this.logs, 'Paused', { account: pauser });
+      });
+
+      it('cannot perform normal process in pause', async function () {
+        await expectRevert(this.pausable.normalProcess(), 'Pausable: paused');
+      });
+
+      it('can take a drastic measure in a pause', async function () {
+        await this.pausable.drasticMeasure();
+        expect(await this.pausable.drasticMeasureTaken()).to.equal(true);
+      });
+
+      it('reverts when re-pausing', async function () {
+        await expectRevert(this.pausable.pause(), 'Pausable: paused');
+      });
+
+      describe('unpausing', function () {
+        it('is unpausable by the pauser', async function () {
+          await this.pausable.unpause();
+          expect(await this.pausable.paused()).to.equal(false);
+        });
+
+        context('when unpaused', function () {
+          beforeEach(async function () {
+            ({ logs: this.logs } = await this.pausable.unpause({ from: pauser }));
+          });
+
+          it('emits an Unpaused event', function () {
+            expectEvent.inLogs(this.logs, 'Unpaused', { account: pauser });
+          });
+
+          it('should resume allowing normal process', async function () {
+            expect(await this.pausable.count()).to.be.bignumber.equal('0');
+            await this.pausable.normalProcess();
+            expect(await this.pausable.count()).to.be.bignumber.equal('1');
+          });
+
+          it('should prevent drastic measure', async function () {
+            await expectRevert(this.pausable.drasticMeasure(),
+              'Pausable: not paused'
+            );
+          });
+
+          it('reverts when re-unpausing', async function () {
+            await expectRevert(this.pausable.unpause(), 'Pausable: not paused');
+          });
+        });
+      });
+    });
+  });
+});

test/utils/Strings.test.js

@@ -0,0 +1,26 @@
+const { contract } = require('@openzeppelin/test-environment');
+const { constants } = require('@openzeppelin/test-helpers');
+
+const { expect } = require('chai');
+
+const StringsMock = contract.fromArtifact('StringsMock');
+
+describe('Strings', function () {
+  beforeEach(async function () {
+    this.strings = await StringsMock.new();
+  });
+
+  describe('from uint256', function () {
+    it('converts 0', async function () {
+      expect(await this.strings.fromUint256(0)).to.equal('0');
+    });
+
+    it('converts a positive number', async function () {
+      expect(await this.strings.fromUint256(4132)).to.equal('4132');
+    });
+
+    it('converts MAX_UINT256', async function () {
+      expect(await this.strings.fromUint256(constants.MAX_UINT256)).to.equal(constants.MAX_UINT256.toString());
+    });
+  });
+});