chore: use named in _deployMerkleLT

chore: order variables in constructor test: say campaignCreator instead of caller
sablier-labs · Jan 7, 2025 · 18652da · 18652da
1 parent 91410c6
commit 18652da
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/src/SablierMerkleFactory.sol b/src/SablierMerkleFactory.sol
@@ -193,8 +193,14 @@ contract SablierMerkleFactory is
         }
 
         // Deploy the MerkleLT contract.
-        merkleLT =
-            _deployMerkleLT(baseParams, lockup, cancelable, transferable, streamStartTime, tranchesWithPercentages);
+        merkleLT = _deployMerkleLT({
+            baseParams: baseParams,
+            lockup: lockup,
+            cancelable: cancelable,
+            transferable: transferable,
+            streamStartTime: streamStartTime,
+            tranchesWithPercentages: tranchesWithPercentages
+        });
 
         // Log the creation of the MerkleLT contract, including some metadata that is not stored on-chain.
         emit CreateMerkleLT({

diff --git a/src/abstracts/SablierMerkleBase.sol b/src/abstracts/SablierMerkleBase.sol
@@ -61,14 +61,14 @@ abstract contract SablierMerkleBase is
 
     /// @notice Constructs the contract by initializing the immutable state variables.
     constructor(MerkleBase.ConstructorParams memory params, address campaignCreator) Adminable(params.initialAdmin) {
+        CAMPAIGN_NAME = bytes32(abi.encodePacked(params.campaignName));
         EXPIRATION = params.expiration;
         FACTORY = msg.sender;
         FEE = ISablierMerkleFactory(FACTORY).getFee(campaignCreator);
         MERKLE_ROOT = params.merkleRoot;
+        SHAPE = bytes32(abi.encodePacked(params.shape));
         TOKEN = params.token;
-        CAMPAIGN_NAME = bytes32(abi.encodePacked(params.campaignName));
         ipfsCID = params.ipfsCID;
-        SHAPE = bytes32(abi.encodePacked(params.shape));
     }
 
     /*//////////////////////////////////////////////////////////////////////////

diff --git a/tests/Base.t.sol b/tests/Base.t.sol
@@ -181,7 +181,7 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
     //////////////////////////////////////////////////////////////////////////*/
 
     function computeMerkleInstantAddress(
-        address caller,
+        address campaignCreator,
         address campaignOwner,
         IERC20 token_,
         bytes32 merkleRoot,
@@ -197,9 +197,9 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
         baseParams.initialAdmin = campaignOwner;
         baseParams.merkleRoot = merkleRoot;
 
-        bytes32 salt = keccak256(abi.encodePacked(caller, abi.encode(baseParams)));
+        bytes32 salt = keccak256(abi.encodePacked(campaignCreator, abi.encode(baseParams)));
         bytes32 creationBytecodeHash =
-            keccak256(getMerkleInstantBytecode(caller, campaignOwner, token_, merkleRoot, expiration));
+            keccak256(getMerkleInstantBytecode(campaignCreator, campaignOwner, token_, merkleRoot, expiration));
         return vm.computeCreate2Address({
             salt: salt,
             initCodeHash: creationBytecodeHash,
@@ -208,7 +208,7 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
     }
 
     function computeMerkleLLAddress(
-        address caller,
+        address campaignCreator,
         address campaignOwner,
         IERC20 token_,
         bytes32 merkleRoot,
@@ -225,7 +225,7 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
         baseParams.merkleRoot = merkleRoot;
         bytes32 salt = keccak256(
             abi.encodePacked(
-                caller,
+                campaignCreator,
                 abi.encode(baseParams),
                 lockup,
                 defaults.CANCELABLE(),
@@ -234,7 +234,7 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
             )
         );
         bytes32 creationBytecodeHash =
-            keccak256(getMerkleLLBytecode(caller, campaignOwner, token_, merkleRoot, expiration));
+            keccak256(getMerkleLLBytecode(campaignCreator, campaignOwner, token_, merkleRoot, expiration));
         return vm.computeCreate2Address({
             salt: salt,
             initCodeHash: creationBytecodeHash,
@@ -243,7 +243,7 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
     }
 
     function computeMerkleLTAddress(
-        address caller,
+        address campaignCreator,
         address campaignOwner,
         IERC20 token_,
         bytes32 merkleRoot,
@@ -260,7 +260,7 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
         baseParams.merkleRoot = merkleRoot;
         bytes32 salt = keccak256(
             abi.encodePacked(
-                caller,
+                campaignCreator,
                 abi.encode(baseParams),
                 lockup,
                 defaults.CANCELABLE(),
@@ -270,7 +270,7 @@ abstract contract Base_Test is Assertions, Constants, DeployOptimized, Modifiers
             )
         );
         bytes32 creationBytecodeHash =
-            keccak256(getMerkleLTBytecode(caller, campaignOwner, token_, merkleRoot, expiration));
+            keccak256(getMerkleLTBytecode(campaignCreator, campaignOwner, token_, merkleRoot, expiration));
         return vm.computeCreate2Address({
             salt: salt,
             initCodeHash: creationBytecodeHash,

diff --git a/tests/integration/Integration.t.sol b/tests/integration/Integration.t.sol
@@ -66,7 +66,7 @@ contract Integration_Test is Base_Test {
 
     function computeMerkleInstantAddress(address campaignOwner, uint40 expiration) internal view returns (address) {
         return computeMerkleInstantAddress({
-            caller: users.campaignOwner,
+            campaignCreator: users.campaignOwner,
             campaignOwner: campaignOwner,
             token_: dai,
             merkleRoot: defaults.MERKLE_ROOT(),
@@ -100,7 +100,7 @@ contract Integration_Test is Base_Test {
 
     function computeMerkleLLAddress(address campaignOwner, uint40 expiration) internal view returns (address) {
         return computeMerkleLLAddress({
-            caller: users.campaignOwner,
+            campaignCreator: users.campaignOwner,
             campaignOwner: campaignOwner,
             token_: dai,
             merkleRoot: defaults.MERKLE_ROOT(),
@@ -138,7 +138,7 @@ contract Integration_Test is Base_Test {
 
     function computeMerkleLTAddress(address campaignOwner, uint40 expiration) internal view returns (address) {
         return computeMerkleLTAddress({
-            caller: users.campaignOwner,
+            campaignCreator: users.campaignOwner,
             campaignOwner: campaignOwner,
             token_: dai,
             merkleRoot: defaults.MERKLE_ROOT(),