Merge branch 'master' into rbac-migration

contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol

@@ -20,29 +20,12 @@ contract IndividuallyCappedCrowdsale is Crowdsale, CapperRole {
    * @param _beneficiary Address to be capped
    * @param _cap Wei limit for individual contribution
    */
-  function setUserCap(address _beneficiary, uint256 _cap) external onlyCapper {
+  function setCap(address _beneficiary, uint256 _cap) external onlyCapper {
     caps_[_beneficiary] = _cap;
   }
 
   /**
-   * @dev Sets a group of users' maximum contribution.
-   * @param _beneficiaries List of addresses to be capped
-   * @param _cap Wei limit for individual contribution
-   */
-  function setGroupCap(
-    address[] _beneficiaries,
-    uint256 _cap
-  )
-    external
-    onlyCapper
-  {
-    for (uint256 i = 0; i < _beneficiaries.length; i++) {
-      caps_[_beneficiaries[i]] = _cap;
-    }
-  }
-
-  /**
-   * @dev Returns the cap of a specific user.
+   * @dev Returns the cap of a specific beneficiary.
    * @param _beneficiary Address whose cap is to be checked
    * @return Current cap for individual beneficiary
    */

test/crowdsale/IndividuallyCappedCrowdsale.test.js

@@ -37,18 +37,18 @@ contract('IndividuallyCappedCrowdsale', function (
 
   describe('individual caps', function () {
     it('sets a cap when the sender is a capper', async function () {
-      await this.crowdsale.setUserCap(alice, capAlice, { from: capper });
-      (await this.crowdsale.getUserCap(alice)).should.be.bignumber.equal(capAlice);
+      await this.crowdsale.setCap(alice, capAlice, { from: capper });
+      (await this.crowdsale.getCap(alice)).should.be.bignumber.equal(capAlice);
     });
 
     it('reverts when a non-capper sets a cap', async function () {
-      await expectThrow(this.crowdsale.setUserCap(alice, capAlice, { from: anyone }), EVMRevert);
+      await expectThrow(this.crowdsale.setCap(alice, capAlice, { from: anyone }), EVMRevert);
     });
 
     context('with individual caps', function () {
       beforeEach(async function () {
-        await this.crowdsale.setUserCap(alice, capAlice, { from: capper });
-        await this.crowdsale.setUserCap(bob, capBob, { from: capper });
+        await this.crowdsale.setCap(alice, capAlice, { from: capper });
+        await this.crowdsale.setCap(bob, capBob, { from: capper });
         await this.token.transfer(this.crowdsale.address, tokenSupply);
       });
 
@@ -80,57 +80,12 @@ contract('IndividuallyCappedCrowdsale', function (
 
       describe('reporting state', function () {
         it('should report correct cap', async function () {
-          (await this.crowdsale.getUserCap(alice)).should.be.bignumber.equal(capAlice);
+          (await this.crowdsale.getCap(alice)).should.be.bignumber.equal(capAlice);
         });
 
         it('should report actual contribution', async function () {
           await this.crowdsale.buyTokens(alice, { value: lessThanCapAlice });
-          (await this.crowdsale.getUserContribution(alice)).should.be.bignumber.equal(lessThanCapAlice);
-        });
-      });
-    });
-  });
-
-  describe('group capping', function () {
-    it('sets caps when the sender is a capper', async function () {
-      await this.crowdsale.setGroupCap([bob, charlie], capBob, { from: capper });
-      (await this.crowdsale.getUserCap(bob)).should.be.bignumber.equal(capBob);
-      (await this.crowdsale.getUserCap(charlie)).should.be.bignumber.equal(capBob);
-    });
-
-    it('reverts when a non-capper set caps', async function () {
-      await expectThrow(this.crowdsale.setGroupCap([bob, charlie], capBob, { from: anyone }), EVMRevert);
-    });
-
-    context('with group caps', function () {
-      beforeEach(async function () {
-        await this.crowdsale.setGroupCap([bob, charlie], capBob, { from: capper });
-        await this.token.transfer(this.crowdsale.address, tokenSupply);
-      });
-
-      describe('accepting payments', function () {
-        it('should accept payments within cap', async function () {
-          await this.crowdsale.buyTokens(bob, { value: lessThanCapBoth });
-          await this.crowdsale.buyTokens(charlie, { value: lessThanCapBoth });
-        });
-
-        it('should reject payments outside cap', async function () {
-          await this.crowdsale.buyTokens(bob, { value: capBob });
-          await expectThrow(this.crowdsale.buyTokens(bob, { value: 1 }), EVMRevert);
-          await this.crowdsale.buyTokens(charlie, { value: capBob });
-          await expectThrow(this.crowdsale.buyTokens(charlie, { value: 1 }), EVMRevert);
-        });
-
-        it('should reject payments that exceed cap', async function () {
-          await expectThrow(this.crowdsale.buyTokens(bob, { value: capBob.plus(1) }), EVMRevert);
-          await expectThrow(this.crowdsale.buyTokens(charlie, { value: capBob.plus(1) }), EVMRevert);
-        });
-      });
-
-      describe('reporting state', function () {
-        it('should report correct cap', async function () {
-          (await this.crowdsale.getUserCap(bob)).should.be.bignumber.equal(capBob);
-          (await this.crowdsale.getUserCap(charlie)).should.be.bignumber.equal(capBob);
+          (await this.crowdsale.getContribution(alice)).should.be.bignumber.equal(lessThanCapAlice);
         });
       });
     });