Merge dcb56eb into 4c9f635

pooltogether · Oct 5, 2021 · 6903be6 · 6903be6
2 parents 4c9f635 + dcb56eb
commit 6903be6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/contracts/Ticket.sol b/contracts/Ticket.sol
@@ -202,6 +202,8 @@ contract Ticket is ControlledToken, ITicket {
         uint224 balance = uint224(_balanceOf(msg.sender));
         address currentDelegate = delegates[msg.sender];
 
+        require(currentDelegate != to, "Ticket/delegate-already-set");
+
         if (currentDelegate != address(0)) {
             _decreaseUserTwab(msg.sender, currentDelegate, balance);
         } else {

diff --git a/contracts/interfaces/ITicket.sol b/contracts/interfaces/ITicket.sol
@@ -67,7 +67,8 @@ interface ITicket {
     * @dev    Transfers (including mints) trigger the storage of a TWAB in delegatee(s) account, instead of the
               targetted sender and/or recipient address(s).
     * @dev    "to" reset the delegatee use zero address (0x000.000)
-    * @param  to Receipient of delegated TWAB
+    * @dev Current delegate address should be different from the new delegate address `to`.
+    * @param  to Receipient of delegated TWAB.
    */
     function delegate(address to) external;
 

diff --git a/test/Ticket.test.ts b/test/Ticket.test.ts
@@ -855,17 +855,18 @@ describe('Ticket', () => {
             expect(await ticket.getBalanceAt(wallet2.address, timestamp)).to.equal(toWei('100'));
         });
 
-        it('should not decrease user balance if address zero is mistakenly passed', async () => {
+        it('should revert if delegate address has already been set to passed address', async () => {
             await ticket.mint(wallet1.address, toWei('100'));
+            await ticket.delegate(wallet2.address);
 
-            await expect(ticket.delegate(AddressZero))
-                .to.emit(ticket, 'Delegated')
-                .withArgs(wallet1.address, AddressZero);
+            await expect(ticket.delegate(wallet2.address)).to.be.revertedWith(
+                'Ticket/delegate-already-set',
+            );
 
             const timestamp = (await provider.getBlock('latest')).timestamp;
 
-            expect(await ticket.delegateOf(wallet1.address)).to.equal(AddressZero);
-            expect(await ticket.getBalanceAt(wallet1.address, timestamp)).to.equal(toWei('100'));
+            expect(await ticket.delegateOf(wallet1.address)).to.equal(wallet2.address);
+            expect(await ticket.getBalanceAt(wallet2.address, timestamp)).to.equal(toWei('100'));
         });
 
         it('should clear old delegates if any', async () => {