refactor: replace streamDurations with endTime in Vars struct

sablier-labs · Feb 12, 2024 · 9abd3c1 · 9abd3c1
1 parent dd1f751
commit 9abd3c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/test/fork/merkle-lockup/MerkleLockupLD.t.sol b/test/fork/merkle-lockup/MerkleLockupLD.t.sol
@@ -42,6 +42,7 @@ abstract contract MerkleLockupLD_Fork_Test is Fork_Test {
         uint128 clawbackAmount;
         address expectedLockupLD;
         MerkleLockup.ConstructorParams baseParams;
+        uint40 endTime;
         LockupDynamic.Stream expectedStream;
         uint256 expectedStreamId;
         uint256[] indexes;
@@ -51,7 +52,6 @@ abstract contract MerkleLockupLD_Fork_Test is Fork_Test {
         bytes32 merkleRoot;
         address[] recipients;
         uint256 recipientsCount;
-        uint40[] streamDurations;
         LockupDynamic.SegmentWithDuration[][] segments;
         LockupDynamic.Segment[][] segmentsWithTimestamps;
     }
@@ -78,7 +78,6 @@ abstract contract MerkleLockupLD_Fork_Test is Fork_Test {
         vars.recipients = new address[](vars.recipientsCount);
         vars.segments = new LockupDynamic.SegmentWithDuration[][](vars.recipientsCount);
         vars.segmentsWithTimestamps = new LockupDynamic.Segment[][](vars.recipientsCount);
-        vars.streamDurations = new uint40[](vars.recipientsCount);
 
         for (uint256 i = 0; i < vars.recipientsCount; ++i) {
             vm.assume(params.leafData[i].segments.length > 0);
@@ -102,9 +101,6 @@ abstract contract MerkleLockupLD_Fork_Test is Fork_Test {
 
             vars.segments[i] = params.leafData[i].segments;
             vars.segmentsWithTimestamps[i] = getSegmentsWithTimestamps(params.leafData[i].segments);
-
-            vars.streamDurations[i] =
-                vars.segmentsWithTimestamps[i][params.leafData[i].segments.length - 1].timestamp - getBlockTimestamp();
         }
 
         leaves = new uint256[](vars.recipientsCount);
@@ -176,11 +172,15 @@ abstract contract MerkleLockupLD_Fork_Test is Fork_Test {
             merkleProof: getProof(leaves.toBytes32(), vars.leafPos)
         });
 
+        vars.endTime = vars.segmentsWithTimestamps[params.posBeforeSort][params.leafData[params.posBeforeSort]
+            .segments
+            .length - 1].timestamp;
+
         vars.actualStream = lockupDynamic.getStream(vars.actualStreamId);
         vars.expectedStream = LockupDynamic.Stream({
             amounts: Lockup.Amounts({ deposited: vars.amounts[params.posBeforeSort], refunded: 0, withdrawn: 0 }),
             asset: asset,
-            endTime: uint40(block.timestamp) + vars.streamDurations[params.posBeforeSort],
+            endTime: vars.endTime,
             isCancelable: defaults.CANCELABLE(),
             isDepleted: false,
             isStream: true,