Skip to content

Commit

Permalink
Fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
byshape committed Jan 10, 2024
1 parent 17a935c commit 729b74a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions test/integration/EscrowFactory.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract IntegrationEscrowFactoryTest is BaseSetup {
/* bytes memory extraData */,
bytes memory extension,
Escrow srcClone
) = _prepareDataSrc(secret, srcAmount, dstAmount);
) = _prepareDataSrc(secret, srcAmount, dstAmount, false);

(uint8 v, bytes32 r, bytes32 s) = vm.sign(alice, orderHash);
bytes32 vs = bytes32((uint256(v - 27) << 255)) | s;
Expand Down Expand Up @@ -60,7 +60,7 @@ contract IntegrationEscrowFactoryTest is BaseSetup {
/* bytes memory extraData */,
bytes memory extension,
/* Escrow srcClone */
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT);
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT, false);

(uint8 v, bytes32 r, bytes32 s) = vm.sign(alice, orderHash);
bytes32 vs = bytes32((uint256(v - 27) << 255)) | s;
Expand Down
10 changes: 5 additions & 5 deletions test/unit/Escrow.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ contract EscrowTest is BaseSetup {
bytes memory extraData,
/* bytes memory extension */,
Escrow srcClone
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT);
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT, true);

usdc.transfer(address(srcClone), MAKING_AMOUNT);

Expand Down Expand Up @@ -67,7 +67,7 @@ contract EscrowTest is BaseSetup {
bytes memory extraData,
/* bytes memory extension */,
Escrow srcClone
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT);
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT, true);

usdc.transfer(address(srcClone), MAKING_AMOUNT);

Expand Down Expand Up @@ -125,7 +125,7 @@ contract EscrowTest is BaseSetup {
bytes memory extraData,
/* bytes memory extension */,
Escrow srcClone
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT);
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT, true);

usdc.transfer(address(srcClone), MAKING_AMOUNT);

Expand Down Expand Up @@ -236,7 +236,7 @@ contract EscrowTest is BaseSetup {
bytes memory extraData,
/* bytes memory extension */,
Escrow srcClone
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT);
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT, true);

usdc.transfer(address(srcClone), MAKING_AMOUNT);

Expand Down Expand Up @@ -271,7 +271,7 @@ contract EscrowTest is BaseSetup {
bytes memory extraData,
/* bytes memory extension */,
Escrow srcClone
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT);
) = _prepareDataSrc(SECRET, MAKING_AMOUNT, TAKING_AMOUNT, true);

usdc.transfer(address(srcClone), MAKING_AMOUNT);

Expand Down
4 changes: 2 additions & 2 deletions test/unit/EscrowFactory.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ contract EscrowFactoryTest is BaseSetup {
bytes memory extraData,
/* bytes memory extension */,
Escrow srcClone
) = _prepareDataSrc(secret, srcAmount, dstAmount);
) = _prepareDataSrc(secret, srcAmount, dstAmount, true);

usdc.transfer(address(srcClone), srcAmount);

Expand Down Expand Up @@ -74,7 +74,7 @@ contract EscrowFactoryTest is BaseSetup {
bytes memory extraData,
/* bytes memory extension */,
/* Escrow srcClone */
) = _prepareDataSrc(secret, srcAmount, dstAmount);
) = _prepareDataSrc(secret, srcAmount, dstAmount, true);

vm.prank(address(limitOrderProtocol));
vm.expectRevert(IEscrowFactory.InsufficientEscrowBalance.selector);
Expand Down

0 comments on commit 729b74a

Please sign in to comment.