fixup! refactor!: the TxSubmit endpoint no longer adds the stack trac…

…e when returning domain errors
input-output-hk · Mar 17, 2023 · 9484fa0 · 9484fa0
1 parent aeb27bb
commit 9484fa0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/packages/core/src/Cardano/util/txSubmissionErrors.ts b/packages/core/src/Cardano/util/txSubmissionErrors.ts
@@ -1,4 +1,5 @@
 import { CardanoNodeErrors } from '../../CardanoNode';
+import { isProductionEnvironment, stripStackTrace } from '@cardano-sdk/util';
 
 /**
  * Tests the provided error for an instanceof match in the TxSubmissionErrors object
@@ -17,10 +18,19 @@ export const asTxSubmissionError = (error: unknown): CardanoNodeErrors.TxSubmiss
   if (Array.isArray(error)) {
     for (const err of error) {
       if (isTxSubmissionError(err)) {
+        if (isProductionEnvironment()) stripStackTrace(err);
+
         return err;
       }
     }
     return null;
   }
-  return isTxSubmissionError(error) ? error : null;
+
+  if (isTxSubmissionError(error)) {
+    if (isProductionEnvironment()) stripStackTrace(error);
+
+    return error;
+  }
+
+  return null;
 };
diff --git a/packages/ogmios/src/CardanoNode/OgmiosCardanoNode.ts b/packages/ogmios/src/CardanoNode/OgmiosCardanoNode.ts
@@ -17,7 +17,7 @@ import {
   getServerHealth
 } from '@cardano-ogmios/client';
 import { Logger } from 'ts-log';
-import { RunnableModule, contextLogger, isProductionEnvironment, stripStackTrace } from '@cardano-sdk/util';
+import { RunnableModule, contextLogger } from '@cardano-sdk/util';
 import { createInteractionContextWithLogger } from '../util';
 import { queryEraSummaries } from './queries';
 
@@ -65,11 +65,7 @@ export class OgmiosCardanoNode extends RunnableModule implements CardanoNode {
       this.#logger.info('Getting system start');
       return await this.#stateQueryClient.systemStart();
     } catch (error) {
-      const domainError = CardanoNodeUtil.asCardanoNodeError(error);
-
-      if (isProductionEnvironment()) stripStackTrace(domainError);
-
-      throw domainError || new CardanoNodeErrors.UnknownCardanoNodeError(error);
+      throw CardanoNodeUtil.asCardanoNodeError(error) || new CardanoNodeErrors.UnknownCardanoNodeError(error);
     }
   }
 
@@ -89,11 +85,7 @@ export class OgmiosCardanoNode extends RunnableModule implements CardanoNode {
       }
       return map;
     } catch (error) {
-      const domainError = CardanoNodeUtil.asCardanoNodeError(error);
-
-      if (isProductionEnvironment()) stripStackTrace(domainError);
-
-      throw domainError || new CardanoNodeErrors.UnknownCardanoNodeError(error);
+      throw CardanoNodeUtil.asCardanoNodeError(error) || new CardanoNodeErrors.UnknownCardanoNodeError(error);
     }
   }
 

diff --git a/packages/ogmios/src/Provider/TxSubmitProvider/OgmiosTxSubmitProvider.ts b/packages/ogmios/src/Provider/TxSubmitProvider/OgmiosTxSubmitProvider.ts
@@ -19,7 +19,7 @@ import {
   getServerHealth
 } from '@cardano-ogmios/client';
 import { Logger } from 'ts-log';
-import { RunnableModule, contextLogger, isNotNil, isProductionEnvironment, stripStackTrace } from '@cardano-sdk/util';
+import { RunnableModule, contextLogger, isNotNil } from '@cardano-sdk/util';
 import { createInteractionContextWithLogger } from '../../util';
 
 /**
@@ -75,11 +75,7 @@ export class OgmiosTxSubmitProvider extends RunnableModule implements TxSubmitPr
       );
       await this.#txSubmissionClient.submitTx(signedTransaction);
     } catch (error) {
-      const txSubmitError = Cardano.util.asTxSubmissionError(error);
-
-      if (isProductionEnvironment()) stripStackTrace(txSubmitError);
-
-      throw txSubmitError || new CardanoNodeErrors.UnknownTxSubmissionError(error);
+      throw Cardano.util.asTxSubmissionError(error) || new CardanoNodeErrors.UnknownTxSubmissionError(error);
     }
   }