Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

221 ammount typo #233

Merged
merged 8 commits into from
Sep 13, 2024
Merged

221 ammount typo #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
056f28a
Fix ammount spelling from flowBasic FlowPreviewTest.sol
ninokeldishvili Sep 12, 2024
0c1f017
Fix ammount spelling from flowErc1155/FlowTest.sol
ninokeldishvili Sep 12, 2024
af72cdf
Fix ammount spelling from flowErc721/FlowPreviewTest.sol
ninokeldishvili Sep 12, 2024
261544f
Fix ammount spelling from flowErc20/FlowPreviewTest.sol
ninokeldishvili Sep 12, 2024
995eb0a
Fix ammount spelling from flowBasic/FlowTest.sol
ninokeldishvili Sep 12, 2024
faf990f
Fix ammount spelling from flowErc20/FlowTest.sol
ninokeldishvili Sep 12, 2024
cfc1fe1
Fix ammount spelling from flowErc721/FlowTest.sol
ninokeldishvili Sep 12, 2024
0535b47
Remove extra B from variable names
ninokeldishvili Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions test/concrete/flowBasic/FlowPreviewTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ contract FlowPreviewTest is FlowBasicTest {
function testFlowBasePreviewDefinedFlowIOForERC1155MultiElementArrays(
address alice,
uint256 erc1155OutTokenIdA,
uint256 erc1155OutAmmountA,
uint256 erc1155OutAmountA,
uint256 erc1155InTokenIdB,
uint256 erc1155InAmmountB
uint256 erc1155InAmountB
) external {
vm.assume(sentinel != erc1155OutTokenIdA);
vm.assume(sentinel != erc1155OutAmmountA);
vm.assume(sentinel != erc1155OutAmountA);
vm.assume(sentinel != erc1155InTokenIdB);
vm.assume(sentinel != erc1155InAmmountB);
vm.assume(sentinel != erc1155InAmountB);
vm.label(alice, "alice");

(IFlowV5 flow,) = deployFlow();
Expand All @@ -38,31 +38,31 @@ contract FlowPreviewTest is FlowBasicTest {
from: address(flow),
to: alice,
id: erc1155OutTokenIdA,
amount: erc1155OutAmmountA
amount: erc1155OutAmountA
});

erc1155Transfers[1] = ERC1155Transfer({
token: address(iTokenB),
from: address(flow),
to: alice,
id: erc1155InTokenIdB,
amount: erc1155InAmmountB
amount: erc1155InAmountB
});

erc1155Transfers[2] = ERC1155Transfer({
token: address(iTokenA),
from: alice,
to: address(flow),
id: erc1155OutTokenIdA,
amount: erc1155OutAmmountA
amount: erc1155OutAmountA
});

erc1155Transfers[3] = ERC1155Transfer({
token: address(iTokenB),
from: alice,
to: address(flow),
id: erc1155InTokenIdB,
amount: erc1155InAmmountB
amount: erc1155InAmountB
});

FlowTransferV1 memory flowTransfer =
Expand Down Expand Up @@ -114,11 +114,11 @@ contract FlowPreviewTest is FlowBasicTest {
*/
function testFlowBasePreviewDefinedFlowIOForERC20MultiElementArrays(
address alice,
uint256 erc20AmmountA,
uint256 erc20AmmountB
uint256 erc20AmountA,
uint256 erc20AmountB
) external {
vm.assume(sentinel != erc20AmmountA);
vm.assume(sentinel != erc20AmmountB);
vm.assume(sentinel != erc20AmountA);
vm.assume(sentinel != erc20AmountB);

vm.label(alice, "alice");

Expand All @@ -127,13 +127,13 @@ contract FlowPreviewTest is FlowBasicTest {

ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](4);
erc20Transfers[0] =
ERC20Transfer({token: address(iTokenA), from: address(flow), to: alice, amount: erc20AmmountA});
ERC20Transfer({token: address(iTokenA), from: address(flow), to: alice, amount: erc20AmountA});
erc20Transfers[1] =
ERC20Transfer({token: address(iTokenB), from: address(flow), to: alice, amount: erc20AmmountB});
ERC20Transfer({token: address(iTokenB), from: address(flow), to: alice, amount: erc20AmountB});
erc20Transfers[2] =
ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20AmmountA});
ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20AmountA});
erc20Transfers[3] =
ERC20Transfer({token: address(iTokenB), from: alice, to: address(flow), amount: erc20AmmountB});
ERC20Transfer({token: address(iTokenB), from: alice, to: address(flow), amount: erc20AmountB});

