Skip to content
This repository has been archived by the owner on Jan 31, 2025. It is now read-only.

Commit

Permalink
build: update bun lock file (#294)
Browse files Browse the repository at this point in the history
test: use StreamLL struct
  • Loading branch information
andreivladbrg authored Feb 21, 2024
1 parent 536be9e commit 77a1191
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Binary file modified bun.lockb
Binary file not shown.
2 changes: 1 addition & 1 deletion test/fork/batch/createWithTimestampsLL.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ abstract contract CreateWithTimestamps_LockupLinear_Batch_Fork_Test is Fork_Test
params.batchSize = boundUint128(params.batchSize, 1, 20);
params.perStreamAmount = boundUint128(params.perStreamAmount, 1, MAX_UINT128 / params.batchSize);
params.range.start = boundUint40(params.range.start, getBlockTimestamp(), getBlockTimestamp() + 24 hours);
params.range.cliff = boundUint40(params.range.cliff, params.range.start, params.range.start + 52 weeks);
params.range.cliff = boundUint40(params.range.cliff, params.range.start + 1, params.range.start + 52 weeks);
params.range.end = boundUint40(params.range.end, params.range.cliff + 1 seconds, MAX_UNIX_TIMESTAMP);

checkUsers(params.sender, params.recipient);
Expand Down
6 changes: 3 additions & 3 deletions test/fork/merkle-lockup/MerkleLockupLL.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ abstract contract MerkleLockupLL_Fork_Test is Fork_Test {

struct Vars {
uint256 actualStreamId;
LockupLinear.Stream actualStream;
LockupLinear.StreamLL actualStream;
uint128[] amounts;
uint256 aggregateAmount;
uint128 clawbackAmount;
address expectedLockupLL;
MerkleLockup.ConstructorParams baseParams;
LockupLinear.Stream expectedStream;
LockupLinear.StreamLL expectedStream;
uint256 expectedStreamId;
uint256[] indexes;
uint256 leafPos;
Expand Down Expand Up @@ -160,7 +160,7 @@ abstract contract MerkleLockupLL_Fork_Test is Fork_Test {
});

vars.actualStream = lockupLinear.getStream(vars.actualStreamId);
vars.expectedStream = LockupLinear.Stream({
vars.expectedStream = LockupLinear.StreamLL({
amounts: Lockup.Amounts({ deposited: vars.amounts[params.posBeforeSort], refunded: 0, withdrawn: 0 }),
asset: ASSET,
cliffTime: uint40(block.timestamp) + defaults.CLIFF_DURATION(),
Expand Down
4 changes: 2 additions & 2 deletions test/integration/merkle-lockup/ll/claim/claim.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ contract Claim_Integration_Test is MerkleLockup_Integration_Test {
emit Claim(defaults.INDEX1(), users.recipient1, defaults.CLAIM_AMOUNT(), expectedStreamId);
uint256 actualStreamId = claimLL();

LockupLinear.Stream memory actualStream = lockupLinear.getStream(actualStreamId);
LockupLinear.Stream memory expectedStream = LockupLinear.Stream({
LockupLinear.StreamLL memory actualStream = lockupLinear.getStream(actualStreamId);
LockupLinear.StreamLL memory expectedStream = LockupLinear.StreamLL({
amounts: Lockup.Amounts({ deposited: defaults.CLAIM_AMOUNT() - feeAmount, refunded: 0, withdrawn: 0 }),
asset: dai,
cliffTime: uint40(block.timestamp) + defaults.CLIFF_DURATION(),
Expand Down

0 comments on commit 77a1191

Please sign in to comment.