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

address comments

Browse Source
This commit is contained in:
Michael Zhu
2019-10-22 11:52:16 -07:00
parent 3e5d166ec4
commit 752dd04546
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/integrations/test/coordinator/coordinator.ts
View File

@@ -251,7 +251,7 @@ blockchainTests.resets('Coordinator tests', env => {
transactionHash,
feeRecipient.address,
);
expect(tx).to.revertWith(expectedError);
return expect(tx).to.revertWith(expectedError);
});
it(`${fnName} should revert with an invalid approval signature`, async () => {
const approvalSignature = hexConcat(
@@ -272,7 +272,7 @@ blockchainTests.resets('Coordinator tests', env => {
transactionHash,
feeRecipient.address,
);
expect(tx).to.revertWith(expectedError);
return expect(tx).to.revertWith(expectedError);
});
it(`${fnName} should revert if not called by tx signer or approver`, async () => {
const tx = coordinator.executeTransaction.awaitTransactionSuccessAsync(
@@ -284,7 +284,7 @@ blockchainTests.resets('Coordinator tests', env => {
);
const expectedError = new CoordinatorRevertErrors.InvalidOriginError(taker.address);
expect(tx).to.revertWith(expectedError);
return expect(tx).to.revertWith(expectedError);
});
}
});
@@ -371,7 +371,7 @@ blockchainTests.resets('Coordinator tests', env => {
transactionHash,
feeRecipient.address,
);
expect(tx).to.revertWith(expectedError);
return expect(tx).to.revertWith(expectedError);
});
it(`${fnName} should revert if not called by tx signer or approver`, async () => {
const tx = coordinator.executeTransaction.awaitTransactionSuccessAsync(
@@ -382,7 +382,7 @@ blockchainTests.resets('Coordinator tests', env => {
{ from: maker.address, value: DeploymentManager.protocolFee.times(orders.length) },
);
const expectedError = new CoordinatorRevertErrors.InvalidOriginError(taker.address);
expect(tx).to.revertWith(expectedError);
return expect(tx).to.revertWith(expectedError);
});
}
});

2
contracts/integrations/test/utils/deployment_manager.ts
View File

@@ -123,7 +123,7 @@ export interface DeploymentOptions {
export class DeploymentManager {
public static readonly protocolFeeMultiplier = new BigNumber(150000);
public static readonly gasPrice = new BigNumber(1000000000); // 1 Gwei
public static readonly gasPrice = new BigNumber(1e9); // 1 Gwei
public static readonly protocolFee = DeploymentManager.gasPrice.times(DeploymentManager.protocolFeeMultiplier);
/**