style: fix import

sablier-labs · Sep 11, 2024 · de0bce6 · de0bce6
1 parent 969f498
commit de0bce6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 23 deletions.
diff --git a/.lintstagedrc.yml b/.lintstagedrc.yml
@@ -1,4 +1,4 @@
 "*.{json,md,svg,yml}": "prettier --write"
 "*.sol":
-  - "bun solhint --fix --noPrompt"
+  - "bun solhint {benchmark,precompiles,script,src,test}/**/*.sol --fix --noPrompt"
   - "forge fmt"
diff --git a/src/periphery/SablierMerkleFactory.sol b/src/periphery/SablierMerkleFactory.sol
@@ -31,7 +31,7 @@ contract SablierMerkleFactory is
     uint256 public defaultSablierFee;
 
     /// @dev A mapping of custom Sablier fees by user.
-    mapping(address campaignCreator => MerkleFactory.SablierFee) private _sablierFeeByUser;
+    mapping(address campaignCreator => MerkleFactory.SablierFee customFee) private _sablierFeeByUser;
 
     /*//////////////////////////////////////////////////////////////////////////
                                      CONSTRUCTOR

diff --git a/test/periphery/integration/merkle-campaign/instant/MerkleInstant.t.sol b/test/periphery/integration/merkle-campaign/instant/MerkleInstant.t.sol
@@ -2,13 +2,12 @@
 pragma solidity >=0.8.22 <0.9.0;
 
 import { ISablierMerkleBase } from "src/periphery/interfaces/ISablierMerkleBase.sol";
-
-import { Clawback_Integration_Test } from "../shared/clawback/clawback.t.sol";
-import { GetFirstClaimTime_Integration_Test } from "../shared/get-first-claim-time/getFirstClaimTime.t.sol";
-import { HasClaimed_Integration_Test } from "../shared/has-claimed/hasClaimed.t.sol";
-import { HasExpired_Integration_Test } from "../shared/has-expired/hasExpired.t.sol";
-import { WithdrawFees_Integration_Test } from "../shared/withdraw-fees/withdrawFees.t.sol";
-import { MerkleCampaign_Integration_Shared_Test } from "../shared/MerkleCampaign.t.sol";
+import { Clawback_Integration_Test } from "./../shared/clawback/clawback.t.sol";
+import { GetFirstClaimTime_Integration_Test } from "./../shared/get-first-claim-time/getFirstClaimTime.t.sol";
+import { HasClaimed_Integration_Test } from "./../shared/has-claimed/hasClaimed.t.sol";
+import { HasExpired_Integration_Test } from "./../shared/has-expired/hasExpired.t.sol";
+import { MerkleCampaign_Integration_Shared_Test } from "./../shared/MerkleCampaign.t.sol";
+import { WithdrawFees_Integration_Test } from "./../shared/withdraw-fees/withdrawFees.t.sol";
 
 /*//////////////////////////////////////////////////////////////////////////
                              NON-SHARED TESTS

diff --git a/test/periphery/integration/merkle-campaign/ll/MerkleLL.t.sol b/test/periphery/integration/merkle-campaign/ll/MerkleLL.t.sol
@@ -2,13 +2,12 @@
 pragma solidity >=0.8.22 <0.9.0;
 
 import { ISablierMerkleBase } from "src/periphery/interfaces/ISablierMerkleBase.sol";
-
-import { Clawback_Integration_Test } from "../shared/clawback/clawback.t.sol";
-import { GetFirstClaimTime_Integration_Test } from "../shared/get-first-claim-time/getFirstClaimTime.t.sol";
-import { HasClaimed_Integration_Test } from "../shared/has-claimed/hasClaimed.t.sol";
-import { HasExpired_Integration_Test } from "../shared/has-expired/hasExpired.t.sol";
-import { WithdrawFees_Integration_Test } from "../shared/withdraw-fees/withdrawFees.t.sol";
-import { MerkleCampaign_Integration_Shared_Test } from "../shared/MerkleCampaign.t.sol";
+import { Clawback_Integration_Test } from "./../shared/clawback/clawback.t.sol";
+import { GetFirstClaimTime_Integration_Test } from "./../shared/get-first-claim-time/getFirstClaimTime.t.sol";
+import { HasClaimed_Integration_Test } from "./../shared/has-claimed/hasClaimed.t.sol";
+import { HasExpired_Integration_Test } from "./../shared/has-expired/hasExpired.t.sol";
+import { MerkleCampaign_Integration_Shared_Test } from "./../shared/MerkleCampaign.t.sol";
+import { WithdrawFees_Integration_Test } from "./../shared/withdraw-fees/withdrawFees.t.sol";
 
 /*//////////////////////////////////////////////////////////////////////////
                              NON-SHARED TESTS

diff --git a/test/periphery/integration/merkle-campaign/lt/MerkleLT.t.sol b/test/periphery/integration/merkle-campaign/lt/MerkleLT.t.sol
@@ -2,13 +2,12 @@
 pragma solidity >=0.8.22 <0.9.0;
 
 import { ISablierMerkleBase } from "src/periphery/interfaces/ISablierMerkleBase.sol";
-
-import { Clawback_Integration_Test } from "../shared/clawback/clawback.t.sol";
-import { GetFirstClaimTime_Integration_Test } from "../shared/get-first-claim-time/getFirstClaimTime.t.sol";
-import { HasClaimed_Integration_Test } from "../shared/has-claimed/hasClaimed.t.sol";
-import { HasExpired_Integration_Test } from "../shared/has-expired/hasExpired.t.sol";
-import { WithdrawFees_Integration_Test } from "../shared/withdraw-fees/withdrawFees.t.sol";
-import { MerkleCampaign_Integration_Shared_Test } from "../shared/MerkleCampaign.t.sol";
+import { Clawback_Integration_Test } from "./../shared/clawback/clawback.t.sol";
+import { GetFirstClaimTime_Integration_Test } from "./../shared/get-first-claim-time/getFirstClaimTime.t.sol";
+import { HasClaimed_Integration_Test } from "./../shared/has-claimed/hasClaimed.t.sol";
+import { HasExpired_Integration_Test } from "./../shared/has-expired/hasExpired.t.sol";
+import { MerkleCampaign_Integration_Shared_Test } from "./../shared/MerkleCampaign.t.sol";
+import { WithdrawFees_Integration_Test } from "./../shared/withdraw-fees/withdrawFees.t.sol";
 
 /*//////////////////////////////////////////////////////////////////////////
                              NON-SHARED TESTS