improve callback code

encointer · Oct 25, 2024 · d2acd0e · d2acd0e
1 parent 4a87aad
commit d2acd0e
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/packages/worker-api/src/worker.ts b/packages/worker-api/src/worker.ts
@@ -183,33 +183,25 @@ export class Worker implements IWorkerBase {
 
     return new Promise( async (resolve, reject) => {
       const onStatusChange = (error: Error | null, result: string) => {
-        if (error !== null) {
-          throw new Error(`Callback Error: ${error.message}`);
+        if (error) {
+          reject(new Error(`Callback Error: ${error.message}`));
+          return;
         }
 
-        console.debug(`DirectRequestStatus: ${JSON.stringify(result)}`)
+        console.debug(`DirectRequestStatus: ${JSON.stringify(result)}`);
         const directRequestStatus = this.createType('DirectRequestStatus', result);
 
         if (directRequestStatus.isError) {
           const errorMsg = this.createType('String', directRequestStatus.value);
-          throw new Error(`DirectRequestStatus is Error ${errorMsg}`);
-        }
-
-        if (directRequestStatus.isOk) {
-          resolve({
-            topHash: topHash,
-            status: undefined
-          })
-        }
-
-        if (directRequestStatus.isTrustedOperationStatus) {
-          console.log(`TrustedOperationStatus: ${directRequestStatus}`)
+          reject(new Error(`DirectRequestStatus is Error: ${errorMsg}`));
+        } else if (directRequestStatus.isOk) {
+          resolve({topHash, status: undefined});
+        } else if (directRequestStatus.isTrustedOperationStatus) {
+          console.log(`TrustedOperationStatus: ${directRequestStatus}`);
           const status = directRequestStatus.asTrustedOperationStatus;
+
           if (connection_can_be_closed(status)) {
-            resolve({
-              topHash: topHash,
-              status: status
-            })
+            resolve({topHash, status});
           }
         }
       }