Merge branch 'master' into fix-ignore-delete-spaces-when-checking-fol…

…lows-limit
snapshot-labs · Jan 7, 2025 · 3763d0a · 3763d0a
2 parents 16cd4e5 + 640b7e5
commit 3763d0a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/test/e2e/api.test.ts b/test/e2e/api.test.ts
@@ -1,8 +1,8 @@
 import fetch from 'node-fetch';
+import db from '../../src/helpers/mysql';
 import proposalInput from '../fixtures/ingestor-payload/proposal.json';
-import { spacesSqlFixtures } from '../fixtures/space';
 import proposalsFixtures from '../fixtures/proposal';
-import db from '../../src/helpers/mysql';
+import { spacesSqlFixtures } from '../fixtures/space';
 
 const HOST = `http://localhost:${process.env.PORT || 3003}`;
 const SPACE_PREFIX = 'e2e-';
@@ -71,7 +71,8 @@ describe('POST /flag', () => {
           plugins: JSON.stringify(proposal.plugins),
           choices: JSON.stringify(proposal.choices),
           scores: JSON.stringify(proposal.scores),
-          scores_by_strategy: JSON.stringify(proposal.scores_by_strategy)
+          scores_by_strategy: JSON.stringify(proposal.scores_by_strategy),
+          vp_value_by_strategy: JSON.stringify(proposal.vp_value_by_strategy || [])
         }))
         .map(async proposal => {
           db.queryAsync('INSERT INTO snapshot_sequencer_test.proposals SET ?', proposal);

diff --git a/test/schema.sql b/test/schema.sql
@@ -28,6 +28,10 @@ CREATE TABLE spaces (
   INDEX updated (updated)
 );
 
+-- Note: The `proposals` table schema might have some discrepancies
+-- compared to the production database. This is due to legacy reasons
+-- and the challenges associated with updating the schema because of its size.
+-- `id` and `ipfs` columns should not have any default values.
 CREATE TABLE proposals (
   id VARCHAR(66) NOT NULL,
   ipfs VARCHAR(64) NOT NULL,
@@ -36,8 +40,8 @@ CREATE TABLE proposals (
   updated INT(11) DEFAULT NULL,
   space VARCHAR(64) NOT NULL,
   network VARCHAR(12) NOT NULL,
-  symbol VARCHAR(16) NOT NULL,
-  type VARCHAR(24) NOT NULL,
+  symbol VARCHAR(16) NOT NULL DEFAULT '',
+  type VARCHAR(24) NOT NULL DEFAULT '',
   strategies JSON NOT NULL,
   validation JSON NOT NULL,
   plugins JSON NOT NULL,
@@ -49,17 +53,20 @@ CREATE TABLE proposals (
   start INT(11) NOT NULL,
   end INT(11) NOT NULL,
   quorum DECIMAL(64,30) NOT NULL,
-  quorum_type VARCHAR(24) NOT NULL DEFAULT '',
+  quorum_type VARCHAR(24) DEFAULT '',
   privacy VARCHAR(24) NOT NULL,
   snapshot INT(24) NOT NULL,
   app VARCHAR(24) NOT NULL,
   scores JSON NOT NULL,
   scores_by_strategy JSON NOT NULL,
-  scores_state VARCHAR(24) NOT NULL,
+  scores_state VARCHAR(24) NOT NULL DEFAULT '',
   scores_total DECIMAL(64,30) NOT NULL,
   scores_updated INT(11) NOT NULL,
+  scores_total_value DECIMAL(64,30) NOT NULL DEFAULT '0.000000000000000000000000000000',
+  vp_value_by_strategy json NOT NULL,
   votes INT(12) NOT NULL,
   flagged INT NOT NULL DEFAULT 0,
+  cb INT NOT NULL DEFAULT 0,
   PRIMARY KEY (id),
   INDEX ipfs (ipfs),
   INDEX author (author),
@@ -73,7 +80,8 @@ CREATE TABLE proposals (
   INDEX scores_state (scores_state),
   INDEX scores_updated (scores_updated),
   INDEX votes (votes),
-  INDEX flagged (flagged)
+  INDEX flagged (flagged),
+  INDEX cb (cb)
 );
 
 CREATE TABLE votes (