fix antipatterns

masa-finance · Jun 12, 2023 · e451e76 · e451e76
1 parent 77a5b21
commit e451e76
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 30 deletions.
diff --git a/src/modules/account/get-balances.ts b/src/modules/account/get-balances.ts
@@ -77,21 +77,19 @@ export const getBalances = async (
   ): Promise<number | undefined> => {
     let result;
 
-    if (contract.address === constants.AddressZero) {
-      return result;
-    }
-
-    try {
-      result = (await contract.balanceOf(addressToLoad)).toNumber();
-    } catch (error: unknown) {
-      if (error instanceof Error) {
-        console.error(
-          `Contract: ${await contract
-            .name()
-            .catch(() => contract.address)} Wallet Address: ${addressToLoad} ${
-            error.message
-          }`
-        );
+    if (contract.address !== constants.AddressZero) {
+      try {
+        result = (await contract.balanceOf(addressToLoad)).toNumber();
+      } catch (error: unknown) {
+        if (error instanceof Error) {
+          console.error(
+            `Contract: ${await contract
+              .name()
+              .catch(
+                () => contract.address
+              )} Wallet Address: ${addressToLoad} ${error.message}`
+          );
+        }
       }
     }
 

diff --git a/src/modules/sbt/SSSBT/sign.ts b/src/modules/sbt/SSSBT/sign.ts
@@ -51,25 +51,22 @@ export const signSSSBT = async (
 
   // sign to create a signature
   const signResult = await sign("ReferenceSBTSelfSovereign", types, value);
-  if (!signResult) {
-    return result;
-  }
-
-  const { signature, authorityAddress } = signResult;
 
-  if (masa.config.verbose) {
-    console.info({
-      signature,
+  if (signResult) {
+    const { signature, authorityAddress } = signResult;
+    if (masa.config.verbose) {
+      console.info({
+        signature,
+        authorityAddress,
+        signatureDate,
+      });
+    }
+    result = {
       authorityAddress,
       signatureDate,
-    });
+      signature,
+    };
   }
 
-  result = {
-    authorityAddress,
-    signatureDate,
-    signature,
-  };
-
   return result;
 };