aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/schemas/order_schemas.ts2
-rw-r--r--test/exchange_wrapper_test.ts10
-rw-r--r--test/schema_test.ts46
-rw-r--r--test/token_wrapper_test.ts11
4 files changed, 64 insertions, 5 deletions
diff --git a/src/schemas/order_schemas.ts b/src/schemas/order_schemas.ts
index 72012dc26..4999f3e9d 100644
--- a/src/schemas/order_schemas.ts
+++ b/src/schemas/order_schemas.ts
@@ -7,7 +7,7 @@ export const addressSchema = {
export const numberSchema = {
id: '/numberSchema',
type: 'string',
- format: '\d+(\.\d+)?',
+ pattern: '^\\d+(\\.\\d+)?$',
};
export const orderSchema = {
diff --git a/test/exchange_wrapper_test.ts b/test/exchange_wrapper_test.ts
index 4f3a48b26..b680c015b 100644
--- a/test/exchange_wrapper_test.ts
+++ b/test/exchange_wrapper_test.ts
@@ -5,6 +5,7 @@ import * as Web3 from 'web3';
import * as BigNumber from 'bignumber.js';
import * as dirtyChai from 'dirty-chai';
import ChaiBigNumber = require('chai-bignumber');
+import * as chaiAsPromised from 'chai-as-promised';
import promisify = require('es6-promisify');
import {web3Factory} from './utils/web3_factory';
import {ZeroEx} from '../src/0x.js';
@@ -24,6 +25,7 @@ import {TokenUtils} from './utils/token_utils';
chai.config.includeStack = true;
chai.use(dirtyChai);
chai.use(ChaiBigNumber());
+chai.use(chaiAsPromised);
const expect = chai.expect;
const blockchainLifecycle = new BlockchainLifecycle();
@@ -361,7 +363,7 @@ describe('ExchangeWrapper', () => {
describe('#getUnavailableTakerAmountAsync', () => {
it ('should throw if passed an invalid orderHash', async () => {
const invalidOrderHashHex = '0x123';
- expect(zeroEx.exchange.getUnavailableTakerAmountAsync(invalidOrderHashHex)).to.be.rejected();
+ return expect(zeroEx.exchange.getUnavailableTakerAmountAsync(invalidOrderHashHex)).to.be.rejected();
});
it ('should return zero if passed a valid but non-existent orderHash', async () => {
const unavailableValueT = await zeroEx.exchange.getUnavailableTakerAmountAsync(NON_EXISTENT_ORDER_HASH);
@@ -376,7 +378,7 @@ describe('ExchangeWrapper', () => {
describe('#getFilledTakerAmountAsync', () => {
it ('should throw if passed an invalid orderHash', async () => {
const invalidOrderHashHex = '0x123';
- expect(zeroEx.exchange.getFilledTakerAmountAsync(invalidOrderHashHex)).to.be.rejected();
+ return expect(zeroEx.exchange.getFilledTakerAmountAsync(invalidOrderHashHex)).to.be.rejected();
});
it ('should return zero if passed a valid but non-existent orderHash', async () => {
const filledValueT = await zeroEx.exchange.getFilledTakerAmountAsync(NON_EXISTENT_ORDER_HASH);
@@ -391,7 +393,7 @@ describe('ExchangeWrapper', () => {
describe('#getCanceledTakerAmountAsync', () => {
it ('should throw if passed an invalid orderHash', async () => {
const invalidOrderHashHex = '0x123';
- expect(zeroEx.exchange.getCanceledTakerAmountAsync(invalidOrderHashHex)).to.be.rejected();
+ return expect(zeroEx.exchange.getCanceledTakerAmountAsync(invalidOrderHashHex)).to.be.rejected();
});
it ('should return zero if passed a valid but non-existent orderHash', async () => {
const cancelledValueT = await zeroEx.exchange.getCanceledTakerAmountAsync(NON_EXISTENT_ORDER_HASH);
@@ -427,7 +429,7 @@ describe('ExchangeWrapper', () => {
);
});
afterEach(async () => {
- (zeroEx.exchange as any).stopWatchingExchangeLogEventsAsync();
+ await (zeroEx.exchange as any).stopWatchingExchangeLogEventsAsync();
});
// Hack: Mocha does not allow a test to be both async and have a `done` callback
// Since we need to await the receipt of the event in the `subscribeAsync` callback,
diff --git a/test/schema_test.ts b/test/schema_test.ts
new file mode 100644
index 000000000..133914e6d
--- /dev/null
+++ b/test/schema_test.ts
@@ -0,0 +1,46 @@
+import 'mocha';
+import * as _ from 'lodash';
+import * as chai from 'chai';
+import * as BigNumber from 'bignumber.js';
+import promisify = require('es6-promisify');
+import {numberSchema} from '../src/schemas/order_schemas';
+import {SchemaValidator} from '../src/utils/schema_validator';
+
+chai.config.includeStack = true;
+const expect = chai.expect;
+
+describe('Schema', () => {
+ const validator = new SchemaValidator();
+ describe('#numberSchema', () => {
+ describe('number regex', () => {
+ it('should validate valid numbers', () => {
+ const testCases = ['42', '0', '1.3', '0.2', '00.00'];
+ _.forEach(testCases, (testCase: string) => {
+ expect(validator.validate(testCase as any, numberSchema).errors).to.be.lengthOf(0);
+ });
+ });
+ it('should fail for invalid numbers', () => {
+ const testCases = ['.3', '1.', 'abacaba', 'и', '1..0'];
+ _.forEach(testCases, (testCase: string) => {
+ expect(validator.validate(testCase as any, numberSchema).errors).to.be.lengthOf(1);
+ });
+ });
+ });
+ });
+ describe('BigNumber serialization', () => {
+ it.only('should correctly serialize BigNumbers', () => {
+ const testCases = {
+ '42': '42',
+ '0': '0',
+ '1.3': '1.3',
+ '0.2': '0.2',
+ '00.00': '0',
+ '.3': '0.3',
+ };
+ _.forEach(testCases, (serialized: string, input: string) => {
+ expect(SchemaValidator.convertToJSONSchemaCompatibleObject(new BigNumber(input)))
+ .to.be.equal(serialized);
+ });
+ });
+ });
+});
diff --git a/test/token_wrapper_test.ts b/test/token_wrapper_test.ts
index 698ad5b6a..ffe3db983 100644
--- a/test/token_wrapper_test.ts
+++ b/test/token_wrapper_test.ts
@@ -89,6 +89,17 @@ describe('TokenWrapper', () => {
token.address, fromAddress, toAddress, senderAddress, transferAmount,
)).to.be.rejectedWith(ZeroExError.INSUFFICIENT_ALLOWANCE_FOR_TRANSFER);
});
+ it('[regression] should fail to transfer tokens if set allowance for toAddress instead of senderAddress',
+ async () => {
+ const fromAddress = coinbase;
+ const transferAmount = new BigNumber(42);
+
+ await zeroEx.token.setAllowanceAsync(token.address, fromAddress, toAddress, transferAmount);
+
+ return expect(zeroEx.token.transferFromAsync(
+ token.address, fromAddress, toAddress, senderAddress, transferAmount,
+ )).to.be.rejectedWith(ZeroExError.INSUFFICIENT_ALLOWANCE_FOR_TRANSFER);
+ });
it('should fail to transfer tokens if fromAddress has insufficient balance', async () => {
const fromAddress = addressWithoutFunds;
const transferAmount = new BigNumber(42);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 16:42:39 +0800