Merge pull request #413 from fei-protocol/feat/fix-proposals-config-m…

…erger Fix proposals config by removing merge proposal
fei-protocol · Dec 24, 2021 · 2dc6a90 · 2dc6a90
2 parents a2946f6 + a9318dd
commit 2dc6a90
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/test/integration/proposals_config.ts b/test/integration/proposals_config.ts
@@ -14,12 +14,6 @@ const proposals: ProposalsConfigMap = {
         proposal: fip_xx_proposal // full proposal file, imported from '@proposals/description/fip_xx.ts'
     }
     */
-  merger: {
-    deploy: false,
-    skipDAO: false,
-    totalValue: 0,
-    proposal: merger_proposal
-  }
 };
 
 export default proposals;
diff --git a/test/integration/tests/merger.ts b/test/integration/tests/merger.ts
@@ -48,7 +48,7 @@ describe('e2e-merger', function () {
     doLogging && console.log(`Environment loaded.`);
   });
 
-  describe('TribeRagequit', async function () {
+  describe.skip('TribeRagequit', async function () {
     const guardianBalance = '18903018000000000000000000';
 
     it('ngmi', async function () {