Fixing tests for rolling deposits

thesis · Apr 4, 2024 · dde4c23 · dde4c23
1 parent 68b4cc1
commit dde4c23
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/core/contracts/test/MezoPortalStub.sol b/core/contracts/test/MezoPortalStub.sol
@@ -13,7 +13,9 @@ contract MezoPortalStub {
         address token,
         uint256 depositId,
         uint96 amount
-    ) external {}
+    ) external {
+        IERC20(token).safeTransfer(msg.sender, amount);
+    }
 
     function deposit(address token, uint96 amount, uint32 lockPeriod) external {
         depositCount++;

diff --git a/core/test/MezoAllocator.test.ts b/core/test/MezoAllocator.test.ts
@@ -18,13 +18,11 @@ import { to1e18 } from "./utils"
 const { getNamedSigners, getUnnamedSigners } = helpers.signers
 
 async function fixture() {
-  const { tbtc, stbtc, dispatcher, mezoAllocator, mezoPortal } =
-    await deployment()
+  const { tbtc, stbtc, mezoAllocator, mezoPortal } = await deployment()
   const { governance, maintainer } = await getNamedSigners()
   const [thirdParty] = await getUnnamedSigners()
 
   return {
-    dispatcher,
     governance,
     thirdParty,
     maintainer,
@@ -98,17 +96,13 @@ describe("MezoAllocator", () => {
           )
         })
 
-        it("should populate deposits array", async () => {
-          expect(await mezoAllocator.deposits(0)).to.equal(1)
-        })
-
         it("should set deposit balance", async () => {
-          const deposit = await mezoAllocator.depositsById(1)
+          const deposit = await mezoAllocator.depositInfo()
           expect(deposit.balance).to.equal(to1e18(1))
         })
 
         it("should set creation timestamp", async () => {
-          const deposit = await mezoAllocator.depositsById(1)
+          const deposit = await mezoAllocator.depositInfo()
           const dateTime = new Date()
           // Check if the block timestamp is within 60 seconds of the current
           // test time
@@ -119,7 +113,7 @@ describe("MezoAllocator", () => {
         })
 
         it("should set unlocking timestamp", async () => {
-          const deposit = await mezoAllocator.depositsById(1)
+          const deposit = await mezoAllocator.depositInfo()
           const dateTime = new Date()
           // Check if the block timestamp is within 60 seconds of the current
           // test time
@@ -130,10 +124,9 @@ describe("MezoAllocator", () => {
         })
 
         it("should emit Deposit event", async () => {
-          const latestDepositId = await mezoAllocator.deposits(0)
           await expect(tx)
             .to.emit(mezoAllocator, "DepositAllocated")
-            .withArgs(latestDepositId, to1e18(1))
+            .withArgs(0, 1, to1e18(1))
         })
       })
 
@@ -147,13 +140,15 @@ describe("MezoAllocator", () => {
           await mezoAllocator.connect(maintainer).allocate(to1e18(5))
         })
 
-        it("should increment the deposits array", async () => {
-          expect(await mezoAllocator.deposits(1)).to.equal(2)
+        it("should increment the deposit id", async () => {
+          const depositInfo = await mezoAllocator.depositInfo()
+          expect(depositInfo.id).to.equal(2)
         })
 
-        it("should populate deposits mapping", async () => {
-          const deposit = await mezoAllocator.depositsById(2)
-          expect(deposit.balance).to.equal(to1e18(5))
+        it("should populate deposit balance", async () => {
+          const deposit = await mezoAllocator.depositInfo()
+          // 1 + 5 = 6
+          expect(deposit.balance).to.equal(to1e18(6))
         })
       })
     })