Assign apps to fills on creation (#431)

* Assign apps to fills on creation

* Ensure apps are indexed alongside fills and traded tokens

* Restructure app definition files and code

* Rename test

Author: cbovis

src/definitions/apps/1inch-exchange.json src/apps/definitions/1inch-exchange.json

@@ -0,0 +1,23 @@
+const fs = require('fs');
+const path = require('path');
+
+const definitionsPath = path.join(__dirname, 'definitions');
+
+const files = fs.readdirSync(definitionsPath);
+const definitions = [];
+
+files.forEach(file => {
+  if (file.endsWith('.json')) {
+    const filePath = path.join(definitionsPath, file);
+    const contents = fs.readFileSync(filePath);
+    const asObject = JSON.parse(contents);
+
+    definitions.push(asObject);
+  }
+});
+
+const getAppDefinitions = () => {
+  return definitions;
+};
+
+module.exports = getAppDefinitions;

src/definitions/apps/matcha.json src/apps/definitions/matcha.json

@@ -1,7 +1,14 @@
 const _ = require('lodash');
-const { getAppDefinitions, validateAppDefinition } = require('.');
+const getAppDefinitions = require('./get-app-definitions');
+const validateAppDefinition = require('./validate-app-definition');
+
+describe('apps/getAppDefinitions', () => {
+  it('should get all app definitions', () => {
+    const definitions = getAppDefinitions();
+
+    expect(definitions.length).not.toBe(0);
+  });
 
-describe('definitions/apps', () => {
   it('should not contain definitions which violate the app definition schema', () => {
     const definitions = getAppDefinitions();
 
@@ -66,12 +73,4 @@ describe('definitions/apps', () => {
 
     expect(matchingDefinitions).toBe(definitions.length);
   });
-
-  describe('getDefinitions', () => {
-    it('should get all app definitions', () => {
-      const definitions = getAppDefinitions();
-
-      expect(definitions.length).not.toBe(0);
-    });
-  });
 });

src/apps/get-app-definitions.js

@@ -1,51 +1,3 @@
-const _ = require('lodash');
-const { getAppDefinitions } = require('../definitions/apps');
-
-const prettifyUndefined = value => (value === undefined ? '(none)' : value);
-
-const getErrorForDuplicate = (type, metadata) => {
-  const { affiliateAddress, feeRecipientAddress, takerAddress } = metadata;
-
-  return new Error(
-    `Multiple ${type} apps match metadata:` +
-      '\r\n\r\n' +
-      `affiliateAddress: ${prettifyUndefined(affiliateAddress)}\r\n` +
-      `feeRecipientAddress: ${prettifyUndefined(feeRecipientAddress)}\r\n` +
-      `takerAddress: ${prettifyUndefined(takerAddress)}`,
-  );
-};
-
-const resolveApps = metadata => {
-  const { affiliateAddress, feeRecipientAddress, takerAddress } = metadata;
-
-  const appDefinitions = getAppDefinitions();
-  const mappings = _.flatMap(appDefinitions, d => d.mappings);
-  const matches = mappings.filter(
-    mapping =>
-      (mapping.affiliateAddress === affiliateAddress ||
-        mapping.affiliateAddress === undefined) &&
-      (mapping.feeRecipientAddress === feeRecipientAddress ||
-        mapping.feeRecipientAddress === undefined) &&
-      (mapping.takerAddress === takerAddress ||
-        mapping.takerAddress === undefined),
-  );
-
-  if (matches.filter(m => m.type === 'relayer').length > 1) {
-    throw getErrorForDuplicate('relayer', metadata);
-  }
-
-  if (matches.filter(m => m.type === 'consumer').length > 1) {
-    throw getErrorForDuplicate('consumer', metadata);
-  }
-
-  return matches.map(match => {
-    const appDefinition = appDefinitions.find(d => d.mappings.includes(match));
-
-    return {
-      id: appDefinition.id,
-      type: match.type,
-    };
-  });
-};
+const resolveApps = require('./resolve-apps');
 
 module.exports = { resolveApps };

src/definitions/apps/index.test.js src/apps/get-app-definitions.test.js

@@ -0,0 +1,51 @@
+const _ = require('lodash');
+const getAppDefinitions = require('./get-app-definitions');
+
+const prettifyUndefined = value => (value === undefined ? '(none)' : value);
+
+const getErrorForDuplicate = (type, metadata) => {
+  const { affiliateAddress, feeRecipientAddress, takerAddress } = metadata;
+
+  return new Error(
+    `Multiple ${type} apps match metadata:` +
+      '\r\n\r\n' +
+      `affiliateAddress: ${prettifyUndefined(affiliateAddress)}\r\n` +
+      `feeRecipientAddress: ${prettifyUndefined(feeRecipientAddress)}\r\n` +
+      `takerAddress: ${prettifyUndefined(takerAddress)}`,
+  );
+};
+
+const resolveApps = metadata => {
+  const { affiliateAddress, feeRecipientAddress, takerAddress } = metadata;
+
+  const appDefinitions = getAppDefinitions();
+  const mappings = _.flatMap(appDefinitions, d => d.mappings);
+  const matches = mappings.filter(
+    mapping =>
+      (mapping.affiliateAddress === affiliateAddress ||
+        mapping.affiliateAddress === undefined) &&
+      (mapping.feeRecipientAddress === feeRecipientAddress ||
+        mapping.feeRecipientAddress === undefined) &&
+      (mapping.takerAddress === takerAddress ||
+        mapping.takerAddress === undefined),
+  );
+
+  if (matches.filter(m => m.type === 'relayer').length > 1) {
+    throw getErrorForDuplicate('relayer', metadata);
+  }
+
+  if (matches.filter(m => m.type === 'consumer').length > 1) {
+    throw getErrorForDuplicate('consumer', metadata);
+  }
+
+  return matches.map(match => {
+    const appDefinition = appDefinitions.find(d => d.mappings.includes(match));
+
+    return {
+      id: appDefinition.id,
+      type: match.type,
+    };
+  });
+};
+
+module.exports = resolveApps;