refactor

OffchainLabs · Oct 9, 2024 · d49fc26 · d49fc26
1 parent 645889d
commit d49fc26
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/utils/getRollupCreatorAddress.ts b/src/utils/getRollupCreatorAddress.ts
@@ -9,17 +9,16 @@ export function getRollupCreatorAddress<TChain extends Chain | undefined>(
   const { chainId: parentChainId, isCustom: parentChainIsCustom } = validateParentChain(client);
 
   if (parentChainIsCustom) {
-    const customParentChainRollupCreator = client.chain?.contracts?.rollupCreator as
-      | ChainContract
-      | undefined;
+    const contract = client.chain?.contracts?.rollupCreator as ChainContract | undefined;
+    const address = contract?.address;
 
-    // check if it's a custom parent chain with the factory address provided
-
-    if (!customParentChainRollupCreator?.address) {
-      throw new Error('invalid rollup creator address provided');
+    if (typeof address === 'undefined') {
+      throw new Error(
+        `Address for RollupCreator is missing on custom parent chain with id ${parentChainId}`,
+      );
     }
 
-    return customParentChainRollupCreator?.address;
+    return address;
   }
 
   return rollupCreatorAddress[parentChainId];

diff --git a/src/utils/getTokenBridgeCreatorAddress.ts b/src/utils/getTokenBridgeCreatorAddress.ts
@@ -9,17 +9,16 @@ export function getTokenBridgeCreatorAddress<TChain extends Chain | undefined>(
   const { chainId: parentChainId, isCustom: parentChainIsCustom } = validateParentChain(client);
 
   if (parentChainIsCustom) {
-    const customParentChainTokenBridgeCreator = client.chain?.contracts?.tokenBridgeCreator as
-      | ChainContract
-      | undefined;
+    const contract = client.chain?.contracts?.tokenBridgeCreator as ChainContract | undefined;
+    const address = contract?.address;
 
-    // check if it's a custom parent chain with the factory address provided
-
-    if (!customParentChainTokenBridgeCreator?.address) {
-      throw new Error('invalid token bridge creator address provided');
+    if (typeof address === 'undefined') {
+      throw new Error(
+        `Address for TokenBridgeCreator is missing on custom parent chain with id ${parentChainId}`,
+      );
     }
 
-    return customParentChainTokenBridgeCreator?.address;
+    return address;
   }
 
   return tokenBridgeCreatorAddress[parentChainId];