FlowTransferV1 memory flowTransfer =
FlowTransferV1(erc20Transfers, new ERC721Transfer[](0), new ERC1155Transfer[](0));
Expand All @@ -152,14 +152,14 @@ contract FlowPreviewTest is FlowBasicTest {
function testFlowBasePreviewDefinedFlowIOForERC1155SingleElementArrays(
address alice,
uint256 erc1155OutTokenId,
uint256 erc1155OutAmmount,
uint256 erc1155OutAmount,
uint256 erc1155InTokenId,
uint256 erc1155InAmmount
uint256 erc1155InAmount
) external {
vm.assume(sentinel != erc1155OutTokenId);
vm.assume(sentinel != erc1155OutAmmount);
vm.assume(sentinel != erc1155OutAmount);
vm.assume(sentinel != erc1155InTokenId);
vm.assume(sentinel != erc1155InAmmount);
vm.assume(sentinel != erc1155InAmount);
vm.label(alice, "alice");

(IFlowV5 flow,) = deployFlow();
Expand All @@ -172,15 +172,15 @@ contract FlowPreviewTest is FlowBasicTest {
from: address(flow),
to: alice,
id: erc1155OutTokenId,
amount: erc1155OutAmmount
amount: erc1155OutAmount
});

erc1155Transfers[1] = ERC1155Transfer({
token: address(iTokenA),
from: alice,
to: address(flow),
id: erc1155InTokenId,
amount: erc1155InAmmount
amount: erc1155InAmount
});

FlowTransferV1 memory flowTransfer =
Expand Down Expand Up @@ -228,11 +228,11 @@ contract FlowPreviewTest is FlowBasicTest {
*/
function testFlowBasePreviewDefinedFlowIOForERC20SingleElementArrays(
address alice,
uint256 erc20AmmountIn,
uint256 erc20AmmountOut
uint256 erc20AmountIn,
uint256 erc20AmountOut
) external {
vm.assume(sentinel != erc20AmmountIn);
vm.assume(sentinel != erc20AmmountOut);
vm.assume(sentinel != erc20AmountIn);
vm.assume(sentinel != erc20AmountOut);

vm.label(alice, "alice");

Expand All @@ -241,9 +241,9 @@ contract FlowPreviewTest is FlowBasicTest {

ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2);
erc20Transfers[0] =
ERC20Transfer({token: address(iTokenA), from: address(flow), to: alice, amount: erc20AmmountOut});
ERC20Transfer({token: address(iTokenA), from: address(flow), to: alice, amount: erc20AmountOut});
erc20Transfers[1] =
ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20AmmountIn});
ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20AmountIn});

FlowTransferV1 memory flowTransfer =
FlowTransferV1(erc20Transfers, new ERC721Transfer[](0), new ERC1155Transfer[](0));
Expand Down
82 changes: 41 additions & 41 deletions test/concrete/flowBasic/FlowTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ contract FlowTest is FlowBasicTest {
address alice,
uint256 erc721InTokenId,
uint256 erc1155OutTokenId,
uint256 erc1155OutAmmount
uint256 erc1155OutAmount
) external {
vm.assume(sentinel != erc721InTokenId);
vm.assume(sentinel != erc1155OutTokenId);
vm.assume(sentinel != erc1155OutAmmount);
vm.assume(sentinel != erc1155OutAmount);

vm.label(alice, "Alice");

Expand All @@ -46,14 +46,14 @@ contract FlowTest is FlowBasicTest {
from: address(flow),
to: alice,
id: erc1155OutTokenId,
amount: erc1155OutAmmount
amount: erc1155OutAmount
});

vm.mockCall(iTokenB, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), "");
vm.expectCall(
iTokenB,
abi.encodeWithSelector(
IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmmount, ""
IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmount, ""
)
);

