Revert some stuff

polkadot-js · Oct 15, 2018 · a48e192 · a48e192
1 parent d107da0
commit a48e192
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts
@@ -177,7 +177,7 @@ export default class Rpc implements RpcInterface {
   }
 
   private formatOutput (method: RpcMethod, params: Array<Base>, result?: any): Base | Array<Base | null | undefined> {
-    const base = createType(method.type as string, result);
+    const base = createType(method.type as string).fromJSON(result);
 
     if (method.type === 'StorageData') {
       // single return value (via state.getStorage), decode the value based on the

diff --git a/packages/types/src/codec/Tuple.spec.js b/packages/types/src/codec/Tuple.spec.js
@@ -51,6 +51,25 @@ describe('Tuple', () => {
     ]);
   });
 
+  // FIXME Remove fromJSON
+  it('fromJSON still works', () => {
+    const test = new (Tuple.with({
+      a: Text,
+      b: U32,
+      c: Text
+    }))();
+
+    expect(
+      test.fromJSON([
+        'bazzing', 32
+      ]).toJSON()
+    ).toEqual([
+      'bazzing',
+      32,
+      ''
+    ]);
+  });
+
   it('creates properly via actual hex string', () => {
     const test = new (Tuple.with({
       blockNumber: BlockNumber,

diff --git a/packages/types/src/codec/Vector.ts b/packages/types/src/codec/Vector.ts
@@ -44,9 +44,12 @@ export default class Vector<
     const result = [];
 
     for (let index = 0; index < length; index++) {
-      const decoded = new Type(u8a.subarray(offset));
+      // FIXME replace by
+      // const decoded = new Type(u8a.subarray(offset));
+      // @ts-ignore Not sure why we get "Property 'fromU8a' does not exist on type 'T'.", T extends Base in def?
+      const decoded = new Type().fromU8a(u8a.subarray(offset));
 
-      result.push(decoded);
+      result.push(decoded as T);
       offset += decoded.byteLength();
     }