aboutsummaryrefslogtreecommitdiffstats
path: root/src/ts
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-05-25 18:28:28 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-05-25 18:28:28 +0800
commit00a16b37e0bd3a394285cd887e8678fb7eb19149 (patch)
treeb16ec3599e6451e8150759f0cd68ce02d707edb5 /src/ts
parent5be5debdf1122d7f9767fa7e5cd23a23d91bf93c (diff)
downloaddexon-sol-tools-00a16b37e0bd3a394285cd887e8678fb7eb19149.tar
dexon-sol-tools-00a16b37e0bd3a394285cd887e8678fb7eb19149.tar.gz
dexon-sol-tools-00a16b37e0bd3a394285cd887e8678fb7eb19149.tar.bz2
dexon-sol-tools-00a16b37e0bd3a394285cd887e8678fb7eb19149.tar.lz
dexon-sol-tools-00a16b37e0bd3a394285cd887e8678fb7eb19149.tar.xz
dexon-sol-tools-00a16b37e0bd3a394285cd887e8678fb7eb19149.tar.zst
dexon-sol-tools-00a16b37e0bd3a394285cd887e8678fb7eb19149.zip
Remove HexString type
Diffstat (limited to 'src/ts')
-rw-r--r--src/ts/0x.js.ts8
-rw-r--r--src/ts/globals.d.ts5
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ts/0x.js.ts b/src/ts/0x.js.ts
index 1f9ea5f9b..89d049bec 100644
--- a/src/ts/0x.js.ts
+++ b/src/ts/0x.js.ts
@@ -19,12 +19,12 @@ export class ZeroEx {
* Verifies that the elliptic curve signature `signature` was generated
* by signing `data` with the private key corresponding to the `signer` address.
*/
- public static isValidSignature(data: HexString, signature: ECSignature, signer: ETHAddressHex): boolean {
- assert.isString('data', data);
+ public static isValidSignature(dataHex: string, signature: ECSignature, signer: ETHAddressHex): boolean {
+ assert.isHexString('dataHex', dataHex);
assert.isObject('signature', signature);
assert.isETHAddressHex('signer', signer);
- const dataBuff = ethUtil.toBuffer(data);
+ const dataBuff = ethUtil.toBuffer(dataHex);
const msgHashBuff = ethUtil.hashPersonalMessage(dataBuff);
try {
const pubKey = ethUtil.ecrecover(msgHashBuff,
@@ -51,7 +51,7 @@ export class ZeroEx {
return salt;
}
/** Checks if order hash is valid */
- public static isValidOrderHash(orderHash: HexString): boolean {
+ public static isValidOrderHash(orderHash: string): boolean {
assert.isHexString('orderHash', orderHash);
return orderHash.length === ORDER_HASH_LENGTH;
}
diff --git a/src/ts/globals.d.ts b/src/ts/globals.d.ts
index 9b81e15bd..c9cc0d481 100644
--- a/src/ts/globals.d.ts
+++ b/src/ts/globals.d.ts
@@ -1,12 +1,11 @@
declare type ETHPublicKey = string;
declare type ETHAddressHex = string;
-declare type HexString = string;
declare type ETHAddressBuff = Buffer;
declare module 'ethereumjs-util' {
- const toBuffer: (data: HexString) => Buffer;
+ const toBuffer: (dataHex: string) => Buffer;
const hashPersonalMessage: (msg: Buffer) => Buffer;
- const bufferToHex: (buff: Buffer) => HexString;
+ const bufferToHex: (buff: Buffer) => string;
const ecrecover: (msgHashBuff: Buffer, v: number, r: Buffer, s: Buffer) => ETHPublicKey;
const pubToAddress: (pubKey: ETHPublicKey) => ETHAddressBuff;
}