Merge 7dc1e05 into 7cf134f

wearekickback · Sep 10, 2019 · 124f7a5 · 124f7a5
2 parents 7cf134f + 7dc1e05
commit 124f7a5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/AbstractConference.sol b/contracts/AbstractConference.sol
@@ -212,8 +212,8 @@ contract AbstractConference is Conference, GroupAdmin {
                 _totalAttended++;
             }
         }
-        // since maps can contain more bits than there are registrants, we cap the value!
-        totalAttended = _totalAttended < registered ? _totalAttended : registered;
+        require(_totalAttended <= registered, 'should not have more attendees than registered');
+        totalAttended = _totalAttended;
 
         if (totalAttended > 0) {
             payoutAmount = uint256(totalBalance()) / totalAttended;

diff --git a/test/behaviors/conference.behavior.js b/test/behaviors/conference.behavior.js
@@ -270,15 +270,15 @@ function shouldBehaveLikeConference () {
       await conference.payoutAmount().should.eventually.eq(mulBN(deposit, 4))
     })
 
-    it('correctly calculates total attended even if more 1 bits are set than there are registrations', async function() {
+    it('does not allow finalising with more attendees than registered', async function() {
       // all attended
       let n = toBN(0)
       for (let i = 0; i < 256; i++) {
         n = n.bincn(i)
       }
-      await conference.finalize([n], {from:owner});
+      await conference.finalize([n], {from:owner}).should.be.rejected;
 
-      await conference.totalAttended().should.eventually.eq(4)
+      await conference.totalAttended().should.eventually.eq(0)
     })
 
     it('correctly updates attendee records', async function() {

diff --git a/test/behaviors/stress.behavior.js b/test/behaviors/stress.behavior.js
@@ -92,7 +92,7 @@ const reportFinalize = async (participants, ctx) => {
     // build bitmaps
     const numRegistered = addresses.length;
     let num = toBN(0);
-    for (let i = 0; i < 256; i++) {
+    for (let i = 0; i < numRegistered; i++) {
       num = num.bincn(i)
     }
     const maps = [];