Merge c1b8c77 into 3f997a1

polkadot-js · Oct 1, 2018 · 3c68f8f · 3c68f8f
2 parents 3f997a1 + c1b8c77
commit 3c68f8f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/packages/api-codec/src/StorageKey.ts b/packages/api-codec/src/StorageKey.ts
@@ -14,6 +14,7 @@ import { StorageFunctionMetadata } from './Metadata';
 export interface StorageFunction {
   (arg?: any): Uint8Array;
   meta: StorageFunctionMetadata;
+  toJSON: () => any;
 }
 
 // A representation of a storage key (typically hashed) in the system. It can be constructed

diff --git a/...ges/api-rx/test/e2e/subscriptions.test.js → packages/api-rx/test/e2e/subscribe.test.js b/...ges/api-rx/test/e2e/subscriptions.test.js → packages/api-rx/test/e2e/subscribe.test.js
@@ -22,11 +22,27 @@ describe.skip('e2e subscriptions', () => {
     api.state
       .storage([[storage.timestamp.now]])
       .subscribe((data) => {
-        console.error('subscribe', data);
+        console.error('timestamp.now', data);
 
         if (++count === 4) {
           done();
         }
       });
   });
+
+  it('retrieves multiple values', (done) => {
+    api.state
+      .storage([
+        [storage.timestamp.now],
+        [storage.session.sessionLength],
+        [storage.staking.sessionsPerEra]
+      ])
+      .subscribe((data) => {
+        console.error('multiples', data);
+
+        if (data !== undefined && data.filter((item) => item).length === 3) {
+          done();
+        }
+      });
+  });
 });
diff --git a/packages/type-storage/src/utils/createFunction.ts b/packages/type-storage/src/utils/createFunction.ts
@@ -65,6 +65,7 @@ export default function createFunction (
   }
 
   storageFn.meta = meta;
+  storageFn.toJSON = meta.toJSON;
 
   return storageFn as StorageFunction;
 }