fix: picklists load on testnet

Chia-Network · May 26, 2022 · 2737349 · 2737349
1 parent 5f5f8d5
commit 2737349
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 150 deletions.
diff --git a/0001-feat-sort-by-serial-number.patch b/0001-feat-sort-by-serial-number.patch
diff --git a/src/models/governance/governance.model.js b/src/models/governance/governance.model.js
@@ -9,11 +9,12 @@ import { keyValueToChangeList } from '../../utils/datalayer-utils';
 import { getConfig } from '../../utils/config-loader';
 import { logger } from '../../config/logger.cjs';
 import { getDataModelVersion } from '../../utils/helpers';
+import PickListStub from './governance.stub.json';
 
 const { GOVERANCE_BODY_ID, GOVERNANCE_BODY_IP, GOVERNANCE_BODY_PORT } =
   getConfig().GOVERNANCE;
 
-const { USE_SIMULATOR } = getConfig().APP;
+const { USE_SIMULATOR, CHIA_NETWORK } = getConfig().APP;
 
 import ModelTypes from './governance.modeltypes.cjs';
 
@@ -82,6 +83,12 @@ class Governance extends Model {
         metaValue: governanceData.pickList,
         confirmed: true,
       });
+    } else if (USE_SIMULATOR || CHIA_NETWORK === 'testnet') {
+      updates.push({
+        metaKey: 'pickList',
+        metaValue: PickListStub,
+        confirmed: true,
+      });
     }
 
     await Promise.all(updates.map(async (update) => Governance.upsert(update)));
@@ -118,6 +125,12 @@ class Governance extends Model {
         );
 
         await Governance.upsertGovernanceDownload(versionedGovernanceData);
+      } else if (USE_SIMULATOR || CHIA_NETWORK === 'testnet') {
+        Governance.upsert({
+          metaKey: 'pickList',
+          metaValue: PickListStub,
+          confirmed: true,
+        });
       } else {
         throw new Error(
           `Governance data is not available from this source for ${dataModelVersion} data model.`,

diff --git a/src/tasks/index.js b/src/tasks/index.js
@@ -2,7 +2,6 @@ import { ToadScheduler } from 'toad-scheduler';
 
 import syncDataLayer from './sync-datalayer';
 import syncDefaultOrganizations from './sync-default-organizations';
-import syncPickLists from './sync-picklists';
 import syncAudit from './sync-audit-table';
 import syncOrganizationMeta from './sync-organization-meta';
 import syncGovernanceBody from './sync-governance-body';
@@ -22,7 +21,6 @@ const start = () => {
     syncGovernanceBody,
     syncDataLayer,
     syncDefaultOrganizations,
-    syncPickLists,
     syncAudit,
     syncOrganizationMeta,
   ];

diff --git a/src/tasks/sync-picklists.js b/src/tasks/sync-picklists.js
diff --git a/src/utils/data-loaders.js b/src/utils/data-loaders.js
@@ -14,7 +14,7 @@ let downloadedPickList = {};
 export const getPicklistValues = () => downloadedPickList;
 
 export const pullPickListValues = async () => {
-  if (USE_SIMULATOR || CHIA_NETWORK === 'testnet') {
+  if (USE_SIMULATOR) {
     downloadedPickList = PickListStub;
   } else {
     const goveranceData = await Governance.findOne({
@@ -26,6 +26,8 @@ export const pullPickListValues = async () => {
       downloadedPickList = JSON.parse(goveranceData.metaValue);
     }
   }
+
+  return downloadedPickList;
 };
 
 export const getDefaultOrganizationList = async () => {

diff --git a/src/utils/defaultConfig.json b/src/utils/defaultConfig.json
@@ -16,7 +16,6 @@
     "IS_GOVERNANCE_BODY": false
   },
   "TESTNET": {
-    "TESTNET_PICKLIST_URL": "https://climate-warehouse.s3.us-west-2.amazonaws.com/public/picklists.json",
     "TESTNET_DEFAULT_ORGANIZATIONS": "https://climate-warehouse.s3.us-west-2.amazonaws.com/public/cw-organizations-testnet.json"
   },
   "GOVERNANCE": {

diff --git a/tests/resources/organization.spec.js b/tests/resources/organization.spec.js
@@ -66,9 +66,11 @@ describe('Orgainzation Resource CRUD', function () {
       // add a project to the staging table
       await testFixtures.createNewProject();
 
-      const response = await supertest(app).put(`/v1/organizations/resync`).send({
-        orgUid: '1',
-      });
+      const response = await supertest(app)
+        .put(`/v1/organizations/resync`)
+        .send({
+          orgUid: '1',
+        });
 
       expect(response.body.message).to.equal(
         'Resyncing organization completed',