refactor: early return

Co-authored-by: Kevin Ingersoll <[email protected]>
latticexyz · Apr 24, 2024 · 0e5fdb7 · 0e5fdb7
1 parent 6e60921
commit 0e5fdb7
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/packages/cli/src/deploy/ensureWorldFactory.ts b/packages/cli/src/deploy/ensureWorldFactory.ts
@@ -8,27 +8,23 @@ export async function ensureWorldFactory(
   deployerAddress: Hex,
   withWorldProxy?: boolean,
 ): Promise<Address> {
-  if (!withWorldProxy) {
-    const contracts = getWorldFactoryContracts(deployerAddress);
-
-    // WorldFactory constructor doesn't call InitModule, only sets its address, so we can do these in parallel since the address is deterministic
-    await ensureContractsDeployed({
-      client,
-      deployerAddress,
-      contracts: Object.values(contracts),
-    });
-
-    return contracts.WorldFactory.address;
-  } else {
+  if (withWorldProxy) {
     const contracts = getWorldProxyFactoryContracts(deployerAddress);
-
     // WorldFactory constructor doesn't call InitModule, only sets its address, so we can do these in parallel since the address is deterministic
     await ensureContractsDeployed({
       client,
       deployerAddress,
       contracts: Object.values(contracts),
     });
-
     return contracts.WorldProxyFactory.address;
   }
+
+  const contracts = getWorldFactoryContracts(deployerAddress);
+  // WorldFactory constructor doesn't call InitModule, only sets its address, so we can do these in parallel since the address is deterministic
+  await ensureContractsDeployed({
+    client,
+    deployerAddress,
+    contracts: Object.values(contracts),
+  });
+  return contracts.WorldFactory.address;
 }