chore: fix tests

makerdao · Jan 10, 2024 · 8b394dc · 8b394dc
1 parent 48c5123
commit 8b394dc
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/DssSpell.t.sol b/src/DssSpell.t.sol
@@ -516,8 +516,7 @@ contract DssSpellTest is DssSpellTestBase {
         //   the address of the stream
         //   the planned fin of the stream (via variable defined above)
         // Initialize the array with the corrent number of yanks
-        Yank[2] memory yanks = [
-            Yank(21, wallets.addr("DECO_WALLET"), MARCH_31_2024),
+        Yank[1] memory yanks = [
             Yank(15, wallets.addr("SES_WALLET"), MARCH_31_2024)
         ];
 
@@ -537,6 +536,35 @@ contract DssSpellTest is DssSpellTestBase {
         }
     }
 
+    function testYankDAILegacy() public { // make private to disable
+        // Provide human-readable names for timestamps
+        uint256 MARCH_31_2024 = 1711929599;
+
+        // For each yanked stream, provide Yank object with:
+        //   the stream id
+        //   the address of the stream
+        //   the planned fin of the stream (via variable defined above)
+        // Initialize the array with the corrent number of yanks
+        Yank[1] memory yanks = [
+            Yank(21, wallets.addr("DECO_WALLET"), MARCH_31_2024)
+        ];
+
+        // Test stream id matches `addr` and `fin`
+        VestAbstract vest = VestAbstract(addr.addr("MCD_VEST_DAI_LEGACY"));
+        for (uint256 i = 0; i < yanks.length; i++) {
+            assertEq(vest.usr(yanks[i].streamId), yanks[i].addr, "testYankDAI/unexpected-address");
+            assertEq(vest.fin(yanks[i].streamId), yanks[i].finPlanned, "testYankDAI/unexpected-fin-date");
+        }
+
+        _vote(address(spell));
+        _scheduleWaitAndCast(address(spell));
+        assertTrue(spell.done());
+        for (uint256 i = 0; i < yanks.length; i++) {
+            // Test stream.fin is set to the current block after the spell
+            assertEq(vest.fin(yanks[i].streamId), block.timestamp, "testYankDAI/steam-not-yanked");
+        }
+    }
+
     function testYankMKR() private { // make private to disable
         // Provide human-readable names for timestamps
         uint256 MARCH_31_2024 = 1711929599;

diff --git a/src/test/config.sol b/src/test/config.sol
@@ -1704,7 +1704,7 @@ contract Config {
         });
         afterSpell.collaterals["DIRECT-SPARK-DAI"] = CollateralValues({
             aL_enabled:   true,
-            aL_line:      800 * MILLION,
+            aL_line:      1200 * MILLION,
             aL_gap:       20 * MILLION,
             aL_ttl:       12 hours,
             line:         0,