Merge branch 'feature/drain' into feature/todos

iExecBlockchainComputing · Jun 10, 2024 · a8bde54 · a8bde54
2 parents 884cc0b + 5a137b1
commit a8bde54
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/contracts/VoucherHub.sol b/contracts/VoucherHub.sol
@@ -259,9 +259,8 @@ contract VoucherHub is
      * @param voucher address of the expired voucher to drain
      */
     function drainVoucher(address voucher) external {
-        VoucherHubStorage storage $ = _getVoucherHubStorage();
-        require($._isVoucher[voucher], "VoucherHub: unknown voucher");
         uint256 amount = balanceOf(voucher);
+        require(amount > 0, "VoucherHub: nothing to drain");
         _burn(voucher, amount);
         emit VoucherDrained(voucher, amount);
         Voucher(voucher).drain(amount);

diff --git a/test/VoucherHub.test.ts b/test/VoucherHub.test.ts
@@ -1016,7 +1016,21 @@ describe('VoucherHub', function () {
                 voucherHubWithVoucherManagerSigner.drainVoucher(
                     ethers.Wallet.createRandom().address,
                 ),
-            ).to.be.revertedWith('VoucherHub: unknown voucher');
+            ).to.be.revertedWith('VoucherHub: nothing to drain');
+        });
+
+        it('Should not drain if balance is empty', async function () {
+            // Expire voucher
+            const expirationDate = await voucher.getExpiration();
+            await time.setNextBlockTimestamp(expirationDate + 100n); // after expiration
+            // Drain to empty the voucher from its balance.
+            await voucherHubWithVoucherManagerSigner
+                .drainVoucher(voucherAddress)
+                .then((tx) => tx.wait());
+            // Drain a second time when balance is empty.
+            await expect(
+                voucherHubWithVoucherManagerSigner.drainVoucher(voucherAddress),
+            ).to.be.revertedWith('VoucherHub: nothing to drain');
         });
     });