Remove postgresql custom connector (#2585)

counterfactual · Nov 6, 2019 · c5e0f97 · c5e0f97
1 parent e9aa4ad
commit c5e0f97
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 618 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -73,15 +73,6 @@ jobs:
   run-tests:
     docker:
       - image: circleci/node:10.15.3
-        environment:
-          POSTGRES_HOST: 127.0.0.1
-          POSTGRES_USER: postgres
-          POSTGRES_DATABASE: postgres
-          POSTGRES_PORT: 5432
-
-      - image: circleci/postgres:9.6.15-alpine
-        environment:
-          POSTGRES_USER: postgres
 
     steps:
       - <<: *restore_code

diff --git a/packages/node/.env.defaults b/packages/node/.env.defaults
@@ -3,10 +3,4 @@ FIREBASE_DEV_SERVER_PORT=9999
 FIREBASE_MESSAGING_SERVER_KEY="messageKey"
 FIREBASE_STORE_SERVER_KEY="storeKey"
 FIREBASE_STORE_PREFIX_KEY="dev-store"
-GANACHE_PORT="8545"
-POSTGRES_USER="postgres"
-POSTGRES_HOST="localhost"
-POSTGRES_DATABASE="postgres"
-POSTGRES_PASSWORD=""
-POSTGRES_PORT=5432
-POSTGRES_STORE_KEY="dev"
+GANACHE_PORT="8545"
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -24,7 +24,6 @@
     "@counterfactual/apps": "0.1.14",
     "@counterfactual/firebase-server": "0.0.5",
     "@counterfactual/local-ganache-server": "0.0.10",
-    "@counterfactual/postgresql-node-connector": "0.0.8",
     "@types/chai": "4.2.4",
     "@types/dotenv-safe": "5.0.4",
     "ganache-core": "2.8.0",

diff --git a/packages/node/test/integration/connext-issue.spec.ts b/packages/node/test/integration/connext-issue.spec.ts
@@ -145,9 +145,6 @@ describe("Can update and install multiple apps simultaneously", () => {
    * - Validating a signature with expected signer 0xFFF but recovered 0xAAA
    * - cannot find agreement with target hash 0xCCC
    * - hanging on client or node
-   *
-   * These errors were successfully reproduced by connext in the `test-bot-farm`
-   * script, both with the postgres store and the memory store.
    */
 
   it("should be able to redeem a pregenerated linked payment while simultaneously receiving a direct transfer", async done => {

diff --git a/packages/node/test/integration/reject-install-virtual-with-postgres.spec.ts b/packages/node/test/integration/reject-install-virtual-with-postgres.spec.ts
diff --git a/packages/node/test/integration/setup.ts b/packages/node/test/integration/setup.ts
@@ -1,5 +1,4 @@
 import { CF_PATH } from "@counterfactual/local-ganache-server";
-import { PostgresServiceFactory } from "@counterfactual/postgresql-node-connector";
 import { Node as NodeTypes } from "@counterfactual/types";
 import { Wallet } from "ethers";
 import {
@@ -30,33 +29,6 @@ export interface SetupContext {
   [nodeName: string]: NodeContext;
 }
 
-export async function setupWithMemoryMessagingAndPostgresStore(
-  global: any,
-  nodeCPresent: boolean = false,
-  newExtendedPrvKeys: boolean = false
-): Promise<SetupContext> {
-  const memoryMessagingService = new MemoryMessagingService();
-
-  const postgresServiceFactory = new PostgresServiceFactory({
-    type: "postgres",
-    database: process.env.POSTGRES_DATABASE!,
-    username: process.env.POSTGRES_USER!,
-    host: process.env.POSTGRES_HOST!,
-    password: process.env.POSTGRES_PASSWORD!,
-    port: Number(process.env.POSTGRES_PORT!)
-  });
-
-  await postgresServiceFactory.connectDb();
-
-  return setup(
-    global,
-    nodeCPresent,
-    newExtendedPrvKeys,
-    memoryMessagingService,
-    postgresServiceFactory
-  );
-}
-
 export async function setup(
   global: any,
   nodeCPresent: boolean = false,

diff --git a/packages/node/test/integration/uninstall-with-postgres.spec.ts b/packages/node/test/integration/uninstall-with-postgres.spec.ts
diff --git a/packages/postgresql-node-connector/.env.defaults b/packages/postgresql-node-connector/.env.defaults
diff --git a/packages/postgresql-node-connector/.env.schema b/packages/postgresql-node-connector/.env.schema
diff --git a/packages/postgresql-node-connector/README.md b/packages/postgresql-node-connector/README.md
diff --git a/packages/postgresql-node-connector/jest.config.js b/packages/postgresql-node-connector/jest.config.js
diff --git a/packages/postgresql-node-connector/package.json b/packages/postgresql-node-connector/package.json
diff --git a/packages/postgresql-node-connector/rollup.config.js b/packages/postgresql-node-connector/rollup.config.js
diff --git a/packages/postgresql-node-connector/src/entity/NodeRecord.ts b/packages/postgresql-node-connector/src/entity/NodeRecord.ts