From 1d70481b9dcf9931085a53bfa9bfefa7c8dfd2c1 Mon Sep 17 00:00:00 2001 From: Zhang Junyu Date: Sun, 14 Nov 2021 15:39:41 +0800 Subject: [PATCH 1/2] centralized deployment configuration --- package.json | 3 ++- src/db.ts | 1 - src/merkle-tree-large.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 010bc1e..80f5d1f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "fs-extra": "^10.0.0", "lru-cache": "^6.0.0", "mongodb": "^4.1.3", - "sha256": "^0.2.0" + "sha256": "^0.2.0", + "delphinus-deployment": "*" }, "devDependencies": { "@types/bn.js": "^5.1.0", diff --git a/src/db.ts b/src/db.ts index aec384f..acc2a53 100644 --- a/src/db.ts +++ b/src/db.ts @@ -2,7 +2,6 @@ import { Collection, Document, MongoClient, Db, Long, Filter } from "mongodb"; import { Field } from "./field"; import { BN } from "bn.js"; -export const local_uri = "mongodb://localhost:27017/"; const merkle_tree_collection = "merkle_tree"; const logging_collection = "merkle_tree_logging"; const snapshot_id_collection = "merkle_tree_snapshot_id"; diff --git a/src/merkle-tree-large.ts b/src/merkle-tree-large.ts index 9c408bf..7b4f813 100644 --- a/src/merkle-tree-large.ts +++ b/src/merkle-tree-large.ts @@ -1,6 +1,7 @@ +import { MongoDBUri } from "delphinus-deployment/src/mongodb"; import { Field } from "./field"; import { poseidon } from "./poseidon"; -import { default_snapshot_id, local_uri, MerkleTreeDb } from "./db"; +import { default_snapshot_id, MerkleTreeDb } from "./db"; import LRUCache = require("lru-cache"); const hash = poseidon; @@ -30,7 +31,7 @@ export class MerkleTree { this.inMemoryMerkleTree = new Map(); } else { this.cache = new LRUCache(10000); - this.db = new MerkleTreeDb(local_uri, this.dbName); + this.db = new MerkleTreeDb(MongoDBUri, this.dbName); } } From 1581ff3e628cc6f1b1f856cc04b06215e168062c Mon Sep 17 00:00:00 2001 From: Zhang Junyu Date: Mon, 15 Nov 2021 14:45:51 +0800 Subject: [PATCH 2/2] adapt delphinus-deployment --- src/merkle-tree-large.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/merkle-tree-large.ts b/src/merkle-tree-large.ts index 7b4f813..56df3d0 100644 --- a/src/merkle-tree-large.ts +++ b/src/merkle-tree-large.ts @@ -1,4 +1,4 @@ -import { MongoDBUri } from "delphinus-deployment/src/mongodb"; +import { MerkleTreeDbUri } from "delphinus-deployment/src/config"; import { Field } from "./field"; import { poseidon } from "./poseidon"; import { default_snapshot_id, MerkleTreeDb } from "./db"; @@ -31,7 +31,7 @@ export class MerkleTree { this.inMemoryMerkleTree = new Map(); } else { this.cache = new LRUCache(10000); - this.db = new MerkleTreeDb(MongoDBUri, this.dbName); + this.db = new MerkleTreeDb(MerkleTreeDbUri, this.dbName); } }