diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-24 08:28:17 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-24 08:28:17 +0800 |
| commit | 59890f2c832a99372a3cdc423a23a4769f214fdc (patch) | |
| tree | cecde7a1ca4d60db49e1f32e76a243a7d2c2b80d /packages/json-schemas | |
| parent | 2c70162beed505bfccb4acf154d3a693f9a5ce7f (diff) | |
| download | dexon-sol-tools-59890f2c832a99372a3cdc423a23a4769f214fdc.tar dexon-sol-tools-59890f2c832a99372a3cdc423a23a4769f214fdc.tar.gz dexon-sol-tools-59890f2c832a99372a3cdc423a23a4769f214fdc.tar.bz2 dexon-sol-tools-59890f2c832a99372a3cdc423a23a4769f214fdc.tar.lz dexon-sol-tools-59890f2c832a99372a3cdc423a23a4769f214fdc.tar.xz dexon-sol-tools-59890f2c832a99372a3cdc423a23a4769f214fdc.tar.zst dexon-sol-tools-59890f2c832a99372a3cdc423a23a4769f214fdc.zip | |
Fix Hex regex and tests
Diffstat (limited to 'packages/json-schemas')
| -rw-r--r-- | packages/json-schemas/schemas/basic_type_schemas.ts | 2 | ||||
| -rw-r--r-- | packages/json-schemas/test/schema_test.ts | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/json-schemas/schemas/basic_type_schemas.ts b/packages/json-schemas/schemas/basic_type_schemas.ts index 8430b6f4a..2cf32b384 100644 --- a/packages/json-schemas/schemas/basic_type_schemas.ts +++ b/packages/json-schemas/schemas/basic_type_schemas.ts @@ -7,7 +7,7 @@ export const addressSchema = { export const hexSchema = { id: '/Hex', type: 'string', - pattern: '^0x[0-9a-f]', + pattern: '^0x([0-9a-f][0-9a-f])*$', }; export const numberSchema = { diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts index d8479ef4f..a7d510122 100644 --- a/packages/json-schemas/test/schema_test.ts +++ b/packages/json-schemas/test/schema_test.ts @@ -14,6 +14,7 @@ const NULL_ADDRESS = '0x0000000000000000000000000000000000000000'; const { numberSchema, addressSchema, + hexSchema, orderCancellationRequestsSchema, orderFillOrKillRequestsSchema, orderFillRequestsSchema, @@ -86,12 +87,12 @@ describe('Schema', () => { describe('#hexSchema', () => { it('should validate valid hex string', () => { const testCases = ['0x8b0292b11a196601ed2ce54b665cafeca0347d42', NULL_ADDRESS]; - validateAgainstSchema(testCases, addressSchema); + validateAgainstSchema(testCases, hexSchema); }); it('should fail for invalid hex string', () => { const testCases = ['0x', '0', '0x00', '0xzzzzzzB11a196601eD2ce54B665CaFEca0347D42']; const shouldFail = true; - validateAgainstSchema(testCases, addressSchema, shouldFail); + validateAgainstSchema(testCases, hexSchema, shouldFail); }); }); describe('#orderHashSchema', () => { |