test: all tests pass

Chia-Network · Oct 12, 2023 · 5f7ad86 · 5f7ad86
1 parent 6386a34
commit 5f7ad86
Show file tree

Hide file tree

Showing 20 changed files with 477 additions and 141 deletions.
diff --git a/src/database/index.js b/src/database/index.js
@@ -26,25 +26,29 @@ const logDebounce = _.debounce(() => {
 }, 120000);
 
 export const safeMirrorDbHandler = (callback) => {
-  try {
-    sequelizeMirror
-      .authenticate()
-      .then(async () => {
-        try {
-          await callback();
-        } catch (e) {
-          logger.error(`mirror_error:${e.message}`);
-        }
-      })
-      .catch(() => {
-        logDebounce();
-      });
-  } catch (error) {
-    logger.error(
-      'MirrorDB tried to update before it was initialize, will try again later',
-      error,
-    );
-  }
+  return new Promise((resolve) => {
+    try {
+      sequelizeMirror
+        .authenticate()
+        .then(async () => {
+          try {
+            await callback();
+          } catch (e) {
+            logger.error(`mirror_error:${e.message}`);
+          }
+        })
+        .catch(() => {
+          logDebounce();
+        });
+    } catch (error) {
+      logger.error(
+        'MirrorDB tried to update before it was initialize, will try again later',
+        error,
+      );
+    } finally {
+      resolve();
+    }
+  });
 };
 
 export const sanitizeSqliteFtsQuery = (query) => {

diff --git a/src/datalayer/syncService.js b/src/datalayer/syncService.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 
 import { decodeHex, decodeDataLayerResponse } from '../utils/datalayer-utils';
-import { Organization, Staging, ModelKeys } from '../models';
+import { Organization, Staging, ModelKeys, Simulator } from '../models';
 import { getConfig } from '../utils/config-loader';
 import { logger } from '../config/logger.cjs';
 
@@ -278,11 +278,28 @@ const getSubscribedStoreData = async (storeId, retry = 0) => {
 const getRootHistory = (storeId) => {
   if (!USE_SIMULATOR) {
     return dataLayer.getRootHistory(storeId);
+  } else {
+    return [
+      {
+        confirmed: true,
+        root_hash:
+          '0xs571e7fcf464b3dc1d31a71894633eb47cb9dbdb824f6b4a535ed74f23f32e50',
+        timestamp: 1678518050,
+      },
+      {
+        confirmed: true,
+        root_hash:
+          '0xf571e7fcf464b3dc1d31a71894633eb47cb9dbdb824f6b4a535ed74f23f32e50',
+        timestamp: 1678518053,
+      },
+    ];
   }
 };
 
 const getRootDiff = (storeId, root1, root2) => {
   if (!USE_SIMULATOR) {
+    return Simulator.getMockedKvDiffFromStagingTable();
+  } else {
     return dataLayer.getRootDiff(storeId, root1, root2);
   }
 };

diff --git a/src/models/audit/audit.model.js b/src/models/audit/audit.model.js
@@ -9,17 +9,35 @@ import findDuplicateIssuancesSql from './sql/find-duplicate-issuances.sql.js';
 
 class Audit extends Model {
   static async create(values, options) {
-    safeMirrorDbHandler(() => AuditMirror.create(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await AuditMirror.create(values, mirrorOptions);
+    });
     return super.create(values, options);
   }
 
-  static async destroy(values, options) {
-    safeMirrorDbHandler(() => AuditMirror.destroy(values, options));
-    return super.destroy(values, options);
+  static async destroy(options) {
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await AuditMirror.destroy(mirrorOptions);
+    });
+    return super.destroy(options);
   }
 
   static async upsert(values, options) {
-    safeMirrorDbHandler(() => AuditMirror.upsert(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await AuditMirror.upsert(values, mirrorOptions);
+    });
     return super.upsert(values, options);
   }
 

diff --git a/src/models/co-benefits/co-benefits.model.js b/src/models/co-benefits/co-benefits.model.js
@@ -25,18 +25,36 @@ class CoBenefit extends Model {
   }
 
   static async create(values, options) {
-    safeMirrorDbHandler(() => CoBenefitMirror.create(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await CoBenefitMirror.create(values, mirrorOptions);
+    });
     return super.create(values, options);
   }
 
   static async upsert(values, options) {
-    safeMirrorDbHandler(() => CoBenefitMirror.upsert(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await CoBenefitMirror.upsert(values, mirrorOptions);
+    });
     return super.upsert(values, options);
   }
 
-  static async destroy(values, options) {
-    safeMirrorDbHandler(() => CoBenefitMirror.destroy(values, options));
-    return super.destroy(values, options);
+  static async destroy(options) {
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await CoBenefitMirror.destroy(mirrorOptions);
+    });
+    return super.destroy(options);
   }
 }
 

