Transactions now return false on failure.
This commit is contained in:
@ -8,9 +8,10 @@ import "../utils/EnumerableSet.sol";
|
||||
* @author Alberto Cuesta Cañada
|
||||
*/
|
||||
contract EnumerableSetMock{
|
||||
|
||||
using EnumerableSet for EnumerableSet.AddressSet;
|
||||
|
||||
event TransactionResult(bool result);
|
||||
|
||||
EnumerableSet.AddressSet private set;
|
||||
|
||||
constructor() public {
|
||||
@ -34,7 +35,8 @@ contract EnumerableSetMock{
|
||||
function testAdd(address value)
|
||||
public
|
||||
{
|
||||
EnumerableSet.add(set, value);
|
||||
bool result = EnumerableSet.add(set, value);
|
||||
emit TransactionResult(result);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -43,7 +45,8 @@ contract EnumerableSetMock{
|
||||
function testRemove(address remove)
|
||||
public
|
||||
{
|
||||
EnumerableSet.remove(set, remove);
|
||||
bool result = EnumerableSet.remove(set, remove);
|
||||
emit TransactionResult(result);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -39,7 +39,7 @@ library EnumerableSet {
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Add a value. O(1).
|
||||
* @dev Add a value. O(1). Returns false if the value was already in the set.
|
||||
*/
|
||||
function add(AddressSet storage set, address value)
|
||||
internal
|
||||
@ -47,13 +47,14 @@ library EnumerableSet {
|
||||
{
|
||||
if (!contains(set, value)){
|
||||
set.index[value] = set.values.push(value);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Remove a value. O(1).
|
||||
* @dev Remove a value. O(1). Returns false if the calue was not present in the set.
|
||||
*/
|
||||
function remove(AddressSet storage set, address value)
|
||||
internal
|
||||
@ -64,6 +65,7 @@ library EnumerableSet {
|
||||
set.values[set.index[value] - 1] = set.values[set.values.length - 1];
|
||||
set.values.pop();
|
||||
delete set.index[value];
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -18,7 +18,9 @@ describe('EnumerableSet', function () {
|
||||
});
|
||||
|
||||
it('adds a value.', async function () {
|
||||
await this.set.testAdd(a);
|
||||
const transaction = await this.set.testAdd(a);
|
||||
expect(transaction.logs[0].event).to.equal('TransactionResult');
|
||||
expect(transaction.logs[0].args.result).to.equal(true);
|
||||
expect(await this.set.testContains(a)).to.equal(true);
|
||||
});
|
||||
|
||||
@ -30,20 +32,26 @@ describe('EnumerableSet', function () {
|
||||
expect(await this.set.testContains(c)).to.equal(false);
|
||||
});
|
||||
|
||||
/* it('adding same value twice returns false.', async function () {
|
||||
it('adding same value twice returns false.', async function () {
|
||||
await this.set.testAdd(a);
|
||||
expect(await this.set.testAdd(a)).to.equal(false);
|
||||
}); */
|
||||
const transaction = (await this.set.testAdd(a));
|
||||
expect(transaction.logs[0].event).to.equal('TransactionResult');
|
||||
expect(transaction.logs[0].args.result).to.equal(false);
|
||||
});
|
||||
|
||||
it('removes values.', async function () {
|
||||
await this.set.testAdd(a);
|
||||
await this.set.testRemove(a);
|
||||
const transaction = await this.set.testRemove(a);
|
||||
expect(transaction.logs[0].event).to.equal('TransactionResult');
|
||||
expect(transaction.logs[0].args.result).to.equal(true);
|
||||
expect(await this.set.testContains(a)).to.equal(false);
|
||||
});
|
||||
|
||||
/* it('removing values that are not in the set returns false.', async function () {
|
||||
expect(await this.set.testRemove(a)).to.equal(false);
|
||||
}); */
|
||||
it('removing values that are not in the set returns false.', async function () {
|
||||
const transaction = await this.set.testRemove(a);
|
||||
expect(transaction.logs[0].event).to.equal('TransactionResult');
|
||||
expect(transaction.logs[0].args.result).to.equal(false);
|
||||
});
|
||||
|
||||
it('enumerates values as an empty array', async function () {
|
||||
expect(await this.set.testEnumerate()).to.eql([]);
|
||||
|
||||
Reference in New Issue
Block a user