test: deploy Defaults in Base_Test (#375)

test: remove unneeded assets function in Defaults
sablier-labs · Jul 22, 2024 · a7a4a66 · a7a4a66
1 parent 91ca871
commit a7a4a66
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git a/test/Base.t.sol b/test/Base.t.sol
@@ -78,6 +78,8 @@ abstract contract Base_Test is
         users.recipient2 = createUser("Recipient2");
         users.recipient3 = createUser("Recipient3");
         users.recipient4 = createUser("Recipient4");
+
+        defaults = new Defaults({ users_: users, asset_: dai });
     }
 
     /*//////////////////////////////////////////////////////////////////////////

diff --git a/test/fork/Fork.t.sol b/test/fork/Fork.t.sol
@@ -41,10 +41,6 @@ abstract contract Fork_Test is Base_Test, V2CoreFuzzers {
         // Load the external dependencies.
         loadDependencies();
 
-        // Deploy the defaults contract and allow it to access cheatcodes.
-        defaults = new Defaults({ users_: users, asset_: FORK_ASSET });
-        vm.allowCheatcodes(address(defaults));
-
         // Deploy V2 Periphery.
         deployPeripheryConditionally();
 

diff --git a/test/integration/Integration.t.sol b/test/integration/Integration.t.sol
@@ -3,7 +3,6 @@ pragma solidity >=0.8.22 <0.9.0;
 
 import { Precompiles as V2CorePrecompiles } from "@sablier/v2-core/precompiles/Precompiles.sol";
 
-import { Defaults } from "../utils/Defaults.sol";
 import { Base_Test } from "../Base.t.sol";
 
 /// @notice Common logic needed by all integration tests.
@@ -19,9 +18,6 @@ abstract contract Integration_Test is Base_Test {
         // Deploy the external dependencies.
         deployDependencies();
 
-        // Deploy the defaults contract.
-        defaults = new Defaults({ users_: users, asset_: dai });
-
         // Deploy V2 Periphery.
         deployPeripheryConditionally();
 

diff --git a/test/utils/Defaults.sol b/test/utils/Defaults.sol
@@ -163,11 +163,6 @@ contract Defaults is Merkle {
                                  SABLIER-V2-LOCKUP
     //////////////////////////////////////////////////////////////////////////*/
 
-    function assets() public view returns (IERC20[] memory assets_) {
-        assets_ = new IERC20[](1);
-        assets_[0] = asset;
-    }
-
     function broker() public view returns (Broker memory) {
         return Broker({ account: users.broker, fee: BROKER_FEE });
     }