Unsigned -> Long

polkadot-js · Sep 25, 2018 · 3d4125f · 3d4125f
1 parent 98f4e9a
commit 3d4125f
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/packages/api-codec/src/U128.ts b/packages/api-codec/src/U128.ts
@@ -4,10 +4,10 @@
 
 import BN from 'bn.js';
 
-import Unsigned from './codec/Unsigned';
+import Long from '@polkadot/api-codec/codec/Long';
 
-export default class U128 extends Unsigned {
-  constructor (value?: Unsigned | BN | string | number) {
+export default class U128 extends Long {
+  constructor (value?: Long | BN | string | number) {
     super(value, 128);
   }
 }
diff --git a/packages/api-codec/src/U16.ts b/packages/api-codec/src/U16.ts
@@ -4,10 +4,10 @@
 
 import BN from 'bn.js';
 
-import Unsigned from './codec/Unsigned';
+import Long from '@polkadot/api-codec/codec/Long';
 
-export default class U16 extends Unsigned {
-  constructor (value?: Unsigned | BN | string | number) {
+export default class U16 extends Long {
+  constructor (value?: Long | BN | string | number) {
     super(value, 16);
   }
 }
diff --git a/packages/api-codec/src/U256.ts b/packages/api-codec/src/U256.ts
@@ -4,10 +4,10 @@
 
 import BN from 'bn.js';
 
-import Unsigned from './codec/Unsigned';
+import Long from '@polkadot/api-codec/codec/Long';
 
-export default class U256 extends Unsigned {
-  constructor (value?: Unsigned | BN | string | number) {
+export default class U256 extends Long {
+  constructor (value?: Long | BN | string | number) {
     super(value, 256);
   }
 }
diff --git a/packages/api-codec/src/U32.ts b/packages/api-codec/src/U32.ts
@@ -4,10 +4,10 @@
 
 import BN from 'bn.js';
 
-import Unsigned from './codec/Unsigned';
+import Long from '@polkadot/api-codec/codec/Long';
 
-export default class U32 extends Unsigned {
-  constructor (value?: Unsigned | BN | string | number) {
+export default class U32 extends Long {
+  constructor (value?: Long | BN | string | number) {
     super(value, 32);
   }
 }
diff --git a/packages/api-codec/src/U64.ts b/packages/api-codec/src/U64.ts
@@ -4,10 +4,10 @@
 
 import BN from 'bn.js';
 
-import Unsigned from './codec/Unsigned';
+import Long from './codec/Long';
 
-export default class U64 extends Unsigned {
-  constructor (value?: Unsigned | BN | string | number) {
+export default class U64 extends Long {
+  constructor (value?: Long | BN | string | number) {
     super(value, 64);
   }
 }
diff --git a/packages/api-codec/src/U8.ts b/packages/api-codec/src/U8.ts
@@ -4,10 +4,10 @@
 
 import BN from 'bn.js';
 
-import Unsigned from './codec/Unsigned';
+import Long from '@polkadot/api-codec/codec/Long';
 
-export default class U8 extends Unsigned {
-  constructor (value?: Unsigned | BN | string | number) {
+export default class U8 extends Long {
+  constructor (value?: Long | BN | string | number) {
     super(value, 8);
   }
 }
diff --git a/packages/api-codec/src/codec/Unsigned.ts → packages/api-codec/src/codec/Long.ts b/packages/api-codec/src/codec/Unsigned.ts → packages/api-codec/src/codec/Long.ts
@@ -11,7 +11,7 @@ import bnToU8a from '@polkadot/util/bn/toU8a';
 import hexToBn from '@polkadot/util/hex/toBn';
 import u8aToBn from '@polkadot/util/u8a/toBn';
 
-import Base from './Base';
+import Base from '@polkadot/api-codec/codec/Base';
 
 type BitLength = 8 | 16 | 32 | 64 | 128 | 256;
 
@@ -21,19 +21,19 @@ type BitLength = 8 | 16 | 32 | 64 | 128 | 256;
 //
 // TODO:
 //   - Apart from encoding/decoding we don't actuall keep check on the sizes, is this good enough?
-export default class Unsigned extends Base<BN> {
+export default class Long extends Base<BN> {
   private _bitLength: BitLength;
 
-  constructor (value: Unsigned | BN | string | number = 0, bitLength: BitLength = 64) {
+  constructor (value: Long | BN | string | number = 0, bitLength: BitLength = 64) {
     super(
-      Unsigned.decode(value)
+      Long.decode(value)
     );
 
     this._bitLength = bitLength;
   }
 
-  static decode (value: Unsigned | BN | string | number): BN {
-    if (value instanceof Unsigned) {
+  static decode (value: Long | BN | string | number): BN {
+    if (value instanceof Long) {
       return value.raw;
     } else if (isHex(value)) {
       return hexToBn(value as string);
@@ -48,13 +48,13 @@ export default class Unsigned extends Base<BN> {
     return this._bitLength / 8;
   }
 
-  fromJSON (input: any): Unsigned {
-    this.raw = Unsigned.decode(input);
+  fromJSON (input: any): Long {
+    this.raw = Long.decode(input);
 
     return this;
   }
 
-  fromU8a (input: Uint8Array): Unsigned {
+  fromU8a (input: Uint8Array): Long {
     this.raw = u8aToBn(input.subarray(0, this.byteLength()), true);
 
     return this;