Merge pull request #514 from AugurProject/micah

Minor improvements.

Author: Micah Zoltu

source/libraries/ContractInterfaces.ts

@@ -367,6 +367,13 @@ export class Augur extends Controlled {
         return <boolean>result[0];
     }
 
+    public isKnownUniverse_ = async(universe: string, options?: { sender?: string }): Promise<boolean> => {
+        options = options || {};
+        const abi: AbiFunction = {"constant":true,"inputs":[{"name":"_universe","type":"address"}],"name":"isKnownUniverse","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"};
+        const result = await this.localCall(abi, [universe], options.sender);
+        return <boolean>result[0];
+    }
+
     public logFeeWindowCreated = async(feeWindow: string, id: BN, options?: { sender?: string, gasPrice?: BN }): Promise<string> => {
         options = options || {};
         const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_feeWindow","type":"address"},{"name":"_id","type":"uint256"}],"name":"logFeeWindowCreated","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
@@ -471,13 +478,6 @@ export class Augur extends Controlled {
         return <boolean>result[0];
     }
 
-    public isKnownUniverse_ = async(universe: string, options?: { sender?: string }): Promise<boolean> => {
-        options = options || {};
-        const abi: AbiFunction = {"constant":true,"inputs":[{"name":"_universe","type":"address"}],"name":"isKnownUniverse","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"};
-        const result = await this.localCall(abi, [universe], options.sender);
-        return <boolean>result[0];
-    }
-
     public createChildUniverse = async(parentPayoutDistributionHash: string, options?: { sender?: string, gasPrice?: BN }): Promise<string> => {
         options = options || {};
         const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_parentPayoutDistributionHash","type":"bytes32"}],"name":"createChildUniverse","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
@@ -4014,16 +4014,16 @@ export class CancelOrder extends Controlled {
         return <boolean>result[0];
     }
 
-    public cancelOrder = async(orderId: string, type: BN, market: string, outcome: BN, options?: { sender?: string, gasPrice?: BN }): Promise<string> => {
+    public cancelOrder = async(orderId: string, options?: { sender?: string, gasPrice?: BN }): Promise<string> => {
         options = options || {};
-        const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_orderId","type":"bytes32"},{"name":"_type","type":"uint8"},{"name":"_market","type":"address"},{"name":"_outcome","type":"uint8"}],"name":"cancelOrder","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
-        return await this.remoteCall(abi, [orderId, type, market, outcome], options.sender, options.gasPrice);
+        const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_orderId","type":"bytes32"}],"name":"cancelOrder","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
+        return await this.remoteCall(abi, [orderId], options.sender, options.gasPrice);
     }
 
-    public cancelOrder_ = async(orderId: string, type: BN, market: string, outcome: BN, options?: { sender?: string }): Promise<boolean> => {
+    public cancelOrder_ = async(orderId: string, options?: { sender?: string }): Promise<boolean> => {
         options = options || {};
-        const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_orderId","type":"bytes32"},{"name":"_type","type":"uint8"},{"name":"_market","type":"address"},{"name":"_outcome","type":"uint8"}],"name":"cancelOrder","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
-        const result = await this.localCall(abi, [orderId, type, market, outcome], options.sender);
+        const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_orderId","type":"bytes32"}],"name":"cancelOrder","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
+        const result = await this.localCall(abi, [orderId], options.sender);
         return <boolean>result[0];
     }
 
@@ -5190,6 +5190,19 @@ export class ShareToken extends Controlled {
         return <boolean>result[0];
     }
 
+    public trustedCancelOrderTransfer = async(source: string, destination: string, attotokens: BN, options?: { sender?: string, gasPrice?: BN }): Promise<string> => {
+        options = options || {};
+        const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_source","type":"address"},{"name":"_destination","type":"address"},{"name":"_attotokens","type":"uint256"}],"name":"trustedCancelOrderTransfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
+        return await this.remoteCall(abi, [source, destination, attotokens], options.sender, options.gasPrice);
+    }
+
+    public trustedCancelOrderTransfer_ = async(source: string, destination: string, attotokens: BN, options?: { sender?: string }): Promise<boolean> => {
+        options = options || {};
+        const abi: AbiFunction = {"constant":false,"inputs":[{"name":"_source","type":"address"},{"name":"_destination","type":"address"},{"name":"_attotokens","type":"uint256"}],"name":"trustedCancelOrderTransfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"};
+        const result = await this.localCall(abi, [source, destination, attotokens], options.sender);
+        return <boolean>result[0];
+    }
+
     public getOutcome_ = async( options?: { sender?: string }): Promise<BN> => {
         options = options || {};
         const abi: AbiFunction = {"constant":true,"inputs":[],"name":"getOutcome","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"};

source/libraries/ContractInterfacesGenerator.ts

@@ -134,14 +134,14 @@ ${contractMethods.join("\n\n")}
         const argNames: String = this.getArgNamesString(abiFunction);
         const params: String = this.getParamsString(abiFunction);
         const options: String = `{ sender?: string${abiFunction.payable ? ", attachedEth?: BN" : ""} }`;
-        const returnType: String = this.getTsTypeFromPrimitive(abiFunction.outputs[0].type);
-        const returnPromiseType: String = abiFunction.outputs.length == 1 ? returnType : "Array<string>";
+        const returnType: String = (abiFunction.outputs[0] !== undefined) ? this.getTsTypeFromPrimitive(abiFunction.outputs[0].type) : "void";
+        const returnPromiseType: String = (abiFunction.outputs.length === 0 || abiFunction.outputs.length === 1) ? returnType : "Array<string>";
         const returnValue: String = abiFunction.outputs.length == 1 ? `<${returnType}>result[0]` : "<Array<string>>result";
         return `    public ${abiFunction.name}_ = async(${params} options?: ${options}): Promise<${returnPromiseType}> => {
         options = options || {};
         const abi: AbiFunction = ${JSON.stringify(abiFunction)};
-        const result = await this.localCall(abi, [${argNames}], options.sender${abiFunction.payable ? ", options.attachedEth" : ""});
-        return ${returnValue};
+        ${abiFunction.outputs.length !== 0 ? 'const result = ' : ''}await this.localCall(abi, [${argNames}], options.sender${abiFunction.payable ? ", options.attachedEth" : ""});
+        ${abiFunction.outputs.length !== 0 ? `return ${returnValue};` : ''}
     }`;
     }
 

source/tools/generateContractInterfaces.ts

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 
+require('source-map-support').install();
 import { ContractCompiler } from "../libraries/ContractCompiler";
 import { Configuration } from '../libraries/Configuration';
 import { ContractInterfaceGenerator } from '../libraries/ContractInterfacesGenerator';

support/test/integration/docker-compose.yml

@@ -14,9 +14,9 @@ services:
       dockerfile: support/Dockerfile
       cache_from:
         - augurproject/augur-core:latest
-    entrypoint: [ "npm", "run", "test:integration"]
+    entrypoint: [ "npm", "run", "test:integration" ]
     # uncomment the following 3 lines to enable debugging the tests
-    # command: [ "--debug=0.0.0.0:9229", "--inspect-brk" ]
+    # command: [ "--", "--debug=0.0.0.0:9229", "--inspect-brk" ]
     # ports:
     #   - "9229:9229"
     environment:
@@ -38,9 +38,9 @@ services:
       dockerfile: support/Dockerfile
       cache_from:
         - augurproject/augur-core:latest
-    entrypoint: [ "npx", "mocha", "output/tests-integration/**/*.js", "--no-timeouts", "--require", "source-map-support/register"]
+    entrypoint: [ "npm", "run", "test:integration" ]
     # uncomment the following 3 lines to enable debugging the tests
-    # command: [ "--debug=0.0.0.0:9229", "--inspect-brk" ]
+    command: [ "--", "--debug=0.0.0.0:9229", "--inspect-brk" ]
     # ports:
     #   - "9229:9229"
     environment: