@ocap/statedb-memory 1.13.61 → 1.13.65

package/lib/table/account.js

@@ -3,7 +3,7 @@ const MemoryStateDB = require('./base');
 
 class AccountStateDB extends MemoryStateDB {
   _get(address, { final = true } = {}) {
-    const current = this.collection.by(this.key, address) || null;
+    const current = this.collection.by(this.uniqIndex, address) || null;
     if (current && final && Array.isArray(current.migratedTo) && current.migratedTo.length) {
       return this._get(current.migratedTo[0]);
     }

package/lib/table/base.js

@@ -7,13 +7,13 @@ const db = new Lokijs('ocap-memory-statedb.db');
 const debug = require('debug')(require('../../package.json').name);
 
 class MemoryTable extends StateDBTable {
-  constructor(name, key) {
+  constructor(name, uniqIndex) {
     super();
 
     this.name = name;
-    this.key = key;
+    this.uniqIndex = uniqIndex;
 
-    this.collection = db.addCollection(name, { unique: [key], clone: true });
+    this.collection = db.addCollection(name, { unique: [uniqIndex], clone: true });
     this.markReady();
   }
 
@@ -22,13 +22,13 @@ class MemoryTable extends StateDBTable {
       throw new Error(`${this.name} already exists: ${id}`);
     }
 
-    this.collection.insert({ [this.key]: id, ...attrs });
+    this.collection.insert({ [this.uniqIndex]: id, ...attrs });
     debug(`${this.name} create`, { id, ...attrs });
     return this._get(id);
   }
 
   _get(id) {
-    return id ? this.collection.by(this.key, id) : null;
+    return id ? this.collection.by(this.uniqIndex, id) : null;
   }
 
   _history() {
@@ -40,12 +40,24 @@ class MemoryTable extends StateDBTable {
       throw new Error(`${this.name} does not exists: ${id}`);
     }
 
-    const doc = this.collection.by(this.key, id);
+    const doc = this.collection.by(this.uniqIndex, id);
     Object.assign(doc, updates);
     this.collection.update(doc);
     return doc;
   }
 
+  updateOrCreate(exist, state, ctx) {
+    if (!state[this.uniqIndex]) {
+      throw new Error('Cannot update or create without uniq index');
+    }
+
+    if (exist) {
+      return this.update(state[this.uniqIndex], state, ctx);
+    }
+
+    return this.create(state[this.uniqIndex], state, ctx);
+  }
+
   _reset() {
     this.collection.removeWhere({});
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ocap/statedb-memory",
   "description": "OCAP statedb adapter that uses memory as backend statedb, just for test purpose",
-  "version": "1.13.61",
+  "version": "1.13.65",
   "author": "wangshijun <shijun@arcblock.io> (https://www.arcblock.io)",
   "bugs": {
     "url": "https://github.com/ArcBlock/asset-chain/issues",
@@ -37,9 +37,9 @@
     "test": "jest --forceExit --detectOpenHandles",
     "coverage": "npm run test -- --coverage"
   },
-  "gitHead": "79d07bbde4df1d0d37afe76aaa1eaa2f30cc55a7",
+  "gitHead": "4011996e1800845142aa5c889b58726129a99ec3",
   "dependencies": {
-    "@ocap/statedb": "1.13.61",
+    "@ocap/statedb": "1.13.65",
     "debug": "^4.3.2",
     "lodash": "^4.17.21",
     "lokijs": "^1.5.11"