fix: merge conflicts

Author: fabianschu

test/e2e/logicModule/FundingPotE2E.t.sol

@@ -15,12 +15,11 @@ import {
     ILM_PC_FundingPot_v1
 } from "@lm/LM_PC_FundingPot_v1.sol";
 import {IERC20PaymentClientBase_v2} from
-    "test/utils/mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
+    "test/mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
 import {
     FM_BC_Bancor_Redeeming_VirtualSupply_v1,
     IFM_BC_Bancor_Redeeming_VirtualSupply_v1
-} from
-    "test/modules/fundingManager/bondingCurve/FM_BC_Bancor_Redeeming_VirtualSupply_v1.t.sol";
+} from "@fm/bondingCurve/FM_BC_Bancor_Redeeming_VirtualSupply_v1.sol";
 import {PP_Streaming_v2} from "src/modules/paymentProcessor/PP_Streaming_v2.sol";
 import {
     LM_PC_Bounties_v2, ILM_PC_Bounties_v2
@@ -29,7 +28,7 @@ import {
 import {FM_DepositVault_v1} from "@fm/depositVault/FM_DepositVault_v1.sol";
 import {ERC165Upgradeable} from
     "@oz-up/utils/introspection/ERC165Upgradeable.sol";
-import {ERC20Mock} from "test/utils/mocks/ERC20Mock.sol";
+import {ERC20Mock} from "test/mocks/external/token/ERC20Mock.sol";
 import {SafeERC20} from "@oz/token/ERC20/utils/SafeERC20.sol";
 import {ERC20Issuance_v1} from "@ex/token/ERC20Issuance_v1.sol";
 
@@ -66,9 +65,11 @@ contract FundingPotE2E is E2ETest {
         //      moduleConfigurations[3:] => Additional Logic Modules
 
         issuanceToken = new ERC20Issuance_v1(
-            "Bonding Curve Token", "BCT", 18, type(uint).max - 1, address(this)
+            "Bonding Curve Token", "BCT", 18, type(uint).max - 1
         );
 
+        issuanceToken.setMinter(address(this), true);
+
         IFM_BC_Bancor_Redeeming_VirtualSupply_v1.BondingCurveProperties memory
             bc_properties = IFM_BC_Bancor_Redeeming_VirtualSupply_v1
                 .BondingCurveProperties({

test/mocks/modules/fundingManager/FundingManagerV1Mock.sol

@@ -42,8 +42,9 @@ contract FundingManagerV1Mock is IFundingManager_v1, Module_v1 {
     ) public override(Module_v1) initializer {
         __Module_init(orchestrator_, metadata);
         _bondingToken = new ERC20Issuance_v1(
-            "Bonding Token", "BOND", 18, type(uint).max - 1, address(this)
+            "Bonding Token", "BOND", 18, type(uint).max - 1
         );
+        _bondingToken.setMinter(address(this), true);
     }
 
     function setToken(IERC20 newToken) public {

test/unit/modules/logicModule/LM_PC_FundingPot_v1.t.sol

@@ -6,8 +6,8 @@ import {
     ModuleTest,
     IModule_v1,
     IOrchestrator_v1
-} from "test/modules/ModuleTest.sol";
-import {OZErrors} from "test/utils/errors/OZErrors.sol";
+} from "test/unit/modules/ModuleTest.sol";
+import {OZErrors} from "test/testUtilities/OZErrors.sol";
 
 // External
 import {Clones} from "@oz/proxy/Clones.sol";
@@ -17,20 +17,20 @@ import {
     IERC20PaymentClientBase_v2,
     ERC20PaymentClientBaseV2Mock,
     ERC20Mock
-} from "test/utils/mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
+} from "test/mocks/modules/paymentClient/ERC20PaymentClientBaseV2Mock.sol";
 
 import {
     ERC721Mock,
     MockHookContract,
     MockFailingHookContract
-} from "test/utils/mocks/modules/logicModules/LM_PC_FundingPot_v1Mock.sol";
+} from "test/mocks/modules/logicModule/LM_PC_FundingPot_v1Mock.sol";
 
 import {IBondingCurveBase_v1} from
     "@fm/bondingCurve/interfaces/IBondingCurveBase_v1.sol";
 
 // System under Test (SuT)
 import {LM_PC_FundingPot_v1_Exposed} from
-    "test/modules/logicModule/LM_PC_FundingPot_v1_Exposed.sol";
+    "test/unit/modules/logicModule/LM_PC_FundingPot_v1_Exposed.sol";
 import {ILM_PC_FundingPot_v1} from
     "src/modules/logicModule/interfaces/ILM_PC_FundingPot_v1.sol";