ci: reuse steps for different node versions (#2644)

ArkEcosystem · Jun 1, 2019 · 6aa9b2f · 6aa9b2f
1 parent d20eed1
commit 6aa9b2f
Show file tree

Hide file tree

Showing 12 changed files with 352 additions and 3,191 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/configTemplate.json b/.circleci/configTemplate.json
diff --git a/.circleci/generateConfig.js b/.circleci/generateConfig.js
diff --git a/.circleci/rebuild-db.sh b/.circleci/rebuild-db.sh
diff --git a/__tests__/integration/core-api/__support__/setup.ts b/__tests__/integration/core-api/__support__/setup.ts
@@ -24,6 +24,7 @@ const setUp = async () => {
     jest.setTimeout(60000);
 
     process.env.DISABLE_P2P_SERVER = "true"; // no need for p2p socket server to run
+    process.env.CORE_RESET_DATABASE = "1";
 
     await setUpContainer({
         exclude: [
@@ -35,7 +36,6 @@ const setUp = async () => {
     });
 
     const databaseService = app.resolvePlugin<Database.IDatabaseService>("database");
-    await databaseService.connection.roundsRepository.truncate();
     await databaseService.buildWallets();
     await databaseService.saveRound(round);
 

diff --git a/__tests__/integration/core-blockchain/__support__/setup.ts b/__tests__/integration/core-blockchain/__support__/setup.ts
@@ -3,10 +3,8 @@ import { setUpContainer } from "../../../utils/helpers/container";
 
 jest.setTimeout(60000);
 
-export async function setUp() {
-    return setUpContainer({ exit: "@arkecosystem/core-blockchain" });
-}
+process.env.CORE_RESET_DATABASE = "1";
 
-export async function tearDown(): Promise<void> {
-    await app.tearDown();
-}
+export const setUp = async () => setUpContainer({ exit: "@arkecosystem/core-blockchain" });
+
+export const tearDown = async (): Promise<void> => app.tearDown();
diff --git a/__tests__/integration/core-database-postgres/__support__/setup.ts b/__tests__/integration/core-database-postgres/__support__/setup.ts
@@ -11,6 +11,8 @@ export const setUp = async () => {
         exclude: ["@arkecosystem/core-database-postgres"],
     });
 
+    process.env.CORE_RESET_DATABASE = "1";
+
     await registerWithContainer(pluginDatabase);
 
     await registerWithContainer(plugin, {

diff --git a/__tests__/integration/core-transaction-pool/__support__/setup.ts b/__tests__/integration/core-transaction-pool/__support__/setup.ts
@@ -43,6 +43,8 @@ export const setUp = async () => {
 };
 
 export const setUpFull = async () => {
+    process.env.CORE_RESET_DATABASE = "1";
+
     try {
         await setUpContainer({
             exit: "@arkecosystem/core-transaction-pool",

diff --git a/__tests__/integration/core-transaction-pool/processor.test.ts b/__tests__/integration/core-transaction-pool/processor.test.ts
@@ -25,6 +25,8 @@ beforeAll(async () => {
 });
 
 afterAll(async () => {
+    await container.resolvePlugin("database").reset();
+
     await tearDownFull();
 });
 

diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     ],
     "husky": {
         "hooks": {
-            "pre-commit": "lint-staged && cross-env-shell ./scripts/pre-commit.sh"
+            "pre-commit": "lint-staged"
         }
     },
     "jest": {

diff --git a/packages/core-database/src/database-service.ts b/packages/core-database/src/database-service.ts
@@ -44,6 +44,10 @@ export class DatabaseService implements Database.IDatabaseService {
     }
 
     public async init(): Promise<void> {
+        if (process.env.CORE_RESET_DATABASE) {
+            await this.reset();
+        }
+
         await this.createGenesisBlock();
 
         const lastBlock: Interfaces.IBlock = await this.getLastBlock();

diff --git a/scripts/pre-commit.sh b/scripts/pre-commit.sh