diff --git a/src/models/estimations/estimations.model.js b/src/models/estimations/estimations.model.js
@@ -25,18 +25,37 @@ class Estimation extends Model {
   }
 
   static async create(values, options) {
-    safeMirrorDbHandler(() => EstimationMirror.create(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+
+      await EstimationMirror.create(values, mirrorOptions);
+    });
     return super.create(values, options);
   }
 
   static async upsert(values, options) {
-    safeMirrorDbHandler(() => EstimationMirror.upsert(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await EstimationMirror.upsert(values, mirrorOptions);
+    });
     return super.upsert(values, options);
   }
 
-  static async destroy(values, options) {
-    safeMirrorDbHandler(() => EstimationMirror.destroy(values, options));
-    return super.destroy(values, options);
+  static async destroy(options) {
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await EstimationMirror.destroy(mirrorOptions);
+    });
+    return super.destroy(options);
   }
 }
 

diff --git a/src/models/issuances/issuances.model.js b/src/models/issuances/issuances.model.js
@@ -32,17 +32,35 @@ class Issuance extends Model {
   }
 
   static async create(values, options) {
-    safeMirrorDbHandler(() => IssuanceMirror.create(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await IssuanceMirror.create(values, mirrorOptions);
+    });
     return super.create(values, options);
   }
 
-  static async destroy(values, options) {
-    safeMirrorDbHandler(() => IssuanceMirror.destroy(values, options));
-    return super.destroy(values, options);
+  static async destroy(options) {
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await IssuanceMirror.destroy(mirrorOptions);
+    });
+    return super.destroy(options);
   }
 
   static async upsert(values, options) {
-    safeMirrorDbHandler(() => IssuanceMirror.upsert(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await IssuanceMirror.upsert(values, mirrorOptions);
+    });
     return super.upsert(values, options);
   }
 }

diff --git a/src/models/labelUnits/labelUnits.model.js b/src/models/labelUnits/labelUnits.model.js
@@ -9,17 +9,35 @@ import { LabelUnitMirror } from './labelUnits.model.mirror';
 
 class LabelUnit extends Model {
   static async create(values, options) {
-    safeMirrorDbHandler(() => LabelUnitMirror.create(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await LabelUnitMirror.create(values, mirrorOptions);
+    });
     return super.create(values, options);
   }
 
-  static async destroy(values, options) {
-    safeMirrorDbHandler(() => LabelUnitMirror.destroy(values, options));
-    return super.destroy(values, options);
+  static async destroy(options) {
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await LabelUnitMirror.destroy(mirrorOptions);
+    });
+    return super.destroy(options);
   }
 
   static async upsert(values, options) {
-    safeMirrorDbHandler(() => LabelUnitMirror.upsert(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await LabelUnitMirror.upsert(values, mirrorOptions);
+    });
     return super.upsert(values, options);
   }
 }

diff --git a/src/models/labels/labels.model.js b/src/models/labels/labels.model.js
@@ -38,17 +38,35 @@ class Label extends Model {
   }
 
   static async create(values, options) {
-    safeMirrorDbHandler(() => LabelMirror.create(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await LabelMirror.create(values, mirrorOptions);
+    });
     return super.create(values, options);
   }
 
-  static async destroy(values, options) {
-    safeMirrorDbHandler(() => LabelMirror.destroy(values, options));
-    return super.destroy(values, options);
+  static async destroy(options) {
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await LabelMirror.destroy(mirrorOptions);
+    });
+    return super.destroy(options);
   }
 
   static async upsert(values, options) {
-    safeMirrorDbHandler(() => LabelMirror.upsert(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await LabelMirror.upsert(values, mirrorOptions);
+    });
     return super.upsert(values, options);
   }
 }

diff --git a/src/models/locations/locations.model.js b/src/models/locations/locations.model.js
@@ -34,17 +34,35 @@ class ProjectLocation extends Model {
   }
 
   static async create(values, options) {
-    safeMirrorDbHandler(() => ProjectLocationMirror.create(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await ProjectLocationMirror.create(values, mirrorOptions);
+    });
     return super.create(values, options);
   }
 
-  static async destroy(values, options) {
-    safeMirrorDbHandler(() => ProjectLocationMirror.destroy(values, options));
-    return super.destroy(values, options);
+  static async destroy(options) {
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await ProjectLocationMirror.destroy(mirrorOptions);
+    });
+    return super.destroy(options);
   }
 
   static async upsert(values, options) {
-    safeMirrorDbHandler(() => ProjectLocationMirror.upsert(values, options));
+    safeMirrorDbHandler(async () => {
+      const mirrorOptions = {
+        ...options,
+        transaction: options?.mirrorTransaction,
+      };
+      await ProjectLocationMirror.upsert(values, mirrorOptions);
+    });
     return super.upsert(values, options);
   }
 }