Merge pull request #30 from Terran-One/feat/immutable-store

Use immutable.js for storage backend

Author: ouiliame

package.json

@@ -69,6 +69,7 @@
     "@types/secp256k1": "^4.0.3",
     "bech32": "^2.0.0",
     "elliptic": "^6.5.4",
+    "immutable": "^4.1.0",
     "process": "^0.11.10",
     "secp256k1": "^4.0.3",
     "synchronized-promise": "^0.3.1",

src/backend/storage.ts

@@ -1,5 +1,6 @@
 import { fromBase64, toBase64 } from '@cosmjs/encoding';
 import { compare } from '../helpers/byte-array';
+import Immutable from 'immutable';
 import { MAX_LENGTH_DB_KEY } from '../instance';
 
 export interface IStorage {
@@ -40,11 +41,11 @@ export interface IIterStorage {
 
 export class BasicKVStorage implements IStorage {
   // TODO: Add binary uint / typed Addr maps for cw-storage-plus compatibility
-  constructor(public dict: { [key: string]: string | undefined } = {}) {}
+  constructor(public dict: Immutable.Map<string, string> = Immutable.Map()) {}
 
   get(key: Uint8Array): Uint8Array | null {
     const keyStr = toBase64(key);
-    const value = this.dict[keyStr];
+    const value = this.dict.get(keyStr);
     if (value === undefined) {
       return null;
     }
@@ -54,7 +55,7 @@ export class BasicKVStorage implements IStorage {
 
   set(key: Uint8Array, value: Uint8Array): void {
     const keyStr = toBase64(key);
-    this.dict[keyStr] = toBase64(value);
+    this.dict = this.dict.set(keyStr, toBase64(value));
   }
 
   remove(key: Uint8Array): void {
@@ -63,7 +64,7 @@ export class BasicKVStorage implements IStorage {
         `Key length ${key.length} exceeds maximum length ${MAX_LENGTH_DB_KEY}.`
       );
     }
-    this.dict[toBase64(key)] = undefined;
+    this.dict = this.dict.remove(toBase64(key));
   }
 }
 
@@ -119,11 +120,11 @@ export class BasicKVIterStorage extends BasicKVStorage implements IIterStorage {
     }
 
     let data: Record[] = [];
-    for (const key of Object.keys(this.dict)) {
+    for (const key of this.dict.keys()) {
       if (start.length && compare(start, fromBase64(key)) === 1) continue;
       if (end.length && compare(fromBase64(key), end) > -1) break;
 
-      data.push({ key: fromBase64(key), value: fromBase64(this.dict[key]!) });
+      data.push({ key: fromBase64(key), value: this.get(fromBase64(key))! });
     }
 
     if (order === Order.Descending) {

yarn.lock

@@ -3881,6 +3881,11 @@ ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0:
   resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+immutable@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"