Merge pull request #267 from sablier-labs/style/merge-headers

Merge headers
sablier-labs · Jan 30, 2024 · 0dc87fe · 0dc87fe
2 parents 5a14a03 + df4e07f
commit 0dc87fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/src/SablierV2MerkleStreamerLL.sol b/src/SablierV2MerkleStreamerLL.sol
@@ -22,16 +22,12 @@ contract SablierV2MerkleStreamerLL is
     using SafeERC20 for IERC20;
 
     /*//////////////////////////////////////////////////////////////////////////
-                               USER-FACING CONSTANTS
+                                  STATE VARIABLES
     //////////////////////////////////////////////////////////////////////////*/
 
     /// @inheritdoc ISablierV2MerkleStreamerLL
     ISablierV2LockupLinear public immutable override LOCKUP_LINEAR;
 
-    /*//////////////////////////////////////////////////////////////////////////
-                                USER-FACING STORAGE
-    //////////////////////////////////////////////////////////////////////////*/
-
     /// @inheritdoc ISablierV2MerkleStreamerLL
     LockupLinear.Durations public override streamDurations;
 

diff --git a/src/abstracts/SablierV2MerkleStreamer.sol b/src/abstracts/SablierV2MerkleStreamer.sol
@@ -21,7 +21,7 @@ abstract contract SablierV2MerkleStreamer is
     using SafeERC20 for IERC20;
 
     /*//////////////////////////////////////////////////////////////////////////
-                               USER-FACING CONSTANTS
+                                  STATE VARIABLES
     //////////////////////////////////////////////////////////////////////////*/
 
     /// @inheritdoc ISablierV2MerkleStreamer
@@ -36,19 +36,11 @@ abstract contract SablierV2MerkleStreamer is
     /// @inheritdoc ISablierV2MerkleStreamer
     bytes32 public immutable override MERKLE_ROOT;
 
-    /// @inheritdoc ISablierV2MerkleStreamer
-    bool public immutable override TRANSFERABLE;
-
-    /*//////////////////////////////////////////////////////////////////////////
-                                  INTERNAL CONSTANT
-    //////////////////////////////////////////////////////////////////////////*/
-
     /// @dev The name of the campaign stored as bytes32.
     bytes32 internal immutable NAME;
 
-    /*//////////////////////////////////////////////////////////////////////////
-                                  INTERNAL STORAGE
-    //////////////////////////////////////////////////////////////////////////*/
+    /// @inheritdoc ISablierV2MerkleStreamer
+    bool public immutable override TRANSFERABLE;
 
     /// @dev Packed booleans that record the history of claims.
     BitMaps.BitMap internal _claimedBitMap;