Expand Down Expand Up @@ -112,14 +112,14 @@ contract FlowTest is FlowBasicTest {
function testFlowERC1155ToERC1155(
address alice,
uint256 erc1155OutTokenId,
uint256 erc1155OutAmmount,
uint256 erc1155BInTokenId,
uint256 erc1155BInAmmount
uint256 erc1155OutAmount,
uint256 erc1155InTokenId,
uint256 erc1155InAmount
) external {
vm.assume(sentinel != erc1155OutTokenId);
vm.assume(sentinel != erc1155OutAmmount);
vm.assume(sentinel != erc1155BInTokenId);
vm.assume(sentinel != erc1155BInAmmount);
vm.assume(sentinel != erc1155OutAmount);
vm.assume(sentinel != erc1155InTokenId);
vm.assume(sentinel != erc1155InAmount);
vm.label(alice, "alice");

(IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow();
Expand All @@ -131,30 +131,30 @@ contract FlowTest is FlowBasicTest {
from: address(flow),
to: alice,
id: erc1155OutTokenId,
amount: erc1155OutAmmount
amount: erc1155OutAmount
});

erc1155Transfers[1] = ERC1155Transfer({
token: address(iTokenB),
from: alice,
to: address(flow),
id: erc1155BInTokenId,
amount: erc1155BInAmmount
id: erc1155InTokenId,
amount: erc1155InAmount
});

vm.mockCall(iTokenA, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), "");
vm.expectCall(
iTokenA,
abi.encodeWithSelector(
IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmmount, ""
IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmount, ""
)
);

vm.mockCall(iTokenB, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), "");
vm.expectCall(
iTokenB,
abi.encodeWithSelector(
IERC1155.safeTransferFrom.selector, alice, flow, erc1155BInTokenId, erc1155BInAmmount, ""
IERC1155.safeTransferFrom.selector, alice, flow, erc1155InTokenId, erc1155InAmount, ""
)
);

Expand All @@ -168,9 +168,9 @@ contract FlowTest is FlowBasicTest {
vm.stopPrank();
}

