diff options
author | Fabio B <kandinsky454@protonmail.ch> | 2018-12-11 02:29:17 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-11 02:29:17 +0800 |
commit | 6c86cc8ab87ae6f8d435546ec80161faee7bce74 (patch) | |
tree | dcdf1233e5f86070b24b751c1b7792072360371d /contracts | |
parent | 8d93413a5d49bcafe4b5d0dee359cc09afce7222 (diff) | |
parent | f14603ca4d91ca72d9e81de53168230d85bc50aa (diff) | |
download | dexon-sol-tools-6c86cc8ab87ae6f8d435546ec80161faee7bce74.tar dexon-sol-tools-6c86cc8ab87ae6f8d435546ec80161faee7bce74.tar.gz dexon-sol-tools-6c86cc8ab87ae6f8d435546ec80161faee7bce74.tar.bz2 dexon-sol-tools-6c86cc8ab87ae6f8d435546ec80161faee7bce74.tar.lz dexon-sol-tools-6c86cc8ab87ae6f8d435546ec80161faee7bce74.tar.xz dexon-sol-tools-6c86cc8ab87ae6f8d435546ec80161faee7bce74.tar.zst dexon-sol-tools-6c86cc8ab87ae6f8d435546ec80161faee7bce74.zip |
Merge pull request #1405 from 0xProject/tslint-changes
Implement prefer-template tslint rule
Diffstat (limited to 'contracts')
-rw-r--r-- | contracts/core/test/exchange/signature_validator.ts | 6 | ||||
-rw-r--r-- | contracts/core/test/utils/exchange_wrapper.ts | 2 | ||||
-rw-r--r-- | contracts/test-utils/src/assertions.ts | 2 | ||||
-rw-r--r-- | contracts/utils/test/lib_bytes.ts | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/contracts/core/test/exchange/signature_validator.ts b/contracts/core/test/exchange/signature_validator.ts index ae372d677..a968570b6 100644 --- a/contracts/core/test/exchange/signature_validator.ts +++ b/contracts/core/test/exchange/signature_validator.ts @@ -136,7 +136,7 @@ describe('MixinSignatureValidator', () => { it('should revert when signature type is unsupported', async () => { const unsupportedSignatureType = SignatureType.NSignatureTypes; - const unsupportedSignatureHex = '0x' + Buffer.from([unsupportedSignatureType]).toString('hex'); + const unsupportedSignatureHex = `0x${Buffer.from([unsupportedSignatureType]).toString('hex')}`; const orderHashHex = orderHashUtils.getOrderHashHex(signedOrder); return expectContractCallFailedAsync( signatureValidator.publicIsValidSignature.callAsync( @@ -149,7 +149,7 @@ describe('MixinSignatureValidator', () => { }); it('should revert when SignatureType=Illegal', async () => { - const unsupportedSignatureHex = '0x' + Buffer.from([SignatureType.Illegal]).toString('hex'); + const unsupportedSignatureHex = `0x${Buffer.from([SignatureType.Illegal]).toString('hex')}`; const orderHashHex = orderHashUtils.getOrderHashHex(signedOrder); return expectContractCallFailedAsync( signatureValidator.publicIsValidSignature.callAsync( @@ -162,7 +162,7 @@ describe('MixinSignatureValidator', () => { }); it('should return false when SignatureType=Invalid and signature has a length of zero', async () => { - const signatureHex = '0x' + Buffer.from([SignatureType.Invalid]).toString('hex'); + const signatureHex = `0x${Buffer.from([SignatureType.Invalid]).toString('hex')}`; const orderHashHex = orderHashUtils.getOrderHashHex(signedOrder); const isValidSignature = await signatureValidator.publicIsValidSignature.callAsync( orderHashHex, diff --git a/contracts/core/test/utils/exchange_wrapper.ts b/contracts/core/test/utils/exchange_wrapper.ts index 075d2cb96..cb6dce901 100644 --- a/contracts/core/test/utils/exchange_wrapper.ts +++ b/contracts/core/test/utils/exchange_wrapper.ts @@ -229,7 +229,7 @@ export class ExchangeWrapper { return orderEpoch; } public async getOrderInfoAsync(signedOrder: SignedOrder): Promise<OrderInfo> { - const orderInfo = (await this._exchange.getOrderInfo.callAsync(signedOrder)) as OrderInfo; + const orderInfo = await this._exchange.getOrderInfo.callAsync(signedOrder); return orderInfo; } public async getOrdersInfoAsync(signedOrders: SignedOrder[]): Promise<OrderInfo[]> { diff --git a/contracts/test-utils/src/assertions.ts b/contracts/test-utils/src/assertions.ts index 5b1cedfcc..b1dec1281 100644 --- a/contracts/test-utils/src/assertions.ts +++ b/contracts/test-utils/src/assertions.ts @@ -137,7 +137,7 @@ export async function expectTransactionFailedWithoutReasonAsync(p: sendTransacti // directly. txReceiptStatus = result.status; } else { - throw new Error('Unexpected result type: ' + typeof result); + throw new Error(`Unexpected result type: ${typeof result}`); } expect(_.toString(txReceiptStatus)).to.equal( '0', diff --git a/contracts/utils/test/lib_bytes.ts b/contracts/utils/test/lib_bytes.ts index 985a98943..6fb859c67 100644 --- a/contracts/utils/test/lib_bytes.ts +++ b/contracts/utils/test/lib_bytes.ts @@ -25,7 +25,7 @@ const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); // BUG: Ideally we would use Buffer.from(memory).toString('hex') // https://github.com/Microsoft/TypeScript/issues/23155 -const toHex = (buf: Uint8Array): string => buf.reduce((a, v) => a + ('00' + v.toString(16)).slice(-2), '0x'); +const toHex = (buf: Uint8Array): string => buf.reduce((a, v) => a + `00${v.toString(16)}`.slice(-2), '0x'); const fromHex = (str: string): Uint8Array => Uint8Array.from(Buffer.from(str.slice(2), 'hex')); |