fix: more renames

Author: vgorkavenko

…nce_test_csm_settle_el_stealing_setup.py …_settle_general_delayed_penalty_setup.pyscripts/acceptance_test_csm_settle_el_stealing_setup.py renamed to scripts/acceptance_test_settle_general_delayed_penalty_setup.py scripts/acceptance_test_csm_settle_el_stealing_setup.py renamed to scripts/acceptance_test_settle_general_delayed_penalty_setup.py

@@ -8,12 +8,14 @@
 @dataclass
 class DeployConfig:
     trusted_caller: str
-    csm_address: str
+    factory_name: str
+    module_address: str
 
 
 deploy_config = DeployConfig(
     trusted_caller="",
-    csm_address=""
+    factory_name="",
+    module_address=""
 )
 
 
@@ -31,19 +33,20 @@ def main():
     log.br()
 
     log.nb("trusted_caller", deploy_config.trusted_caller)
-    log.nb("csm_address", deploy_config.csm_address)
+    log.nb("factory_name", deploy_config.factory_name)
+    log.nb("module_address", deploy_config.module_address)
 
     log.br()
 
-    settle_el_stealing_factory = SettleGeneralDelayedPenalty.at(tx.contract_address)
-    log.nb('SettleGeneralDelayedPenalty address (from tx)', settle_el_stealing_factory)
+    settle_general_delayed_penalty_factory = SettleGeneralDelayedPenalty.at(tx.contract_address)
+    log.nb('SettleGeneralDelayedPenalty address (from tx)', settle_general_delayed_penalty_factory)
 
     log.br()
 
-    assert settle_el_stealing_factory.csm() == deploy_config.csm_address
-    log.nb('CSM address is correct')
+    assert settle_general_delayed_penalty_factory.csm() == deploy_config.module_address
+    log.nb('Module address is correct')
 
-    assert settle_el_stealing_factory.trustedCaller() == deploy_config.trusted_caller
+    assert settle_general_delayed_penalty_factory.trustedCaller() == deploy_config.trusted_caller
     log.nb('Trusted caller is correct')
 
     log.br()

…deploy_csm_settle_el_stealing_factory.py …ettle_general_delayed_penalty_factory.pyscripts/deploy_csm_settle_el_stealing_factory.py renamed to scripts/deploy_csm_settle_general_delayed_penalty_factory.py scripts/deploy_csm_settle_el_stealing_factory.py renamed to scripts/deploy_csm_settle_general_delayed_penalty_factory.py

@@ -7,7 +7,7 @@
     web3,
 )
 
-from utils import csm, log
+from utils import cm, log
 from utils.config import (
     get_is_live,
     get_deployer_account,
@@ -26,13 +26,28 @@ def get_trusted_caller():
     return trusted_caller
 
 
+def get_factory_name():
+    if "FACTORY_NAME" not in os.environ:
+        raise EnvironmentError("Please set FACTORY_NAME env variable")
+
+    factory_name = os.environ["FACTORY_NAME"]
+
+    if not factory_name:
+        raise ValueError("Factory name cannot be empty")
+    if not isinstance(factory_name, str):
+        raise TypeError("Factory name must be a string")
+
+    return factory_name
+
+
 def main():
     network_name = get_network_name()
-    csm_contracts = csm.contracts(network=network_name)
+    curated_contracts = cm.contracts(network=network_name)
 
     deployer = get_deployer_account(get_is_live(), network=network_name)
     trusted_caller = get_trusted_caller()
-    cs_module = csm_contracts.module
+    factory_name = get_factory_name()
+    module = curated_contracts.module
 
     log.br()
 
@@ -46,8 +61,9 @@ def main():
 
     log.br()
 
-    log.ok("CSModule module address", cs_module)
     log.ok("Trusted caller", trusted_caller)
+    log.ok("Factory name", factory_name)
+    log.ok("Module address", module)
 
     log.br()
 
@@ -63,27 +79,27 @@ def main():
     deployment_artifacts = {}
 
     # SettleGeneralDelayedPenalty
-    csm_settle_el_stealing_penalty = SettleGeneralDelayedPenalty.deploy(
-        trusted_caller, cs_module.address, {"from": deployer}
+    settle_general_delayed_penalty = SettleGeneralDelayedPenalty.deploy(
+        trusted_caller, module.address, {"from": deployer}
     )
     deployment_artifacts["SettleGeneralDelayedPenalty"] = {
         "contract": "SettleGeneralDelayedPenalty",
-        "address": csm_settle_el_stealing_penalty.address,
-        "constructorArgs": [trusted_caller, cs_module.address],
+        "address": settle_general_delayed_penalty.address,
+        "constructorArgs": [trusted_caller, module.address],
     }
 
-    log.ok("Deployed SettleGeneralDelayedPenalty", csm_settle_el_stealing_penalty.address)
+    log.ok("Deployed SettleGeneralDelayedPenalty", settle_general_delayed_penalty.address)
 
     log.br()
     log.nb("All factories have been deployed.")
-    log.nb("Saving atrifacts...")
+    log.nb("Saving artifacts...")
 
     with open(f"deployed-csm-{network_name}.json", "w") as outfile:
         json.dump(deployment_artifacts, outfile)
 
     log.nb("Starting code verification.")
     log.br()
 
-    SettleGeneralDelayedPenalty.publish_source(csm_settle_el_stealing_penalty)
+    SettleGeneralDelayedPenalty.publish_source(settle_general_delayed_penalty)
 
     log.br()