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

address more comments

Browse Source
This commit is contained in:
Michael Zhu 2019-11-26 14:19:37 -08:00
parent 74830854ca
commit 41576652dc
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/exchange-forwarder/CHANGELOG.json
View File

@ -6,8 +6,7 @@
"note": "Added buy support for ERC20Bridge", "note": "Added buy support for ERC20Bridge",
"pr": 2356 "pr": 2356
} }
], ]
"timestamp": 1574461784
}, },
{ {
"version": "3.1.0-beta.3", "version": "3.1.0-beta.3",

4
contracts/exchange-forwarder/test/asset_test.ts
View File

@ -160,7 +160,7 @@ blockchainTests('Supported asset type unit tests', env => {
.transferAssetToSender(erc721AssetData, invalidAmount) .transferAssetToSender(erc721AssetData, invalidAmount)
.awaitTransactionSuccessAsync({ from: receiver }); .awaitTransactionSuccessAsync({ from: receiver });
const expectedError = new ForwarderRevertErrors.Erc721AmountMustEqualOneError(invalidAmount); const expectedError = new ForwarderRevertErrors.Erc721AmountMustEqualOneError(invalidAmount);
expect(tx).to.revertWith(expectedError); return expect(tx).to.revertWith(expectedError);
}); });
it('transfers an ERC20 token given ERC20Bridge assetData', async () => { it('transfers an ERC20 token given ERC20Bridge assetData', async () => {
const txReceipt = await forwarder const txReceipt = await forwarder
@ -178,7 +178,7 @@ blockchainTests('Supported asset type unit tests', env => {
.transferAssetToSender(randomBytes, TRANSFER_AMOUNT) .transferAssetToSender(randomBytes, TRANSFER_AMOUNT)
.awaitTransactionSuccessAsync({ from: receiver }); .awaitTransactionSuccessAsync({ from: receiver });
const expectedError = new ForwarderRevertErrors.UnsupportedAssetProxyError(hexSlice(randomBytes, 0, 4)); const expectedError = new ForwarderRevertErrors.UnsupportedAssetProxyError(hexSlice(randomBytes, 0, 4));
expect(tx).to.revertWith(expectedError); return expect(tx).to.revertWith(expectedError);
}); });
}); });
}); });

5
contracts/integrations/CHANGELOG.json
View File

@ -3,11 +3,10 @@
"version": "1.0.3-beta.2", "version": "1.0.3-beta.2",
"changes": [ "changes": [
{ {
"note": "Forwader <> ERC20Bridge integration testsg", "note": "Forwader <> ERC20Bridge integration tests",
"pr": 2356 "pr": 2356
} }
], ]
"timestamp": 1574461784
}, },
{ {
"version": "1.0.3-beta.1", "version": "1.0.3-beta.1",

2
contracts/integrations/test/forwarder/bridge_test.ts
View File

@ -26,7 +26,7 @@ import { TestEth2DaiContract, TestUniswapExchangeContract } from '../wrappers';
import { deployForwarderAsync } from './deploy_forwarder'; import { deployForwarderAsync } from './deploy_forwarder';
import { ForwarderTestFactory } from './forwarder_test_factory'; import { ForwarderTestFactory } from './forwarder_test_factory';
blockchainTests.resets.only('Forwarder <> ERC20Bridge integration tests', env => { blockchainTests.resets('Forwarder <> ERC20Bridge integration tests', env => {
let deployment: DeploymentManager; let deployment: DeploymentManager;
let balanceStore: BlockchainBalanceStore; let balanceStore: BlockchainBalanceStore;
let testFactory: ForwarderTestFactory; let testFactory: ForwarderTestFactory;