Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

v2.1.1

test/utils/Address.test.js

@@ -0,0 +1,19 @@
+const AddressImpl = artifacts.require('AddressImpl');
+const SimpleToken = artifacts.require('SimpleTokenMock');
+
+require('../helpers/setup');
+
+contract('Address', function ([_, anyone]) {
+  beforeEach(async function () {
+    this.mock = await AddressImpl.new();
+  });
+
+  it('should return false for account address', async function () {
+    (await this.mock.isContract(anyone)).should.equal(false);
+  });
+
+  it('should return true for contract address', async function () {
+    const contract = await SimpleToken.new();
+    (await this.mock.isContract(contract.address)).should.equal(true);
+  });
+});

test/utils/Arrays.test.js

@@ -0,0 +1,83 @@
+const ArraysImpl = artifacts.require('ArraysImpl');
+
+require('../helpers/setup');
+
+contract('Arrays', function () {
+  context('Even number of elements', function () {
+    const EVEN_ELEMENTS_ARRAY = [11, 12, 13, 14, 15, 16, 17, 18, 19, 20];
+
+    beforeEach(async function () {
+      this.arrays = await ArraysImpl.new(EVEN_ELEMENTS_ARRAY);
+    });
+
+    it('should return correct index for the basic case', async function () {
+      (await this.arrays.findUpperBound(16)).should.be.bignumber.equal(5);
+    });
+
+    it('should return 0 for the first element', async function () {
+      (await this.arrays.findUpperBound(11)).should.be.bignumber.equal(0);
+    });
+
+    it('should return index of the last element', async function () {
+      (await this.arrays.findUpperBound(20)).should.be.bignumber.equal(9);
+    });
+
+    it('should return first index after last element if searched value is over the upper boundary', async function () {
+      (await this.arrays.findUpperBound(32)).should.be.bignumber.equal(10);
+    });
+
+    it('should return 0 for the element under the lower boundary', async function () {
+      (await this.arrays.findUpperBound(2)).should.be.bignumber.equal(0);
+    });
+  });
+
+  context('Odd number of elements', function () {
+    const ODD_ELEMENTS_ARRAY = [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21];
+
+    beforeEach(async function () {
+      this.arrays = await ArraysImpl.new(ODD_ELEMENTS_ARRAY);
+    });
+
+    it('should return correct index for the basic case', async function () {
+      (await this.arrays.findUpperBound(16)).should.be.bignumber.equal(5);
+    });
+
+    it('should return 0 for the first element', async function () {
+      (await this.arrays.findUpperBound(11)).should.be.bignumber.equal(0);
+    });
+
+    it('should return index of the last element', async function () {
+      (await this.arrays.findUpperBound(21)).should.be.bignumber.equal(10);
+    });
+
+    it('should return first index after last element if searched value is over the upper boundary', async function () {
+      (await this.arrays.findUpperBound(32)).should.be.bignumber.equal(11);
+    });
+
+    it('should return 0 for the element under the lower boundary', async function () {
+      (await this.arrays.findUpperBound(2)).should.be.bignumber.equal(0);
+    });
+  });
+
+  context('Array with gap', function () {
+    const WITH_GAP_ARRAY = [11, 12, 13, 14, 15, 20, 21, 22, 23, 24];
+
+    beforeEach(async function () {
+      this.arrays = await ArraysImpl.new(WITH_GAP_ARRAY);
+    });
+
+    it('should return index of first element in next filled range', async function () {
+      (await this.arrays.findUpperBound(17)).should.be.bignumber.equal(5);
+    });
+  });
+
+  context('Empty array', function () {
+    beforeEach(async function () {
+      this.arrays = await ArraysImpl.new([]);
+    });
+
+    it('should always return 0 for empty array', async function () {
+      (await this.arrays.findUpperBound(10)).should.be.bignumber.equal(0);
+    });
+  });
+});

test/utils/ReentrancyGuard.test.js

@@ -0,0 +1,29 @@
+const shouldFail = require('../helpers/shouldFail');
+const ReentrancyMock = artifacts.require('ReentrancyMock');
+const ReentrancyAttack = artifacts.require('ReentrancyAttack');
+
+require('../helpers/setup');
+
+contract('ReentrancyGuard', function () {
+  beforeEach(async function () {
+    this.reentrancyMock = await ReentrancyMock.new();
+    (await this.reentrancyMock.counter()).should.be.bignumber.equal(0);
+  });
+
+  it('should not allow remote callback', async function () {
+    const attacker = await ReentrancyAttack.new();
+    await shouldFail.reverting(this.reentrancyMock.countAndCall(attacker.address));
+  });
+
+  // The following are more side-effects than intended behavior:
+  // I put them here as documentation, and to monitor any changes
+  // in the side-effects.
+
+  it('should not allow local recursion', async function () {
+    await shouldFail.reverting(this.reentrancyMock.countLocalRecursive(10));
+  });
+
+  it('should not allow indirect local recursion', async function () {
+    await shouldFail.reverting(this.reentrancyMock.countThisRecursive(10));
+  });
+});