extract constants to shared files (#660)

etherisc · Sep 16, 2024 · 17f8ca2 · 17f8ca2
1 parent de04d82
commit 17f8ca2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/contracts/instance/InstanceAdmin.sol b/contracts/instance/InstanceAdmin.sol
@@ -14,18 +14,12 @@ import {ObjectType, INSTANCE} from "../type/ObjectType.sol";
 import {RoleId, ADMIN_ROLE} from "../type/RoleId.sol";
 import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
+import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 
 
 contract InstanceAdmin is
     AccessAdmin
 {
-    string public constant INSTANCE_TARGET_NAME = "Instance";
-    string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
-    string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
-    string public constant PRODUCT_STORE_TARGET_NAME = "ProductStore";
-    string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
-    string public constant RISK_SET_TARGET_NAME = "RiskSet";
-
     // onlyInstanceService
     error ErrorInstanceAdminNotInstanceService(address caller);
 

diff --git a/contracts/instance/InstanceAuthorizationV3.sol b/contracts/instance/InstanceAuthorizationV3.sol
@@ -10,6 +10,7 @@ import {ACCOUNTING, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION
 import {BundleSet} from "../instance/BundleSet.sol";
 import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceStore} from "../instance/InstanceStore.sol";
+import {INSTANCE_TARGET_NAME, INSTANCE_ADMIN_TARGET_NAME, INSTANCE_STORE_TARGET_NAME, PRODUCT_STORE_TARGET_NAME, BUNDLE_SET_TARGET_NAME, RISK_SET_TARGET_NAME} from "./TargetNames.sol";
 import {ProductStore} from "../instance/ProductStore.sol";
 import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {RiskSet} from "../instance/RiskSet.sol"; 
@@ -22,13 +23,6 @@ contract InstanceAuthorizationV3
      string public constant INSTANCE_ROLE_NAME = "InstanceRole";
      string public constant INSTANCE_OWNER_ROLE_NAME = "InstanceOwnerRole";
 
-     string public constant INSTANCE_TARGET_NAME = "Instance";
-     string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
-     string public constant PRODUCT_STORE_TARGET_NAME = "ProductStore";
-     string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
-     string public constant BUNDLE_SET_TARGET_NAME = "BundleSet";
-     string public constant RISK_SET_TARGET_NAME = "RiskSet";
-
      constructor()
           Authorization(
                INSTANCE_TARGET_NAME, 

diff --git a/contracts/instance/TargetNames.sol b/contracts/instance/TargetNames.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+string constant INSTANCE_TARGET_NAME = "Instance";
+string constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
+string constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
+string constant PRODUCT_STORE_TARGET_NAME = "ProductStore";
+string constant BUNDLE_SET_TARGET_NAME = "BundleSet";
+string constant RISK_SET_TARGET_NAME = "RiskSet";
+