test(contracts): fix tests to new input encoding

cartesi · Aug 16, 2023 · 50acf2d · 50acf2d
1 parent 799c86f
commit 50acf2d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/onchain/rollups/test/foundry/portals/ERC20Portal.t.sol b/onchain/rollups/test/foundry/portals/ERC20Portal.t.sol
@@ -122,13 +122,7 @@ contract ERC20PortalTest is Test {
         token = new NormalToken(_amount);
 
         // Construct the ERC-20 deposit input
-        bytes memory input = abi.encodePacked(
-            true,
-            token,
-            alice,
-            _amount,
-            _data
-        );
+        bytes memory input = abi.encode(true, token, alice, _amount, _data);
 
         // Transfer ERC-20 tokens to Alice and start impersonating her
         require(token.transfer(alice, _amount), "token transfer fail");
@@ -167,13 +161,7 @@ contract ERC20PortalTest is Test {
         token = new UntransferableToken(_amount);
 
         // Construct the ERC-20 deposit input
-        bytes memory input = abi.encodePacked(
-            false,
-            token,
-            alice,
-            _amount,
-            _data
-        );
+        bytes memory input = abi.encode(false, token, alice, _amount, _data);
 
         // Start impersonating Alice
         vm.startPrank(alice);

diff --git a/onchain/rollups/test/foundry/portals/ERC721Portal.t.sol b/onchain/rollups/test/foundry/portals/ERC721Portal.t.sol
@@ -130,11 +130,12 @@ contract ERC721PortalTest is Test {
         token = new NormalToken(alice, _tokenId);
 
         // Construct the ERC-721 deposit input
-        bytes memory input = abi.encodePacked(
+        bytes memory input = abi.encode(
             token,
             alice,
             _tokenId,
-            abi.encode(_baseLayerData, _execLayerData)
+            _baseLayerData,
+            _execLayerData
         );
 
         // Start impersonating Alice
@@ -184,11 +185,12 @@ contract ERC721PortalTest is Test {
         token = new NormalToken(alice, _tokenId);
 
         // Construct the ERC-721 deposit input
-        bytes memory input = abi.encodePacked(
+        bytes memory input = abi.encode(
             token,
             alice,
             _tokenId,
-            abi.encode(_baseLayerData, _execLayerData)
+            _baseLayerData,
+            _execLayerData
         );
 
         // Start impersonating Alice
@@ -301,11 +303,12 @@ contract ERC721PortalTest is Test {
         token = new NormalToken(alice, _tokenId);
 
         // Construct the ERC-721 deposit input
-        bytes memory input = abi.encodePacked(
+        bytes memory input = abi.encode(
             token,
             alice,
             _tokenId,
-            abi.encode(_baseLayerData, _execLayerData)
+            _baseLayerData,
+            _execLayerData
         );
 
         // Start impersonating Alice

diff --git a/onchain/rollups/test/foundry/portals/EtherPortal.t.sol b/onchain/rollups/test/foundry/portals/EtherPortal.t.sol
@@ -71,7 +71,7 @@ contract EtherPortalTest is Test {
 
     function testEtherDeposit(uint256 value, bytes calldata data) public {
         // Construct the Ether deposit input
-        bytes memory input = abi.encodePacked(alice, value, data);
+        bytes memory input = abi.encode(alice, value, data);
 
         // Transfer Ether to Alice and start impersonating her
         startHoax(alice, value);

diff --git a/onchain/rollups/test/foundry/relays/DAppAddressRelay.t.sol b/onchain/rollups/test/foundry/relays/DAppAddressRelay.t.sol
@@ -36,7 +36,7 @@ contract DAppAddressRelayTest is Test {
         assertEq(inputBox.getNumberOfInputs(_dapp), 0);
 
         // Construct the DApp address relay input
-        bytes memory input = abi.encodePacked(_dapp);
+        bytes memory input = abi.encode(_dapp);
 
         // Expect InputAdded to be emitted with the right arguments
         vm.expectEmit(true, true, false, true, address(inputBox));