From 056f28a31e67e36c40fca95c6cd1890d765d43cf Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 16:56:43 +0400 Subject: [PATCH 1/8] Fix ammount spelling from flowBasic FlowPreviewTest.sol --- test/concrete/flowBasic/FlowPreviewTest.sol | 56 ++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/test/concrete/flowBasic/FlowPreviewTest.sol b/test/concrete/flowBasic/FlowPreviewTest.sol index e9092a7e..8ad48072 100644 --- a/test/concrete/flowBasic/FlowPreviewTest.sol +++ b/test/concrete/flowBasic/FlowPreviewTest.sol @@ -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(); @@ -38,7 +38,7 @@ contract FlowPreviewTest is FlowBasicTest { from: address(flow), to: alice, id: erc1155OutTokenIdA, - amount: erc1155OutAmmountA + amount: erc1155OutAmountA }); erc1155Transfers[1] = ERC1155Transfer({ @@ -46,7 +46,7 @@ contract FlowPreviewTest is FlowBasicTest { from: address(flow), to: alice, id: erc1155InTokenIdB, - amount: erc1155InAmmountB + amount: erc1155InAmountB }); erc1155Transfers[2] = ERC1155Transfer({ @@ -54,7 +54,7 @@ contract FlowPreviewTest is FlowBasicTest { from: alice, to: address(flow), id: erc1155OutTokenIdA, - amount: erc1155OutAmmountA + amount: erc1155OutAmountA }); erc1155Transfers[3] = ERC1155Transfer({ @@ -62,7 +62,7 @@ contract FlowPreviewTest is FlowBasicTest { from: alice, to: address(flow), id: erc1155InTokenIdB, - amount: erc1155InAmmountB + amount: erc1155InAmountB }); FlowTransferV1 memory flowTransfer = @@ -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"); @@ -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)); @@ -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(); @@ -172,7 +172,7 @@ contract FlowPreviewTest is FlowBasicTest { from: address(flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -180,7 +180,7 @@ contract FlowPreviewTest is FlowBasicTest { from: alice, to: address(flow), id: erc1155InTokenId, - amount: erc1155InAmmount + amount: erc1155InAmount }); FlowTransferV1 memory flowTransfer = @@ -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"); @@ -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)); From 0c1f0178fd72439b6020875421e63356137def5c Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 17:06:37 +0400 Subject: [PATCH 2/8] Fix ammount spelling from flowErc1155/FlowTest.sol --- test/concrete/flowErc1155/FlowTest.sol | 74 +++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/test/concrete/flowErc1155/FlowTest.sol b/test/concrete/flowErc1155/FlowTest.sol index afb44eea..af21bed2 100644 --- a/test/concrete/flowErc1155/FlowTest.sol +++ b/test/concrete/flowErc1155/FlowTest.sol @@ -30,13 +30,13 @@ contract Erc1155FlowTest is FlowERC1155Test { address alice, uint256 erc721InTokenId, uint256 erc1155OutTokenId, - uint256 erc1155OutAmmount, + uint256 erc1155OutAmount, string memory uri, uint256 id ) external { vm.assume(sentinel != erc721InTokenId); vm.assume(sentinel != erc1155OutTokenId); - vm.assume(sentinel != erc1155OutAmmount); + vm.assume(sentinel != erc1155OutAmount); vm.assume(address(0) != alice); vm.assume(!alice.isContract()); @@ -57,7 +57,7 @@ contract Erc1155FlowTest is FlowERC1155Test { from: address(flowErc1155), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); ERC1155SupplyChange[] memory mints = new ERC1155SupplyChange[](1); @@ -77,7 +77,7 @@ contract Erc1155FlowTest is FlowERC1155Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, flowErc1155, alice, erc1155OutTokenId, erc1155OutAmmount, "" + IERC1155.safeTransferFrom.selector, flowErc1155, alice, erc1155OutTokenId, erc1155OutAmount, "" ) ); @@ -98,14 +98,14 @@ contract Erc1155FlowTest is FlowERC1155Test { } function testFlowERC1155FlowERC20ToERC20( - uint256 erc1155OutAmmount, - uint256 erc20BInAmmount, + uint256 erc1155OutAmount, + uint256 erc20InAmount, string memory uri, uint256 fuzzedKeyAlice, uint256 id ) external { - vm.assume(sentinel != erc1155OutAmmount); - vm.assume(sentinel != erc20BInAmmount); + vm.assume(sentinel != erc1155OutAmount); + vm.assume(sentinel != erc20InAmount); // Ensure the fuzzed key is within the valid range for secp256k1 uint256 aliceKey = (fuzzedKeyAlice % (SECP256K1_ORDER - 1)) + 1; @@ -116,22 +116,22 @@ contract Erc1155FlowTest is FlowERC1155Test { ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2); erc20Transfers[0] = - ERC20Transfer({token: address(iTokenA), from: address(erc1155Flow), to: alice, amount: erc1155OutAmmount}); + ERC20Transfer({token: address(iTokenA), from: address(erc1155Flow), to: alice, amount: erc1155OutAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc1155Flow), amount: erc20BInAmmount}); + ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc1155Flow), amount: erc20InAmount}); vm.startPrank(alice); vm.mockCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector), abi.encode(true)); - vm.expectCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc1155OutAmmount)); + vm.expectCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc1155OutAmount)); vm.mockCall(address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true)); vm.expectCall( - address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc1155Flow, erc20BInAmmount) + address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc1155Flow, erc20InAmount) ); ERC1155SupplyChange[] memory mints = new ERC1155SupplyChange[](1); - mints[0] = ERC1155SupplyChange({account: alice, id: id, amount: erc20BInAmmount}); + mints[0] = ERC1155SupplyChange({account: alice, id: id, amount: erc20InAmount}); ERC1155SupplyChange[] memory burns = new ERC1155SupplyChange[](1); burns[0] = ERC1155SupplyChange({account: alice, id: id, amount: 0 ether}); @@ -211,9 +211,9 @@ contract Erc1155FlowTest is FlowERC1155Test { function testFlowERC1155FlowERC1155ToERC1155( uint256 fuzzedKeyAlice, uint256 erc1155OutTokenId, - uint256 erc1155OutAmmount, + uint256 erc1155OutAmount, uint256 erc1155BInTokenId, - uint256 erc1155BInAmmount, + uint256 erc1155InAmount, string memory uri ) external { // Ensure the fuzzed key is within the valid range for secp256k1 @@ -221,9 +221,9 @@ contract Erc1155FlowTest is FlowERC1155Test { address alice = vm.addr(aliceKey); vm.assume(sentinel != erc1155OutTokenId); - vm.assume(sentinel != erc1155OutAmmount); + vm.assume(sentinel != erc1155OutAmount); vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmmount); + vm.assume(sentinel != erc1155InAmount); vm.label(alice, "alice"); (IFlowERC1155V5 erc1155Flow, EvaluableV2 memory evaluable) = deployIFlowERC1155V5(uri); @@ -235,7 +235,7 @@ contract Erc1155FlowTest is FlowERC1155Test { from: address(erc1155Flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -243,14 +243,14 @@ contract Erc1155FlowTest is FlowERC1155Test { from: alice, to: address(erc1155Flow), id: erc1155BInTokenId, - amount: erc1155BInAmmount + amount: erc1155InAmount }); vm.mockCall(iTokenA, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), ""); vm.expectCall( iTokenA, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, erc1155Flow, alice, erc1155OutTokenId, erc1155OutAmmount, "" + IERC1155.safeTransferFrom.selector, erc1155Flow, alice, erc1155OutTokenId, erc1155OutAmount, "" ) ); @@ -258,12 +258,12 @@ contract Erc1155FlowTest is FlowERC1155Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, erc1155Flow, erc1155BInTokenId, erc1155BInAmmount, "" + IERC1155.safeTransferFrom.selector, alice, erc1155Flow, erc1155BInTokenId, erc1155InAmount, "" ) ); ERC1155SupplyChange[] memory mints = new ERC1155SupplyChange[](1); - mints[0] = ERC1155SupplyChange({account: alice, id: erc1155BInTokenId, amount: erc1155BInAmmount}); + mints[0] = ERC1155SupplyChange({account: alice, id: erc1155BInTokenId, amount: erc1155InAmount}); ERC1155SupplyChange[] memory burns = new ERC1155SupplyChange[](1); burns[0] = ERC1155SupplyChange({account: alice, id: erc1155BInTokenId, amount: 0 ether}); @@ -394,17 +394,17 @@ contract Erc1155FlowTest is FlowERC1155Test { /// Should mint and burn tokens per flow in exchange for another token (e.g. ERC20). function testFlowERC1155MintAndBurnTokensPerFlowForERC20Exchange( - uint256 erc20OutAmmount, - uint256 erc20InAmmount, + uint256 erc20OutAmount, + uint256 erc20InAmount, uint256 tokenId, address alice, string memory uri ) external { - vm.assume(sentinel != erc20OutAmmount); - vm.assume(sentinel != erc20InAmmount); + vm.assume(sentinel != erc20OutAmount); + vm.assume(sentinel != erc20InAmount); vm.assume(sentinel != tokenId); vm.assume(address(0) != alice); - vm.assume(erc20InAmmount > erc20OutAmmount); + vm.assume(erc20InAmount > erc20OutAmount); vm.assume(!alice.isContract()); (IFlowERC1155V5 flowErc1155, EvaluableV2 memory evaluable) = deployIFlowERC1155V5(uri); @@ -416,10 +416,10 @@ contract Erc1155FlowTest is FlowERC1155Test { vm.expectCall( address(iTokenA), - abi.encodeWithSelector(IERC20.transferFrom.selector, alice, flowErc1155, erc20InAmmount), + abi.encodeWithSelector(IERC20.transferFrom.selector, alice, flowErc1155, erc20InAmount), 2 ); - vm.expectCall(address(iTokenB), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmmount), 2); + vm.expectCall(address(iTokenB), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmount), 2); } // Stack mint @@ -427,13 +427,13 @@ contract Erc1155FlowTest is FlowERC1155Test { ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2); erc20Transfers[0] = - ERC20Transfer({token: address(iTokenA), from: alice, to: address(flowErc1155), amount: erc20InAmmount}); + ERC20Transfer({token: address(iTokenA), from: alice, to: address(flowErc1155), amount: erc20InAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: address(flowErc1155), to: alice, amount: erc20OutAmmount}); + ERC20Transfer({token: address(iTokenB), from: address(flowErc1155), to: alice, amount: erc20OutAmount}); ERC1155SupplyChange[] memory mints = new ERC1155SupplyChange[](1); - mints[0] = ERC1155SupplyChange({account: alice, id: tokenId, amount: erc20InAmmount}); + mints[0] = ERC1155SupplyChange({account: alice, id: tokenId, amount: erc20InAmount}); uint256[] memory stack = generateFlowStack( FlowERC1155IOV1( @@ -450,7 +450,7 @@ contract Erc1155FlowTest is FlowERC1155Test { flowErc1155.flow(evaluable, new uint256[](0), new SignedContextV1[](0)); vm.stopPrank(); - assertEq(IERC1155(address(flowErc1155)).balanceOf(alice, tokenId), erc20InAmmount); + assertEq(IERC1155(address(flowErc1155)).balanceOf(alice, tokenId), erc20InAmount); } // Stack burn @@ -458,13 +458,13 @@ contract Erc1155FlowTest is FlowERC1155Test { ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2); erc20Transfers[0] = - ERC20Transfer({token: address(iTokenA), from: alice, to: address(flowErc1155), amount: erc20InAmmount}); + ERC20Transfer({token: address(iTokenA), from: alice, to: address(flowErc1155), amount: erc20InAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: address(flowErc1155), to: alice, amount: erc20OutAmmount}); + ERC20Transfer({token: address(iTokenB), from: address(flowErc1155), to: alice, amount: erc20OutAmount}); ERC1155SupplyChange[] memory burns = new ERC1155SupplyChange[](1); - burns[0] = ERC1155SupplyChange({account: alice, id: tokenId, amount: erc20OutAmmount}); + burns[0] = ERC1155SupplyChange({account: alice, id: tokenId, amount: erc20OutAmount}); uint256[] memory stack = generateFlowStack( FlowERC1155IOV1( @@ -482,7 +482,7 @@ contract Erc1155FlowTest is FlowERC1155Test { flowErc1155.flow(evaluable, new uint256[](0), new SignedContextV1[](0)); vm.stopPrank(); - assertEq(IERC1155(address(flowErc1155)).balanceOf(alice, tokenId), erc20InAmmount - erc20OutAmmount); + assertEq(IERC1155(address(flowErc1155)).balanceOf(alice, tokenId), erc20InAmount - erc20OutAmount); } } } From af72cdfd5de0e2409b11afebc1e778a15715b3d1 Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 17:10:03 +0400 Subject: [PATCH 3/8] Fix ammount spelling from flowErc721/FlowPreviewTest.sol --- test/concrete/flowErc721/FlowPreviewTest.sol | 56 ++++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/test/concrete/flowErc721/FlowPreviewTest.sol b/test/concrete/flowErc721/FlowPreviewTest.sol index 4da5609a..a323703a 100644 --- a/test/concrete/flowErc721/FlowPreviewTest.sol +++ b/test/concrete/flowErc721/FlowPreviewTest.sol @@ -15,14 +15,14 @@ contract FlowPreviewTest is FlowERC721Test { string memory baseURI, 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"); (IFlowERC721V5 flow,) = deployFlowERC721({name: symbol, symbol: symbol, baseURI: baseURI}); @@ -34,7 +34,7 @@ contract FlowPreviewTest is FlowERC721Test { from: address(flow), to: alice, id: erc1155OutTokenIdA, - amount: erc1155OutAmmountA + amount: erc1155OutAmountA }); erc1155Transfers[1] = ERC1155Transfer({ @@ -42,7 +42,7 @@ contract FlowPreviewTest is FlowERC721Test { from: address(flow), to: alice, id: erc1155InTokenIdB, - amount: erc1155InAmmountB + amount: erc1155InAmountB }); erc1155Transfers[2] = ERC1155Transfer({ @@ -50,7 +50,7 @@ contract FlowPreviewTest is FlowERC721Test { from: alice, to: address(flow), id: erc1155OutTokenIdA, - amount: erc1155OutAmmountA + amount: erc1155OutAmountA }); erc1155Transfers[3] = ERC1155Transfer({ @@ -58,7 +58,7 @@ contract FlowPreviewTest is FlowERC721Test { from: alice, to: address(flow), id: erc1155InTokenIdB, - amount: erc1155InAmmountB + amount: erc1155InAmountB }); ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](2); @@ -130,11 +130,11 @@ contract FlowPreviewTest is FlowERC721Test { string memory symbol, string memory baseURI, 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"); @@ -143,13 +143,13 @@ contract FlowPreviewTest is FlowERC721Test { 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}); ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](2); mints[0] = ERC721SupplyChange({account: alice, id: 1}); @@ -178,14 +178,14 @@ contract FlowPreviewTest is FlowERC721Test { string memory baseURI, 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"); (IFlowERC721V5 flow,) = deployFlowERC721({name: symbol, symbol: symbol, baseURI: baseURI}); @@ -198,7 +198,7 @@ contract FlowPreviewTest is FlowERC721Test { from: address(flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -206,7 +206,7 @@ contract FlowPreviewTest is FlowERC721Test { from: alice, to: address(flow), id: erc1155InTokenId, - amount: erc1155InAmmount + amount: erc1155InAmount }); ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](2); @@ -276,11 +276,11 @@ contract FlowPreviewTest is FlowERC721Test { string memory symbol, string memory baseURI, 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"); @@ -289,9 +289,9 @@ contract FlowPreviewTest is FlowERC721Test { 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}); ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](2); mints[0] = ERC721SupplyChange({account: alice, id: 1}); From 261544f41ca9e8ee47061293567d5a8df0063712 Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 17:14:11 +0400 Subject: [PATCH 4/8] Fix ammount spelling from flowErc20/FlowPreviewTest.sol --- test/concrete/flowErc20/FlowPreviewTest.sol | 56 ++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/test/concrete/flowErc20/FlowPreviewTest.sol b/test/concrete/flowErc20/FlowPreviewTest.sol index 15d15292..46441ee5 100644 --- a/test/concrete/flowErc20/FlowPreviewTest.sol +++ b/test/concrete/flowErc20/FlowPreviewTest.sol @@ -20,14 +20,14 @@ contract FlowPreviewTest is FlowERC20Test { string memory symbol, 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"); (IFlowERC20V5 flow,) = deployFlowERC20(name, symbol); @@ -40,7 +40,7 @@ contract FlowPreviewTest is FlowERC20Test { from: address(flow), to: alice, id: erc1155OutTokenIdA, - amount: erc1155OutAmmountA + amount: erc1155OutAmountA }); erc1155Transfers[1] = ERC1155Transfer({ @@ -48,7 +48,7 @@ contract FlowPreviewTest is FlowERC20Test { from: address(flow), to: alice, id: erc1155InTokenIdB, - amount: erc1155InAmmountB + amount: erc1155InAmountB }); erc1155Transfers[2] = ERC1155Transfer({ @@ -56,7 +56,7 @@ contract FlowPreviewTest is FlowERC20Test { from: alice, to: address(flow), id: erc1155OutTokenIdA, - amount: erc1155OutAmmountA + amount: erc1155OutAmountA }); erc1155Transfers[3] = ERC1155Transfer({ @@ -64,7 +64,7 @@ contract FlowPreviewTest is FlowERC20Test { from: alice, to: address(flow), id: erc1155InTokenIdB, - amount: erc1155InAmmountB + amount: erc1155InAmountB }); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); @@ -134,11 +134,11 @@ contract FlowPreviewTest is FlowERC20Test { string memory name, string memory symbol, 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"); @@ -147,13 +147,13 @@ contract FlowPreviewTest is FlowERC20Test { 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}); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); mints[0] = ERC20SupplyChange({account: alice, amount: 20 ether}); @@ -181,14 +181,14 @@ contract FlowPreviewTest is FlowERC20Test { string memory symbol, 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"); (IFlowERC20V5 flow,) = deployFlowERC20(name, symbol); @@ -201,7 +201,7 @@ contract FlowPreviewTest is FlowERC20Test { from: address(flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -209,7 +209,7 @@ contract FlowPreviewTest is FlowERC20Test { from: alice, to: address(flow), id: erc1155InTokenId, - amount: erc1155InAmmount + amount: erc1155InAmount }); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); @@ -277,11 +277,11 @@ contract FlowPreviewTest is FlowERC20Test { string memory name, string memory symbol, 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"); @@ -290,9 +290,9 @@ contract FlowPreviewTest is FlowERC20Test { 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}); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); mints[0] = ERC20SupplyChange({account: alice, amount: 20 ether}); From 995eb0a43c30331f86c4d44ef603fe6e3a08a5c7 Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 17:15:55 +0400 Subject: [PATCH 5/8] Fix ammount spelling from flowBasic/FlowTest.sol --- test/concrete/flowBasic/FlowTest.sol | 62 ++++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/test/concrete/flowBasic/FlowTest.sol b/test/concrete/flowBasic/FlowTest.sol index f7c99d05..a1fd5761 100644 --- a/test/concrete/flowBasic/FlowTest.sol +++ b/test/concrete/flowBasic/FlowTest.sol @@ -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"); @@ -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, "" ) ); @@ -112,14 +112,14 @@ contract FlowTest is FlowBasicTest { function testFlowERC1155ToERC1155( address alice, uint256 erc1155OutTokenId, - uint256 erc1155OutAmmount, + uint256 erc1155OutAmount, uint256 erc1155BInTokenId, - uint256 erc1155BInAmmount + uint256 erc1155BInAmount ) external { vm.assume(sentinel != erc1155OutTokenId); - vm.assume(sentinel != erc1155OutAmmount); + vm.assume(sentinel != erc1155OutAmount); vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmmount); + vm.assume(sentinel != erc1155BInAmount); vm.label(alice, "alice"); (IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow(); @@ -131,7 +131,7 @@ contract FlowTest is FlowBasicTest { from: address(flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -139,14 +139,14 @@ contract FlowTest is FlowBasicTest { from: alice, to: address(flow), id: erc1155BInTokenId, - amount: erc1155BInAmmount + amount: erc1155BInAmount }); 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, "" ) ); @@ -154,7 +154,7 @@ contract FlowTest is FlowBasicTest { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, flow, erc1155BInTokenId, erc1155BInAmmount, "" + IERC1155.safeTransferFrom.selector, alice, flow, erc1155BInTokenId, erc1155BInAmount, "" ) ); @@ -208,9 +208,9 @@ 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 erc20BInAmount) external { + vm.assume(sentinel != erc20OutAmount); + vm.assume(sentinel != erc20BInAmount); vm.label(alise, "Alise"); (IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow(); @@ -218,15 +218,15 @@ contract FlowTest is FlowBasicTest { 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: erc20BInAmount}); 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, erc20BInAmount)); uint256[] memory stack = generateFlowStack(FlowTransferV1(erc20Transfers, new ERC721Transfer[](0), new ERC1155Transfer[](0))); @@ -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"); @@ -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))); @@ -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 = @@ -327,15 +327,15 @@ contract FlowTest is FlowBasicTest { address alise, address bob, uint256 erc1155OutTokenId, - uint256 erc1155OutAmmount, + uint256 erc1155OutAmount, uint256 erc1155BInTokenId, - uint256 erc1155BInAmmount + uint256 erc1155BInAmount ) external { vm.assume(bob != alise); vm.assume(sentinel != erc1155OutTokenId); - vm.assume(sentinel != erc1155OutAmmount); + vm.assume(sentinel != erc1155OutAmount); vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmmount); + vm.assume(sentinel != erc1155BInAmount); vm.label(alise, "Alise"); vm.label(bob, "Bob"); @@ -351,7 +351,7 @@ contract FlowTest is FlowBasicTest { from: bob, to: address(flow), id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -359,7 +359,7 @@ contract FlowTest is FlowBasicTest { from: address(flow), to: alise, id: erc1155BInTokenId, - amount: erc1155BInAmmount + amount: erc1155BInAmount }); uint256[] memory stack = From faf990f3e4e739b7848320217b1d0004f5b910d4 Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 17:18:05 +0400 Subject: [PATCH 6/8] Fix ammount spelling from flowErc20/FlowTest.sol --- test/concrete/flowErc20/FlowTest.sol | 60 ++++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/test/concrete/flowErc20/FlowTest.sol b/test/concrete/flowErc20/FlowTest.sol index 3d9f6acd..f576373e 100644 --- a/test/concrete/flowErc20/FlowTest.sol +++ b/test/concrete/flowErc20/FlowTest.sol @@ -114,13 +114,13 @@ contract Erc20FlowTest is FlowERC20Test { * @notice Tests minting and burning tokens per flow in exchange for another token (e.g., ERC20). */ function testFlowERC20MintAndBurnTokensPerFlowForERC20Exchange( - uint256 erc20OutAmmount, - uint256 erc20InAmmount, + uint256 erc20OutAmount, + uint256 erc20InAmount, uint256 mintAndBurn, address alice ) external { - vm.assume(sentinel != erc20OutAmmount); - vm.assume(sentinel != erc20InAmmount); + vm.assume(sentinel != erc20OutAmount); + vm.assume(sentinel != erc20InAmount); vm.assume(sentinel != mintAndBurn); vm.assume(address(0) != alice); @@ -132,9 +132,9 @@ contract Erc20FlowTest is FlowERC20Test { vm.mockCall(address(iTokenB), abi.encodeWithSelector(IERC20.transfer.selector), abi.encode(true)); vm.expectCall( - address(iTokenA), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, flow, erc20InAmmount), 2 + address(iTokenA), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, flow, erc20InAmount), 2 ); - vm.expectCall(address(iTokenB), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmmount), 2); + vm.expectCall(address(iTokenB), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmount), 2); } // Stack mint @@ -142,10 +142,10 @@ contract Erc20FlowTest is FlowERC20Test { ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2); erc20Transfers[0] = - ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20InAmmount}); + ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20InAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: address(flow), to: alice, amount: erc20OutAmmount}); + ERC20Transfer({token: address(iTokenB), from: address(flow), to: alice, amount: erc20OutAmount}); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); mints[0] = ERC20SupplyChange({account: alice, amount: mintAndBurn}); @@ -174,10 +174,10 @@ contract Erc20FlowTest is FlowERC20Test { ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2); erc20Transfers[0] = - ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20InAmmount}); + ERC20Transfer({token: address(iTokenA), from: alice, to: address(flow), amount: erc20InAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: address(flow), to: alice, amount: erc20OutAmmount}); + ERC20Transfer({token: address(iTokenB), from: address(flow), to: alice, amount: erc20OutAmount}); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); mints[0] = ERC20SupplyChange({account: alice, amount: 0 ether}); @@ -209,11 +209,11 @@ contract Erc20FlowTest is FlowERC20Test { 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.assume(address(0) != alice); vm.label(alice, "Alice"); @@ -233,7 +233,7 @@ contract Erc20FlowTest is FlowERC20Test { from: address(flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); @@ -253,7 +253,7 @@ contract Erc20FlowTest is FlowERC20Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmmount, "" + IERC1155.safeTransferFrom.selector, flow, alice, erc1155OutTokenId, erc1155OutAmount, "" ) ); @@ -333,9 +333,9 @@ contract Erc20FlowTest is FlowERC20Test { function testFlowERC20FlowERC1155ToERC1155( uint256 fuzzedKeyAlice, uint256 erc1155OutTokenId, - uint256 erc1155OutAmmount, + uint256 erc1155OutAmount, uint256 erc1155BInTokenId, - uint256 erc1155BInAmmount, + uint256 erc1155BInAmount, string memory flow ) external { // Ensure the fuzzed key is within the valid range for secp256k1 @@ -343,9 +343,9 @@ contract Erc20FlowTest is FlowERC20Test { address alice = vm.addr(aliceKey); vm.assume(sentinel != erc1155OutTokenId); - vm.assume(sentinel != erc1155OutAmmount); + vm.assume(sentinel != erc1155OutAmount); vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmmount); + vm.assume(sentinel != erc1155BInAmount); (IFlowERC20V5 erc20Flow, EvaluableV2 memory evaluable) = deployFlowERC20({name: flow, symbol: flow}); assumeEtchable(alice, address(erc20Flow)); @@ -356,7 +356,7 @@ contract Erc20FlowTest is FlowERC20Test { from: address(erc20Flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -364,14 +364,14 @@ contract Erc20FlowTest is FlowERC20Test { from: alice, to: address(erc20Flow), id: erc1155BInTokenId, - amount: erc1155BInAmmount + amount: erc1155BInAmount }); vm.mockCall(iTokenA, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), ""); vm.expectCall( iTokenA, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, erc20Flow, alice, erc1155OutTokenId, erc1155OutAmmount, "" + IERC1155.safeTransferFrom.selector, erc20Flow, alice, erc1155OutTokenId, erc1155OutAmount, "" ) ); @@ -379,7 +379,7 @@ contract Erc20FlowTest is FlowERC20Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, erc20Flow, erc1155BInTokenId, erc1155BInAmmount, "" + IERC1155.safeTransferFrom.selector, alice, erc20Flow, erc1155BInTokenId, erc1155BInAmount, "" ) ); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); @@ -465,14 +465,14 @@ contract Erc20FlowTest is FlowERC20Test { * @notice Tests the flow between ERC20 and ERC20 on the good path. */ function testFlowERC20FlowERC20ToERC20( - uint256 erc20OutAmmount, - uint256 erc20BInAmmount, + uint256 erc20OutAmount, + uint256 erc20BInAmount, string memory name, string memory symbol, uint256 fuzzedKeyAlice ) external { - vm.assume(sentinel != erc20OutAmmount); - vm.assume(sentinel != erc20BInAmmount); + vm.assume(sentinel != erc20OutAmount); + vm.assume(sentinel != erc20BInAmount); // Ensure the fuzzed key is within the valid range for secp256k1 uint256 aliceKey = (fuzzedKeyAlice % (SECP256K1_ORDER - 1)) + 1; @@ -483,18 +483,18 @@ contract Erc20FlowTest is FlowERC20Test { ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2); erc20Transfers[0] = - ERC20Transfer({token: address(iTokenA), from: address(erc20Flow), to: alice, amount: erc20OutAmmount}); + ERC20Transfer({token: address(iTokenA), from: address(erc20Flow), to: alice, amount: erc20OutAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc20Flow), amount: erc20BInAmmount}); + ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc20Flow), amount: erc20BInAmount}); vm.startPrank(alice); vm.mockCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector), abi.encode(true)); - vm.expectCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmmount)); + vm.expectCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmount)); vm.mockCall(address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true)); vm.expectCall( - address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc20Flow, erc20BInAmmount) + address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc20Flow, erc20BInAmount) ); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); From cfc1fe17e9820f92db95974209f4250f7ca8955a Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 17:19:28 +0400 Subject: [PATCH 7/8] Fix ammount spelling from flowErc721/FlowTest.sol --- test/concrete/flowErc721/FlowTest.sol | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/concrete/flowErc721/FlowTest.sol b/test/concrete/flowErc721/FlowTest.sol index eba096be..cc39801e 100644 --- a/test/concrete/flowErc721/FlowTest.sol +++ b/test/concrete/flowErc721/FlowTest.sol @@ -183,9 +183,9 @@ contract Erc721FlowTest is FlowERC721Test { function testFlowERC721lowERC1155ToERC1155( uint256 fuzzedKeyAlice, uint256 erc1155OutTokenId, - uint256 erc1155OutAmmount, + uint256 erc1155OutAmount, uint256 erc1155BInTokenId, - uint256 erc1155BInAmmount, + uint256 erc1155BInAmount, string memory baseURI ) external { // Ensure the fuzzed key is within the valid range for secp256k1 @@ -193,9 +193,9 @@ contract Erc721FlowTest is FlowERC721Test { address alice = vm.addr(aliceKey); vm.assume(sentinel != erc1155OutTokenId); - vm.assume(sentinel != erc1155OutAmmount); + vm.assume(sentinel != erc1155OutAmount); vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmmount); + vm.assume(sentinel != erc1155BInAmount); vm.assume(alice != address(0)); (IFlowERC721V5 erc721Flow, EvaluableV2 memory evaluable) = @@ -208,7 +208,7 @@ contract Erc721FlowTest is FlowERC721Test { from: address(erc721Flow), to: alice, id: erc1155OutTokenId, - amount: erc1155OutAmmount + amount: erc1155OutAmount }); erc1155Transfers[1] = ERC1155Transfer({ @@ -216,14 +216,14 @@ contract Erc721FlowTest is FlowERC721Test { from: alice, to: address(erc721Flow), id: erc1155BInTokenId, - amount: erc1155BInAmmount + amount: erc1155BInAmount }); vm.mockCall(iTokenA, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), ""); vm.expectCall( iTokenA, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, erc721Flow, alice, erc1155OutTokenId, erc1155OutAmmount, "" + IERC1155.safeTransferFrom.selector, erc721Flow, alice, erc1155OutTokenId, erc1155OutAmount, "" ) ); @@ -231,7 +231,7 @@ contract Erc721FlowTest is FlowERC721Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, erc721Flow, erc1155BInTokenId, erc1155BInAmmount, "" + IERC1155.safeTransferFrom.selector, alice, erc721Flow, erc1155BInTokenId, erc1155BInAmount, "" ) ); ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](1); @@ -253,14 +253,14 @@ contract Erc721FlowTest is FlowERC721Test { } function testFlowERC721lowERC20ToERC20( - uint256 erc20OutAmmount, - uint256 erc20BInAmmount, + uint256 erc20OutAmount, + uint256 erc20BInAmount, uint256 fuzzedKeyAlice, string memory baseURI, uint256 id ) external { - vm.assume(sentinel != erc20OutAmmount); - vm.assume(sentinel != erc20BInAmmount); + vm.assume(sentinel != erc20OutAmount); + vm.assume(sentinel != erc20BInAmount); vm.assume(sentinel != id); // Ensure the fuzzed key is within the valid range for secp256k1 @@ -273,18 +273,18 @@ contract Erc721FlowTest is FlowERC721Test { ERC20Transfer[] memory erc20Transfers = new ERC20Transfer[](2); erc20Transfers[0] = - ERC20Transfer({token: address(iTokenA), from: address(erc721Flow), to: alice, amount: erc20OutAmmount}); + ERC20Transfer({token: address(iTokenA), from: address(erc721Flow), to: alice, amount: erc20OutAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc721Flow), amount: erc20BInAmmount}); + ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc721Flow), amount: erc20BInAmount}); vm.startPrank(alice); vm.mockCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector), abi.encode(true)); - vm.expectCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmmount)); + vm.expectCall(address(iTokenA), abi.encodeWithSelector(IERC20.transfer.selector, alice, erc20OutAmount)); vm.mockCall(address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true)); vm.expectCall( - address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc721Flow, erc20BInAmmount) + address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc721Flow, erc20BInAmount) ); { ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](1); From 0535b4799006a5155e89e11e746ea93b4abfc2ea Mon Sep 17 00:00:00 2001 From: ninokeldishvili Date: Thu, 12 Sep 2024 17:37:41 +0400 Subject: [PATCH 8/8] Remove extra B from variable names --- test/concrete/flowBasic/FlowTest.sol | 42 +++++++++++++------------- test/concrete/flowErc1155/FlowTest.sol | 24 +++++++-------- test/concrete/flowErc20/FlowTest.sol | 30 +++++++++--------- test/concrete/flowErc721/FlowTest.sol | 30 +++++++++--------- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/test/concrete/flowBasic/FlowTest.sol b/test/concrete/flowBasic/FlowTest.sol index a1fd5761..01a820c4 100644 --- a/test/concrete/flowBasic/FlowTest.sol +++ b/test/concrete/flowBasic/FlowTest.sol @@ -113,13 +113,13 @@ contract FlowTest is FlowBasicTest { address alice, uint256 erc1155OutTokenId, uint256 erc1155OutAmount, - uint256 erc1155BInTokenId, - uint256 erc1155BInAmount + uint256 erc1155InTokenId, + uint256 erc1155InAmount ) external { vm.assume(sentinel != erc1155OutTokenId); vm.assume(sentinel != erc1155OutAmount); - vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmount); + vm.assume(sentinel != erc1155InTokenId); + vm.assume(sentinel != erc1155InAmount); vm.label(alice, "alice"); (IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow(); @@ -138,8 +138,8 @@ contract FlowTest is FlowBasicTest { token: address(iTokenB), from: alice, to: address(flow), - id: erc1155BInTokenId, - amount: erc1155BInAmount + id: erc1155InTokenId, + amount: erc1155InAmount }); vm.mockCall(iTokenA, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), ""); @@ -154,7 +154,7 @@ contract FlowTest is FlowBasicTest { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, flow, erc1155BInTokenId, erc1155BInAmount, "" + IERC1155.safeTransferFrom.selector, alice, flow, erc1155InTokenId, erc1155InAmount, "" ) ); @@ -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(); @@ -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( @@ -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 ) ); @@ -208,9 +208,9 @@ contract FlowTest is FlowBasicTest { vm.stopPrank(); } - function testFlowERC20ToERC20(address alise, uint256 erc20OutAmount, uint256 erc20BInAmount) external { + function testFlowERC20ToERC20(address alise, uint256 erc20OutAmount, uint256 erc20InAmount) external { vm.assume(sentinel != erc20OutAmount); - vm.assume(sentinel != erc20BInAmount); + vm.assume(sentinel != erc20InAmount); vm.label(alise, "Alise"); (IFlowV5 flow, EvaluableV2 memory evaluable) = deployFlow(); @@ -220,13 +220,13 @@ contract FlowTest is FlowBasicTest { erc20Transfers[0] = ERC20Transfer({token: address(iTokenA), from: address(flow), to: alise, amount: erc20OutAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: alise, to: address(flow), amount: erc20BInAmount}); + 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, erc20OutAmount)); vm.mockCall(iTokenB, abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true)); - vm.expectCall(iTokenB, abi.encodeWithSelector(IERC20.transferFrom.selector, alise, flow, erc20BInAmount)); + vm.expectCall(iTokenB, abi.encodeWithSelector(IERC20.transferFrom.selector, alise, flow, erc20InAmount)); uint256[] memory stack = generateFlowStack(FlowTransferV1(erc20Transfers, new ERC721Transfer[](0), new ERC1155Transfer[](0))); @@ -328,14 +328,14 @@ contract FlowTest is FlowBasicTest { address bob, uint256 erc1155OutTokenId, uint256 erc1155OutAmount, - uint256 erc1155BInTokenId, - uint256 erc1155BInAmount + uint256 erc1155InTokenId, + uint256 erc1155InAmount ) external { vm.assume(bob != alise); vm.assume(sentinel != erc1155OutTokenId); vm.assume(sentinel != erc1155OutAmount); - vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmount); + vm.assume(sentinel != erc1155InTokenId); + vm.assume(sentinel != erc1155InAmount); vm.label(alise, "Alise"); vm.label(bob, "Bob"); @@ -358,8 +358,8 @@ contract FlowTest is FlowBasicTest { token: address(iTokenB), from: address(flow), to: alise, - id: erc1155BInTokenId, - amount: erc1155BInAmount + id: erc1155InTokenId, + amount: erc1155InAmount }); uint256[] memory stack = diff --git a/test/concrete/flowErc1155/FlowTest.sol b/test/concrete/flowErc1155/FlowTest.sol index af21bed2..bfb0d2e3 100644 --- a/test/concrete/flowErc1155/FlowTest.sol +++ b/test/concrete/flowErc1155/FlowTest.sol @@ -155,7 +155,7 @@ contract Erc1155FlowTest is FlowERC1155Test { function testFlowERC1155FlowERC721ToERC721( uint256 fuzzedKeyAlice, uint256 erc721OutTokenId, - uint256 erc721BInTokenId, + uint256 erc721InTokenId, string memory uri, uint256 amount ) external { @@ -164,7 +164,7 @@ contract Erc1155FlowTest is FlowERC1155Test { address alice = vm.addr(aliceKey); vm.assume(sentinel != erc721OutTokenId); - vm.assume(sentinel != erc721BInTokenId); + vm.assume(sentinel != erc721InTokenId); (IFlowERC1155V5 erc1155Flow, EvaluableV2 memory evaluable) = deployIFlowERC1155V5(uri); assumeEtchable(alice, address(erc1155Flow)); @@ -173,7 +173,7 @@ contract Erc1155FlowTest is FlowERC1155Test { erc721Transfers[0] = ERC721Transfer({token: address(iTokenA), from: address(erc1155Flow), to: alice, id: erc721OutTokenId}); erc721Transfers[1] = - ERC721Transfer({token: address(iTokenB), from: alice, to: address(erc1155Flow), id: erc721BInTokenId}); + ERC721Transfer({token: address(iTokenB), from: alice, to: address(erc1155Flow), id: erc721InTokenId}); vm.mockCall(iTokenA, abi.encodeWithSelector(bytes4(keccak256("safeTransferFrom(address,address,uint256)"))), ""); vm.expectCall( @@ -187,14 +187,14 @@ contract Erc1155FlowTest is FlowERC1155Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, erc1155Flow, erc721BInTokenId + bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, erc1155Flow, erc721InTokenId ) ); ERC1155SupplyChange[] memory mints = new ERC1155SupplyChange[](1); - mints[0] = ERC1155SupplyChange({account: alice, id: erc721BInTokenId, amount: amount}); + mints[0] = ERC1155SupplyChange({account: alice, id: erc721InTokenId, amount: amount}); ERC1155SupplyChange[] memory burns = new ERC1155SupplyChange[](1); - burns[0] = ERC1155SupplyChange({account: alice, id: erc721BInTokenId, amount: 0 ether}); + burns[0] = ERC1155SupplyChange({account: alice, id: erc721InTokenId, amount: 0 ether}); uint256[] memory stack = generateFlowStack( FlowERC1155IOV1( @@ -212,7 +212,7 @@ contract Erc1155FlowTest is FlowERC1155Test { uint256 fuzzedKeyAlice, uint256 erc1155OutTokenId, uint256 erc1155OutAmount, - uint256 erc1155BInTokenId, + uint256 erc1155InTokenId, uint256 erc1155InAmount, string memory uri ) external { @@ -222,7 +222,7 @@ contract Erc1155FlowTest is FlowERC1155Test { vm.assume(sentinel != erc1155OutTokenId); vm.assume(sentinel != erc1155OutAmount); - vm.assume(sentinel != erc1155BInTokenId); + vm.assume(sentinel != erc1155InTokenId); vm.assume(sentinel != erc1155InAmount); vm.label(alice, "alice"); @@ -242,7 +242,7 @@ contract Erc1155FlowTest is FlowERC1155Test { token: address(iTokenB), from: alice, to: address(erc1155Flow), - id: erc1155BInTokenId, + id: erc1155InTokenId, amount: erc1155InAmount }); @@ -258,15 +258,15 @@ contract Erc1155FlowTest is FlowERC1155Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, erc1155Flow, erc1155BInTokenId, erc1155InAmount, "" + IERC1155.safeTransferFrom.selector, alice, erc1155Flow, erc1155InTokenId, erc1155InAmount, "" ) ); ERC1155SupplyChange[] memory mints = new ERC1155SupplyChange[](1); - mints[0] = ERC1155SupplyChange({account: alice, id: erc1155BInTokenId, amount: erc1155InAmount}); + mints[0] = ERC1155SupplyChange({account: alice, id: erc1155InTokenId, amount: erc1155InAmount}); ERC1155SupplyChange[] memory burns = new ERC1155SupplyChange[](1); - burns[0] = ERC1155SupplyChange({account: alice, id: erc1155BInTokenId, amount: 0 ether}); + burns[0] = ERC1155SupplyChange({account: alice, id: erc1155InTokenId, amount: 0 ether}); uint256[] memory stack = generateFlowStack( FlowERC1155IOV1( diff --git a/test/concrete/flowErc20/FlowTest.sol b/test/concrete/flowErc20/FlowTest.sol index f576373e..181ea90f 100644 --- a/test/concrete/flowErc20/FlowTest.sol +++ b/test/concrete/flowErc20/FlowTest.sol @@ -334,8 +334,8 @@ contract Erc20FlowTest is FlowERC20Test { uint256 fuzzedKeyAlice, uint256 erc1155OutTokenId, uint256 erc1155OutAmount, - uint256 erc1155BInTokenId, - uint256 erc1155BInAmount, + uint256 erc1155InTokenId, + uint256 erc1155InAmount, string memory flow ) external { // Ensure the fuzzed key is within the valid range for secp256k1 @@ -344,8 +344,8 @@ contract Erc20FlowTest is FlowERC20Test { vm.assume(sentinel != erc1155OutTokenId); vm.assume(sentinel != erc1155OutAmount); - vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmount); + vm.assume(sentinel != erc1155InTokenId); + vm.assume(sentinel != erc1155InAmount); (IFlowERC20V5 erc20Flow, EvaluableV2 memory evaluable) = deployFlowERC20({name: flow, symbol: flow}); assumeEtchable(alice, address(erc20Flow)); @@ -363,8 +363,8 @@ contract Erc20FlowTest is FlowERC20Test { token: address(iTokenB), from: alice, to: address(erc20Flow), - id: erc1155BInTokenId, - amount: erc1155BInAmount + id: erc1155InTokenId, + amount: erc1155InAmount }); vm.mockCall(iTokenA, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), ""); @@ -379,7 +379,7 @@ contract Erc20FlowTest is FlowERC20Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, erc20Flow, erc1155BInTokenId, erc1155BInAmount, "" + IERC1155.safeTransferFrom.selector, alice, erc20Flow, erc1155InTokenId, erc1155InAmount, "" ) ); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); @@ -406,7 +406,7 @@ contract Erc20FlowTest is FlowERC20Test { function testFlowERC20FlowERC721ToERC721( uint256 fuzzedKeyAlice, uint256 erc721OutTokenId, - uint256 erc721BInTokenId, + uint256 erc721InTokenId, string memory name, string memory symbol ) external { @@ -415,7 +415,7 @@ contract Erc20FlowTest is FlowERC20Test { address alice = vm.addr(aliceKey); vm.assume(sentinel != erc721OutTokenId); - vm.assume(sentinel != erc721BInTokenId); + vm.assume(sentinel != erc721InTokenId); (IFlowERC20V5 erc20Flow, EvaluableV2 memory evaluable) = deployFlowERC20(name, symbol); assumeEtchable(alice, address(erc20Flow)); @@ -424,7 +424,7 @@ contract Erc20FlowTest is FlowERC20Test { erc721Transfers[0] = ERC721Transfer({token: address(iTokenA), from: address(erc20Flow), to: alice, id: erc721OutTokenId}); erc721Transfers[1] = - ERC721Transfer({token: address(iTokenB), from: alice, to: address(erc20Flow), id: erc721BInTokenId}); + ERC721Transfer({token: address(iTokenB), from: alice, to: address(erc20Flow), id: erc721InTokenId}); vm.mockCall(iTokenA, abi.encodeWithSelector(bytes4(keccak256("safeTransferFrom(address,address,uint256)"))), ""); vm.expectCall( @@ -438,7 +438,7 @@ contract Erc20FlowTest is FlowERC20Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, erc20Flow, erc721BInTokenId + bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, erc20Flow, erc721InTokenId ) ); @@ -466,13 +466,13 @@ contract Erc20FlowTest is FlowERC20Test { */ function testFlowERC20FlowERC20ToERC20( uint256 erc20OutAmount, - uint256 erc20BInAmount, + uint256 erc20InAmount, string memory name, string memory symbol, uint256 fuzzedKeyAlice ) external { vm.assume(sentinel != erc20OutAmount); - vm.assume(sentinel != erc20BInAmount); + vm.assume(sentinel != erc20InAmount); // Ensure the fuzzed key is within the valid range for secp256k1 uint256 aliceKey = (fuzzedKeyAlice % (SECP256K1_ORDER - 1)) + 1; @@ -485,7 +485,7 @@ contract Erc20FlowTest is FlowERC20Test { erc20Transfers[0] = ERC20Transfer({token: address(iTokenA), from: address(erc20Flow), to: alice, amount: erc20OutAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc20Flow), amount: erc20BInAmount}); + ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc20Flow), amount: erc20InAmount}); vm.startPrank(alice); @@ -494,7 +494,7 @@ contract Erc20FlowTest is FlowERC20Test { vm.mockCall(address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true)); vm.expectCall( - address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc20Flow, erc20BInAmount) + address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc20Flow, erc20InAmount) ); ERC20SupplyChange[] memory mints = new ERC20SupplyChange[](1); diff --git a/test/concrete/flowErc721/FlowTest.sol b/test/concrete/flowErc721/FlowTest.sol index cc39801e..6c32ff28 100644 --- a/test/concrete/flowErc721/FlowTest.sol +++ b/test/concrete/flowErc721/FlowTest.sol @@ -184,8 +184,8 @@ contract Erc721FlowTest is FlowERC721Test { uint256 fuzzedKeyAlice, uint256 erc1155OutTokenId, uint256 erc1155OutAmount, - uint256 erc1155BInTokenId, - uint256 erc1155BInAmount, + uint256 erc1155InTokenId, + uint256 erc1155InAmount, string memory baseURI ) external { // Ensure the fuzzed key is within the valid range for secp256k1 @@ -194,8 +194,8 @@ contract Erc721FlowTest is FlowERC721Test { vm.assume(sentinel != erc1155OutTokenId); vm.assume(sentinel != erc1155OutAmount); - vm.assume(sentinel != erc1155BInTokenId); - vm.assume(sentinel != erc1155BInAmount); + vm.assume(sentinel != erc1155InTokenId); + vm.assume(sentinel != erc1155InAmount); vm.assume(alice != address(0)); (IFlowERC721V5 erc721Flow, EvaluableV2 memory evaluable) = @@ -215,8 +215,8 @@ contract Erc721FlowTest is FlowERC721Test { token: address(iTokenB), from: alice, to: address(erc721Flow), - id: erc1155BInTokenId, - amount: erc1155BInAmount + id: erc1155InTokenId, + amount: erc1155InAmount }); vm.mockCall(iTokenA, abi.encodeWithSelector(IERC1155.safeTransferFrom.selector), ""); @@ -231,7 +231,7 @@ contract Erc721FlowTest is FlowERC721Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - IERC1155.safeTransferFrom.selector, alice, erc721Flow, erc1155BInTokenId, erc1155BInAmount, "" + IERC1155.safeTransferFrom.selector, alice, erc721Flow, erc1155InTokenId, erc1155InAmount, "" ) ); ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](1); @@ -254,13 +254,13 @@ contract Erc721FlowTest is FlowERC721Test { function testFlowERC721lowERC20ToERC20( uint256 erc20OutAmount, - uint256 erc20BInAmount, + uint256 erc20InAmount, uint256 fuzzedKeyAlice, string memory baseURI, uint256 id ) external { vm.assume(sentinel != erc20OutAmount); - vm.assume(sentinel != erc20BInAmount); + vm.assume(sentinel != erc20InAmount); vm.assume(sentinel != id); // Ensure the fuzzed key is within the valid range for secp256k1 @@ -275,7 +275,7 @@ contract Erc721FlowTest is FlowERC721Test { erc20Transfers[0] = ERC20Transfer({token: address(iTokenA), from: address(erc721Flow), to: alice, amount: erc20OutAmount}); erc20Transfers[1] = - ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc721Flow), amount: erc20BInAmount}); + ERC20Transfer({token: address(iTokenB), from: alice, to: address(erc721Flow), amount: erc20InAmount}); vm.startPrank(alice); @@ -284,7 +284,7 @@ contract Erc721FlowTest is FlowERC721Test { vm.mockCall(address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector), abi.encode(true)); vm.expectCall( - address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc721Flow, erc20BInAmount) + address(iTokenB), abi.encodeWithSelector(IERC20.transferFrom.selector, alice, erc721Flow, erc20InAmount) ); { ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](1); @@ -312,7 +312,7 @@ contract Erc721FlowTest is FlowERC721Test { function testFlowERC721FlowERC721ToERC721( uint256 fuzzedKeyAlice, uint256 erc721OutTokenId, - uint256 erc721BInTokenId, + uint256 erc721InTokenId, string memory baseURI, uint256 id ) external { @@ -321,7 +321,7 @@ contract Erc721FlowTest is FlowERC721Test { address alice = vm.addr(aliceKey); vm.assume(sentinel != erc721OutTokenId); - vm.assume(sentinel != erc721BInTokenId); + vm.assume(sentinel != erc721InTokenId); (IFlowERC721V5 erc721Flow, EvaluableV2 memory evaluable) = deployFlowERC721({name: "FlowErc721", symbol: "FErc721", baseURI: baseURI}); @@ -331,7 +331,7 @@ contract Erc721FlowTest is FlowERC721Test { erc721Transfers[0] = ERC721Transfer({token: address(iTokenA), from: address(erc721Flow), to: alice, id: erc721OutTokenId}); erc721Transfers[1] = - ERC721Transfer({token: address(iTokenB), from: alice, to: address(erc721Flow), id: erc721BInTokenId}); + ERC721Transfer({token: address(iTokenB), from: alice, to: address(erc721Flow), id: erc721InTokenId}); vm.mockCall(iTokenA, abi.encodeWithSelector(bytes4(keccak256("safeTransferFrom(address,address,uint256)"))), ""); vm.expectCall( @@ -345,7 +345,7 @@ contract Erc721FlowTest is FlowERC721Test { vm.expectCall( iTokenB, abi.encodeWithSelector( - bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, erc721Flow, erc721BInTokenId + bytes4(keccak256("safeTransferFrom(address,address,uint256)")), alice, erc721Flow, erc721InTokenId ) ); ERC721SupplyChange[] memory mints = new ERC721SupplyChange[](1);