test(anvil): fix block mining interval

morpho-org · Oct 24, 2024 · 0cb3217 · 0cb3217
1 parent 6696d5a
commit 0cb3217
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 33 deletions.
diff --git a/packages/blue-sdk-ethers/test/e2e/Market.test.ts b/packages/blue-sdk-ethers/test/e2e/Market.test.ts
@@ -76,11 +76,6 @@ describe("augment/Market", () => {
       functionName: "enableIrm",
       args: [params.irm],
     });
-
-    const timestamp = (await client.timestamp()) + 3n;
-
-    await client.setNextBlockTimestamp({ timestamp });
-
     await client.writeContract({
       address: morpho,
       abi: blueAbi,
@@ -94,7 +89,7 @@ describe("augment/Market", () => {
       totalSupplyShares: 0n,
       totalBorrowAssets: 0n,
       totalBorrowShares: 0n,
-      lastUpdate: BigInt(timestamp),
+      lastUpdate: await client.timestamp(),
       fee: 0n,
       price: 1160095030000000000000000000000000000n,
       rateAtTarget: undefined,
@@ -113,10 +108,6 @@ describe("augment/Market", () => {
       ...crvUsd_stkcvx2BTC,
       oracle: randomAddress(),
     });
-
-    const timestamp = (await client.timestamp()) + 3n;
-
-    await client.setNextBlockTimestamp({ timestamp });
     await client.writeContract({
       address: morpho,
       abi: blueAbi,
@@ -130,7 +121,7 @@ describe("augment/Market", () => {
       totalSupplyShares: 0n,
       totalBorrowAssets: 0n,
       totalBorrowShares: 0n,
-      lastUpdate: 1711597274n,
+      lastUpdate: 1711597272n,
       fee: 0n,
       rateAtTarget: 1268391679n,
     });

diff --git a/packages/blue-sdk-ethers/test/e2e/Vault.test.ts b/packages/blue-sdk-ethers/test/e2e/Vault.test.ts
@@ -69,7 +69,7 @@ describe("augment/Vault", () => {
         "0x3a85e619751152991742810df6ec69ce473daef99e28a64ab2340d7b7ccfee49" as MarketId,
       ],
       lastTotalAssets: 26129569140552n,
-      totalAssets: 26138939802936n,
+      totalAssets: 26138940196162n,
       totalSupply: 25752992371062043744406063n,
     });
 

diff --git a/packages/blue-sdk-viem/test/Market.test.ts b/packages/blue-sdk-viem/test/Market.test.ts
@@ -75,11 +75,6 @@ describe("augment/Market", () => {
       functionName: "enableIrm",
       args: [params.irm],
     });
-
-    const timestamp = (await client.timestamp()) + 3n;
-
-    await client.setNextBlockTimestamp({ timestamp });
-
     await client.writeContract({
       address: morpho,
       abi: blueAbi,
@@ -93,7 +88,7 @@ describe("augment/Market", () => {
       totalSupplyShares: 0n,
       totalBorrowAssets: 0n,
       totalBorrowShares: 0n,
-      lastUpdate: BigInt(timestamp),
+      lastUpdate: await client.timestamp(),
       fee: 0n,
       price: 1160095030000000000000000000000000000n,
       rateAtTarget: undefined,
@@ -109,10 +104,6 @@ describe("augment/Market", () => {
       ...crvUsd_stkcvx2BTC,
       oracle: randomAddress(),
     });
-
-    const timestamp = (await client.timestamp()) + 3n;
-
-    await client.setNextBlockTimestamp({ timestamp });
     await client.writeContract({
       address: morpho,
       abi: blueAbi,
@@ -126,7 +117,7 @@ describe("augment/Market", () => {
       totalSupplyShares: 0n,
       totalBorrowAssets: 0n,
       totalBorrowShares: 0n,
-      lastUpdate: 1711597274n,
+      lastUpdate: 1711597272n,
       fee: 0n,
       rateAtTarget: 1268391679n,
     });

diff --git a/packages/blue-sdk-viem/test/Vault.test.ts b/packages/blue-sdk-viem/test/Vault.test.ts
@@ -69,7 +69,7 @@ describe("augment/Vault", () => {
         "0x3a85e619751152991742810df6ec69ce473daef99e28a64ab2340d7b7ccfee49" as MarketId,
       ],
       lastTotalAssets: 26129569140552n,
-      totalAssets: 26138939802936n,
+      totalAssets: 26138940196162n,
       totalSupply: 25752992371062043744406063n,
     });
 

diff --git a/packages/liquidation-sdk-viem/test/examples/whitelisted-erc4626-1inch.test.ts b/packages/liquidation-sdk-viem/test/examples/whitelisted-erc4626-1inch.test.ts
@@ -956,7 +956,7 @@ describe("erc4626-1inch", () => {
       });
 
       expect(format.number.of(decimalBalance, decimals)).toBeCloseTo(
-        7325.591839,
+        7325.591893,
         6,
       );
     },

diff --git a/packages/simulation-sdk-wagmi/test/hooks/useSimulationState.test.ts b/packages/simulation-sdk-wagmi/test/hooks/useSimulationState.test.ts
@@ -411,9 +411,6 @@ describe("useSimulationState", () => {
 
     expect(data0).toBe(steps[0]);
 
-    await client.setNextBlockTimestamp({
-      timestamp: data0.block.timestamp + 1n,
-    });
     await client.approve({
       address: usdc,
       args: [morpho, amount],
@@ -432,9 +429,6 @@ describe("useSimulationState", () => {
     expect(data1).toStrictEqual(step1);
 
     await client.setBalance({ address: morpho, value: parseEther("1") });
-    await client.setNextBlockTimestamp({
-      timestamp: data1.block.timestamp + 1n,
-    });
     await client.writeContract({
       account: morpho,
       address: usdc,

diff --git a/packages/test-viem/src/vitest.ts b/packages/test-viem/src/vitest.ts
@@ -25,9 +25,12 @@ export const createViemTest = <chain extends Chain>(
     client: async ({}, use) => {
       const { rpcUrl, stop } = await spawnAnvil(parameters);
 
-      let client: AnvilTestClient<chain>;
+      const client = createAnvilTestClient(http(rpcUrl), chain);
 
-      await use((client = createAnvilTestClient(http(rpcUrl), chain)));
+      // Make block timestamp 100% predictable.
+      await client.setBlockTimestampInterval({ interval: 1 });
+
+      await use(client);
 
       await stop();
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -956,7 +956,7 @@ describe("erc4626-1inch", () => { @@
           });
           expect(format.number.of(decimalBalance, decimals)).toBeCloseTo(
-.591839,
+.591893,
 ,
           );
         },
@@ Expand Down @@