Replace _loadConfig with _loadDeployedContractsInSimulation

Author: 0xAtum

script/BaseScript.sol

@@ -49,7 +49,7 @@ abstract contract BaseScript is Script {
 
   constructor() {
     _loadChains();
-    _loadContracts(false);
+    _loadDeployedContracts(false);
   }
 
   function _loadChains() private {
@@ -69,6 +69,28 @@ abstract contract BaseScript is Script {
     }
   }
 
+  /**
+   * @notice _loadDeployedContractsInSimulation - Load deployed contracts in simulation
+   * too.
+   */
+  function _loadDeployedContractsInSimulation() internal {
+    _loadDeployedContracts(true);
+  }
+
+  function _loadDeployedContracts(bool _loadInSimulation) private {
+    if (!_loadInSimulation && _isSimulation()) return;
+
+    Deployment[] memory deployments = _getDeployedContracts(_getNetwork());
+
+    Deployment memory cached;
+    uint256 length = deployments.length;
+    for (uint256 i = 0; i < length; ++i) {
+      cached = deployments[i];
+      contracts[cached.contractName] = cached.contractAddress;
+      vm.label(cached.contractAddress, cached.contractName);
+    }
+  }
+
   //Entrypoint for the script
   function run() external virtual;
 
@@ -272,25 +294,6 @@ abstract contract BaseScript is Script {
     return currentNetwork == localNetwork;
   }
 
-  /**
-   * @notice _loadContracts - Loads the deployed contracts from the current network inside
-   * the mapping "contracts"
-   * @param _loadInSimulation If it should load in simulation
-   */
-  function _loadContracts(bool _loadInSimulation) internal {
-    if (!_loadInSimulation && _isSimulation()) return;
-
-    Deployment[] memory deployments = _getDeployedContracts(_getNetwork());
-
-    Deployment memory cached;
-    uint256 length = deployments.length;
-    for (uint256 i = 0; i < length; ++i) {
-      cached = deployments[i];
-      contracts[cached.contractName] = cached.contractAddress;
-      vm.label(cached.contractAddress, cached.contractName);
-    }
-  }
-
   /**
    * @notice _loadOtherContractNetwork - Loads the deployed contracts from a network
    * inside the mapping "contractsOtherNetworks"

script/deploy/HelloWorld.s.sol

@@ -35,6 +35,9 @@ contract HelloWorldScript is BaseScript {
     Config memory config =
       abi.decode(vm.parseJson(file, string.concat(".", _getNetwork())), (Config));
 
+    // Load contracts in simulation
+    // _loadDeployedContractsInSimulation();
+
     // Asserts are there as an example to showcase the config is functionnal
     assert(
       keccak256(abi.encode(config.exampleString)) == keccak256(abi.encode("HelloWorld"))

script/deploy/diamond-example/DiamondExample.s.sol

@@ -22,7 +22,6 @@ contract DiamondExample is BaseScript, DiamondHelper {
   string private constant DIAMOND_LOUPE_INTERFACE = "IDiamondLoupe";
 
   function run() external override {
-    _loadContracts(false);
     IDiamondCut.FacetCut[] memory facetCuts = new IDiamondCut.FacetCut[](0);
 
     //Deploy Implementation of Core Diamond Proxy (DiamondCutFacet & DiamondLoupeFacet)

script/utils/diamond/FacetDeployer.sol

@@ -15,7 +15,6 @@ abstract contract FacetDeployerScript is BaseScript, DiamondHelper {
   }
 
   function run() external override {
-    _loadContracts(false);
     tryToDeploy(contracts[FACET_NAME]);
   }
 
@@ -25,9 +24,7 @@ abstract contract FacetDeployerScript is BaseScript, DiamondHelper {
 
   function tryToDeploy(address _cachedContract) public virtual returns (address);
 
-  function getFacetCuts() external returns (IDiamondCut.FacetCut[] memory) {
-    _loadContracts(false);
-
+  function getFacetCuts() external view returns (IDiamondCut.FacetCut[] memory) {
     address facet = contracts[FACET_NAME];
     require(facet != address(0), "Facet not deployed.");