change Moloch.sol ragequit variable names and cleanup

supersuperrookie · Jan 16, 2020 · 5b01708 · 5b01708
1 parent 18a692c
commit 5b01708
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/contracts/Moloch.sol b/contracts/Moloch.sol
@@ -556,11 +556,11 @@ contract Moloch is ReentrancyGuard {
         totalLoot = totalLoot.sub(lootToBurn);
 
         for (uint256 i = 0; i < tokens.length; i++) {
-            uint256 userBalance = fairShare(userTokenBalances[GUILD][tokens[i]], sharesAndLootToBurn, initialTotalSharesAndLoot);
+            uint256 amountToRagequit = fairShare(userTokenBalances[GUILD][tokens[i]], sharesAndLootToBurn, initialTotalSharesAndLoot);
             // deliberately not using safemath here to keep overflows from preventing the function execution (which would break ragekicks)
             // if a token overflows, it is because the supply was artificially inflated to oblivion, so we probably don't care about it anyways
-            userTokenBalances[GUILD][tokens[i]] = userTokenBalances[GUILD][tokens[i]] - userBalance;
-            userTokenBalances[memberAddress][tokens[i]] = userTokenBalances[memberAddress][tokens[i]] + userBalance;
+            userTokenBalances[GUILD][tokens[i]] -= amountToRagequit;
+            userTokenBalances[memberAddress][tokens[i]] += amountToRagequit;
         }
 
         emit Ragequit(msg.sender, sharesToBurn, lootToBurn);

diff --git a/test/molochV2-multitoken.test.js b/test/molochV2-multitoken.test.js
@@ -158,7 +158,7 @@ contract('Moloch', ([creator, summoner, applicant1, applicant2, processor, deleg
     await restore(snapshotId)
   })
 
-  describe('rageQuit - multi-token', async () => {
+  describe('multi-token ragequit + withdraw', async () => {
     beforeEach(async () => {
       // 1st proposal for with token alpha tribute
       await fundAndApproveToMoloch({
@@ -380,6 +380,11 @@ contract('Moloch', ([creator, summoner, applicant1, applicant2, processor, deleg
           }
         })
       })
+
+      // TODO
+      it('withdraw tokens works', async () => {
+
+      })
     })
   })
 })