crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asset-swapper: fix bug: bad maker response throws

Browse Source 
Formerly, a maker sending back a non-JSON was causing an exception to be
thrown.
This commit is contained in:
F. Eugene Aumson
2020-05-14 18:45:20 -04:00
parent 9c11835fee
commit b9984b6df4
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/asset-swapper/src/utils/quote_requestor.ts
View File

@@ -120,9 +120,13 @@ export class QuoteRequestor {
const ordersWithStringInts = firmQuotes.map(quote => quote.signedOrder);
const validatedOrdersWithStringInts = ordersWithStringInts.filter(order => {
const hasValidSchema = this._schemaValidator.isValid(order, schemas.signedOrderSchema);
if (!hasValidSchema) {
this._warningLogger(order, 'Invalid RFQ-t order received, filtering out');
try {
const hasValidSchema = this._schemaValidator.isValid(order, schemas.signedOrderSchema);
if (!hasValidSchema) {
throw new Error('order not valid');
}
} catch (err) {
this._warningLogger(order, `Invalid RFQ-t order received, filtering out. ${err.message}`);
return false;
}

9
packages/asset-swapper/test/quote_requestor_test.ts
View File

@@ -73,6 +73,14 @@ describe('QuoteRequestor', async () => {
responseData: { makerAssetData: '123' },
responseCode: StatusCodes.Success,
});
// ensure that a non-JSON response doesn't throw an error when trying to parse
mockedRequests.push({
endpoint: 'https://421.1.0.1',
requestApiKey: apiKey,
requestParams: expectedParams,
responseData: 'this is not JSON!',
responseCode: StatusCodes.Success,
});
// A successful response code and valid order, but for wrong maker asset data
const wrongMakerAssetDataOrder = testOrderFactory.generateTestSignedOrder({
makerAssetData: assetDataUtils.encodeERC20AssetData(otherToken1),
@@ -159,6 +167,7 @@ describe('QuoteRequestor', async () => {
'https://1337.0.0.1': [[makerToken, takerToken]],
'https://420.0.0.1': [[makerToken, takerToken]],
'https://421.0.0.1': [[makerToken, takerToken]],
'https://421.1.0.1': [[makerToken, takerToken]],
'https://422.0.0.1': [[makerToken, takerToken]],
'https://423.0.0.1': [[makerToken, takerToken]],
'https://424.0.0.1': [[makerToken, takerToken]],