function testFlowERC721ToERC721(address bob, uint256 erc721OutTokenId, uint256 erc721BInTokenId) external {
function testFlowERC721ToERC721(address bob, uint256 erc721OutTokenId, uint256 erc721InTokenId) external {
vm.assume(sentinel != erc721OutTokenId);
vm.assume(sentinel != erc721BInTokenId);
vm.assume(sentinel != erc721InTokenId);
vm.label(bob, "Bob");

(IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow();
Expand All @@ -180,7 +180,7 @@ contract FlowTest is FlowBasicTest {
erc721Transfers[0] =
ERC721Transfer({token: address(iTokenA), from: address(flow), to: bob, id: erc721OutTokenId});
erc721Transfers[1] =
ERC721Transfer({token: address(iTokenB), from: bob, to: address(flow), id: erc721BInTokenId});
ERC721Transfer({token: address(iTokenB), from: bob, to: address(flow), id: erc721InTokenId});

vm.mockCall(iTokenA, abi.encodeWithSelector(bytes4(keccak256("safeTransferFrom(address,address,uint256)"))), "");
vm.expectCall(
Expand All @@ -194,7 +194,7 @@ contract FlowTest is FlowBasicTest {
vm.expectCall(
iTokenB,
abi.encodeWithSelector(
bytes4(keccak256("safeTransferFrom(address,address,uint256)")), bob, flow, erc721BInTokenId
bytes4(keccak256("safeTransferFrom(address,address,uint256)")), bob, flow, erc721InTokenId
)
);

Expand All @@ -208,25 +208,25 @@ contract FlowTest is FlowBasicTest {
vm.stopPrank();
}

function testFlowERC20ToERC20(address alise, uint256 erc20OutAmmount, uint256 erc20BInAmmount) external {
vm.assume(sentinel != erc20OutAmmount);
vm.assume(sentinel != erc20BInAmmount);
function testFlowERC20ToERC20(address alise, uint256 erc20OutAmount, uint256 erc20InAmount) external {
vm.assume(sentinel != erc20OutAmount);
vm.assume(sentinel != erc20InAmount);
vm.label(alise, "Alise");

(IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow();
assumeEtchable(alise, address(flow));

ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2);
erc20Transfers[0] =
ERC20Transfer({token: address(iTokenA), from: address(flow), to: alise, amount: erc20OutAmmount});
ERC20Transfer({token: address(iTokenA), from: address(flow), to: alise, amount: erc20OutAmount});
erc20Transfers[1] =
ERC20Transfer({token: address(iTokenB), from: alise, to: address(flow), amount: erc20BInAmmount});
ERC20Transfer({token: address(iTokenB), from: alise, to: address(flow), amount: erc20InAmount});

vm.mockCall(iTokenA, abi.encodeWithSelector(IERC20.transfer.selector), abi.encode(true));
vm.expectCall(iTokenA, abi.encodeWithSelector(IERC20.transfer.selector, alise, erc20OutAmmount));
vm.expectCall(iTokenA, abi.encodeWithSelector(IERC20.transfer.selector, alise, erc20OutAmount));

vm.mockCall(iTokenB, abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true));
vm.expectCall(iTokenB, abi.encodeWithSelector(IERC20.transferFrom.selector, alise, flow, erc20BInAmmount));
vm.expectCall(iTokenB, abi.encodeWithSelector(IERC20.transferFrom.selector, alise, flow, erc20InAmount));

uint256[] memory stack =
generateFlowStack(FlowTransferV1(erc20Transfers, new ERC721Transfer[](0), new ERC1155Transfer[](0)));
Expand All @@ -241,9 +241,9 @@ contract FlowTest is FlowBasicTest {
function testFlowShouldErrorIfERC20FlowFromIsOtherThanSourceContractOrMsgSender(
address alise,
address bob,
uint256 erc20Ammount
uint256 erc20Amount
) external {
vm.assume(sentinel != erc20Ammount);
vm.assume(sentinel != erc20Amount);
vm.assume(bob != alise);
vm.label(alise, "Alise");
vm.label(bob, "Bob");
Expand All @@ -255,9 +255,9 @@ contract FlowTest is FlowBasicTest {
{
ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2);
erc20Transfers[0] =
ERC20Transfer({token: address(iTokenA), from: bob, to: address(flow), amount: erc20Ammount});
ERC20Transfer({token: address(iTokenA), from: bob, to: address(flow), amount: erc20Amount});
erc20Transfers[1] =
ERC20Transfer({token: address(iTokenB), from: address(flow), to: alise, amount: erc20Ammount});
ERC20Transfer({token: address(iTokenB), from: address(flow), to: alise, amount: erc20Amount});

uint256[] memory stack =
generateFlowStack(FlowTransferV1(erc20Transfers, new ERC721Transfer[](0), new ERC1155Transfer[](0)));
Expand All @@ -273,8 +273,8 @@ contract FlowTest is FlowBasicTest {
{
ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2);
erc20Transfers[0] =
ERC20Transfer({token: address(iTokenA), from: alise, to: address(flow), amount: erc20Ammount});
erc20Transfers[1] = ERC20Transfer({token: address(iTokenB), from: bob, to: alise, amount: erc20Ammount});
ERC20Transfer({token: address(iTokenA), from: alise, to: address(flow), amount: erc20Amount});
erc20Transfers[1] = ERC20Transfer({token: address(iTokenB), from: bob, to: alise, amount: erc20Amount});
vm.mockCall(iTokenA, abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true));

uint256[] memory stack =
Expand Down Expand Up @@ -327,15 +327,15 @@ contract FlowTest is FlowBasicTest {
address alise,
address bob,
uint256 erc1155OutTokenId,
uint256 erc1155OutAmmount,
uint256 erc1155BInTokenId,
uint256 erc1155BInAmmount
uint256 erc1155OutAmount,
uint256 erc1155InTokenId,
uint256 erc1155InAmount
) external {
vm.assume(bob != alise);
vm.assume(sentinel != erc1155OutTokenId);
vm.assume(sentinel != erc1155OutAmmount);
vm.assume(sentinel != erc1155BInTokenId);
vm.assume(sentinel != erc1155BInAmmount);
vm.assume(sentinel != erc1155OutAmount);
vm.assume(sentinel != erc1155InTokenId);
vm.assume(sentinel != erc1155InAmount);
vm.label(alise, "Alise");
vm.label(bob, "Bob");

Expand All @@ -351,15 +351,15 @@ contract FlowTest is FlowBasicTest {
from: bob,
to: address(flow),
id: erc1155OutTokenId,
amount: erc1155OutAmmount
amount: erc1155OutAmount
});

erc1155Transfers[1] = ERC1155Transfer({
token: address(iTokenB),
from: address(flow),
to: alise,
id: erc1155BInTokenId,
amount: erc1155BInAmmount
id: erc1155InTokenId,
amount: erc1155InAmount
});

uint256[] memory stack =
Expand Down
Loading
Loading