Alias vec<u8> -> Bytes

polkadot-js · Sep 25, 2018 · 2e2a1bf · 2e2a1bf
1 parent e9b0090
commit 2e2a1bf
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 24 deletions.
diff --git a/packages/api-codec/src/codec/Bytes.ts → packages/api-codec/src/Bytes.ts b/packages/api-codec/src/codec/Bytes.ts → packages/api-codec/src/Bytes.ts
@@ -4,8 +4,8 @@
 
 import u8aConcat from '@polkadot/util/u8a/concat';
 
-import Length from './Length';
-import U8a from './U8a';
+import Length from './codec/Length';
+import U8a from './codec/U8a';
 
 // A Bytes. The significant difference between this and a normal Uint8Array is that
 // this version allows for length-encoding. (i.e. it is a variable-item codec, the same

diff --git a/packages/api-codec/src/Extrinsic.ts b/packages/api-codec/src/Extrinsic.ts
@@ -4,8 +4,7 @@
 
 import blake2Asu8a from '@polkadot/util-crypto/blake2/asU8a';
 
-import Bytes from './codec/Bytes';
-
+import Bytes from './Bytes';
 import Hash from './Hash';
 
 // Representation of an Extrinsic in the system.

diff --git a/packages/api-codec/src/Header.ts b/packages/api-codec/src/Header.ts
@@ -5,12 +5,12 @@
 import BN from 'bn.js';
 import blake2Asu8a from '@polkadot/util-crypto/blake2/asU8a';
 
-import Bytes from './codec/Bytes';
 import UInt from './codec/UInt';
 import Struct from './codec/Struct';
 import Vector from './codec/Vector';
 
 import BlockNumber from './BlockNumber';
+import Bytes from './Bytes';
 import Hash from './Hash';
 
 type DigestStruct = {

diff --git a/packages/api-codec/src/KeyValue.ts b/packages/api-codec/src/KeyValue.ts
@@ -2,9 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the ISC license. See the LICENSE file for details.
 
-import Bytes from './codec/Bytes';
 import Struct from './codec/Struct';
 
+import Bytes from './Bytes';
+
 type KeyValueStruct = {
   key?: Uint8Array | string,
   value?: Uint8Array | string

diff --git a/packages/api-codec/src/Type.spec.js b/packages/api-codec/src/Type.spec.js
@@ -18,12 +18,11 @@ describe('Type', () => {
     ).toEqual('Vec<AccountId>');
   });
 
-  // currently no aliasses, code left as a comment, as here
-  // it('handles aliasses, multiples per line', () => {
-  //   expect(
-  //     new Type().fromJSON('(PropIndex, AccountId, PropIndex)').toString()
-  //   ).toEqual('(ProposalIndex, AccountId, ProposalIndex)');
-  // });
+  it('handles aliasses, multiples per line', () => {
+    expect(
+      new Type().fromJSON('(Vec<u8>, AccountId, Vec<u8>)').toString()
+    ).toEqual('(Bytes, AccountId, Bytes)');
+  });
 
   it('does not allow toU8a', () => {
     expect(

diff --git a/packages/api-codec/src/Type.ts b/packages/api-codec/src/Type.ts
@@ -43,7 +43,11 @@ export default class Type extends Text {
       // remove boxing, `Box<Proposal>` -> `Proposal`
       this._unwrap('Box<'),
       // remove generics, `MisbehaviorReport<Hash, BlockNumber>` -> `MisbehaviorReport`
-      this._ungeneric()
+      this._ungeneric(),
+      // convert `RawAddress` -> `Address`
+      // convert `PropIndex` -> `ProposalIndex`
+      // alias Vec<u8> -> Bytes
+      this._unalias('Vec<u8>', 'Bytes')
     ];
 
     this.raw = mappings.reduce((result, fn) => {
@@ -72,17 +76,15 @@ export default class Type extends Text {
     throw new Error(`Unable to find closing matching <> on '${value}' (start ${start})`);
   }
 
-  // convert `RawAddress` -> `Address`
-  // convert `PropIndex` -> `ProposalIndex`
-  // private _unalias (src: string, dest: string): Mapper {
-  //   return (value: string): string => {
-  //     while (value.indexOf(src) !== -1) {
-  //       value = value.replace(src, dest);
-  //     }
-
-  //     return value;
-  //   };
-  // }
+  private _unalias (src: string, dest: string): Mapper {
+    return (value: string): string => {
+      while (value.indexOf(src) !== -1) {
+        value = value.replace(src, dest);
+      }
+
+      return value;
+    };
+  }
 
   private _ungeneric (): Mapper {
     return (value: string): string => {