Reuse cache package from watcher-ts (#397)

* Remove cache package * Use cache from watcher-ts
vulcanize · Nov 17, 2022 · e7ca210 · e7ca210
1 parent c84fef4
commit e7ca210
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 439 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This project uses [yarn workspaces](https://classic.yarnpkg.com/en/docs/workspac
 - Link [@cerc-io/watcher-ts](https://github.com/cerc-io/watcher-ts) packages:
 
   - In `@cerc-io/watcher-ts` repo, build and link the packages to use from uniswap-watcher-ts
-    
+
     ```bash
     # Build packages
     yarn && yarn build
@@ -23,6 +23,7 @@ This project uses [yarn workspaces](https://classic.yarnpkg.com/en/docs/workspac
     cd packages/ipld-eth-client && yarn link && cd ../..
     cd packages/solidity-mapper && yarn link && cd ../..
     cd packages/graph-node && yarn link && cd ../..
+    cd packages/cache && yarn link && cd ../..
     # Workaround for typeorm dependency issue when using yarn link
     cd node_modules/typeorm && yarn link && cd ../..
     ```
@@ -34,11 +35,12 @@ This project uses [yarn workspaces](https://classic.yarnpkg.com/en/docs/workspac
     yarn link "@cerc-io/ipld-eth-client"
     yarn link "@cerc-io/solidity-mapper"
     yarn link "@cerc-io/graph-node"
+    yarn link "@cerc-io/cache"
     yarn link "typeorm"
     ```
 
 - Build packages:
-  
+
   ```bash
   yarn build
 

diff --git a/packages/cache/.eslintignore b/packages/cache/.eslintignore
diff --git a/packages/cache/.eslintrc.json b/packages/cache/.eslintrc.json
diff --git a/packages/cache/index.ts b/packages/cache/index.ts
diff --git a/packages/cache/package.json b/packages/cache/package.json
diff --git a/packages/cache/src/cache.test.ts b/packages/cache/src/cache.test.ts
diff --git a/packages/cache/src/cache.ts b/packages/cache/src/cache.ts
diff --git a/packages/cache/tsconfig.json b/packages/cache/tsconfig.json
diff --git a/packages/cache/types/common/main.d.ts b/packages/cache/types/common/main.d.ts
diff --git a/packages/cache/types/common/package.json b/packages/cache/types/common/package.json
diff --git a/packages/erc20-watcher/package.json b/packages/erc20-watcher/package.json
@@ -44,7 +44,6 @@
     "@apollo/client": "^3.3.19",
     "@ethersproject/providers": "5.3.0",
     "@types/lodash": "^4.14.168",
-    "@vulcanize/cache": "^0.1.0",
     "@vulcanize/util": "^0.1.0",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
@@ -63,6 +62,7 @@
     "@ethersproject/abi": "^5.3.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "@types/debug": "^4.1.7",
     "@types/express": "^4.17.14",
     "@types/json-bigint": "^1.0.0",
     "@types/yargs": "^17.0.0",

diff --git a/packages/erc20-watcher/src/fill.ts b/packages/erc20-watcher/src/fill.ts
@@ -11,7 +11,7 @@ import { PubSub } from 'graphql-subscriptions';
 
 import { DEFAULT_CONFIG_PATH } from '@cerc-io/util';
 import { EthClient } from '@cerc-io/ipld-eth-client';
-import { getCache } from '@vulcanize/cache';
+import { getCache } from '@cerc-io/cache';
 import { getConfig, fillBlocks, JobQueue, getCustomProvider, DEFAULT_PREFETCH_BATCH_SIZE } from '@vulcanize/util';
 
 import { Database } from './database';

diff --git a/packages/erc20-watcher/src/job-runner.ts b/packages/erc20-watcher/src/job-runner.ts
@@ -16,7 +16,7 @@ import {
   QUEUE_EVENT_PROCESSING,
   DEFAULT_CONFIG_PATH
 } from '@cerc-io/util';
-import { getCache } from '@vulcanize/cache';
+import { getCache } from '@cerc-io/cache';
 import {
   getConfig,
   JobQueue,
@@ -77,7 +77,7 @@ export const main = async (): Promise<any> => {
 
   assert(config.server, 'Missing server config');
 
-  const { upstream, database: dbConfig, jobQueue: jobQueueConfig, server: { mode } } = config;
+  const { upstream, database: dbConfig, jobQueue: jobQueueConfig } = config;
 
   assert(dbConfig, 'Missing database config');
 

diff --git a/packages/erc20-watcher/src/server.ts b/packages/erc20-watcher/src/server.ts
@@ -11,7 +11,7 @@ import { hideBin } from 'yargs/helpers';
 import debug from 'debug';
 import 'graphql-import-node';
 
-import { getCache } from '@vulcanize/cache';
+import { getCache } from '@cerc-io/cache';
 import {
   KIND_ACTIVE,
   DEFAULT_CONFIG_PATH,

diff --git a/packages/uni-info-watcher/package.json b/packages/uni-info-watcher/package.json
@@ -8,7 +8,6 @@
     "@apollo/client": "^3.3.19",
     "@ipld/dag-cbor": "^6.0.12",
     "@types/lodash": "^4.14.168",
-    "@vulcanize/cache": "^0.1.0",
     "@vulcanize/erc20-watcher": "^0.1.0",
     "@vulcanize/uni-watcher": "^0.1.0",
     "@vulcanize/util": "^0.1.0",
@@ -59,6 +58,7 @@
   },
   "devDependencies": {
     "@types/chance": "^1.1.2",
+    "@types/debug": "^4.1.7",
     "@types/express": "^4.17.14",
     "@typescript-eslint/eslint-plugin": "^4.25.0",
     "@typescript-eslint/parser": "^4.25.0",

diff --git a/packages/uni-info-watcher/src/fill.ts b/packages/uni-info-watcher/src/fill.ts
@@ -9,7 +9,7 @@ import { hideBin } from 'yargs/helpers';
 import debug from 'debug';
 import { PubSub } from 'graphql-subscriptions';
 
-import { getCache } from '@vulcanize/cache';
+import { getCache } from '@cerc-io/cache';
 import { DEFAULT_CONFIG_PATH } from '@cerc-io/util';
 import { getConfig, fillBlocks, JobQueue, getCustomProvider, DEFAULT_PREFETCH_BATCH_SIZE } from '@vulcanize/util';
 import { Client as UniClient } from '@vulcanize/uni-watcher';
@@ -75,7 +75,7 @@ export const main = async (): Promise<any> => {
 
   assert(config.server, 'Missing server config');
 
-  const { upstream, database: dbConfig, jobQueue: jobQueueConfig, server: { mode } } = config;
+  const { upstream, database: dbConfig, jobQueue: jobQueueConfig } = config;
 
   assert(dbConfig, 'Missing database config');
 

diff --git a/packages/uni-info-watcher/src/job-runner.ts b/packages/uni-info-watcher/src/job-runner.ts
@@ -10,7 +10,7 @@ import debug from 'debug';
 
 import { Client as ERC20Client } from '@vulcanize/erc20-watcher';
 import { Client as UniClient } from '@vulcanize/uni-watcher';
-import { getCache } from '@vulcanize/cache';
+import { getCache } from '@cerc-io/cache';
 import {
   getConfig,
   JobQueue,