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

@0x:contracts-integrations Wrote a simple integration test and AddressManager

Browse Source
This commit is contained in:
Alex Towle
2019-10-08 17:24:11 -07:00
parent 6cba9fd77f
commit 01aee08c02
7 changed files with 266 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,11 +34,6 @@ import { BigNumber } from '@0x/utils';
import { TxData } from 'ethereum-types';
import * as _ from 'lodash';
<<<<<<< HEAD:contracts/integrations/test/deployment/deployment_mananger.ts
=======
import { artifacts, TestStakingPlaceholderContract } from '../../src';
>>>>>>> `@0x/contracts-integrations` Created the FunctionAssertion class and examples:contracts/integrations/test/utils/deployment_mananger.ts
/**
* Adds a batch of authorities to a list of authorizable contracts.
* @param owner The owner of the authorizable contracts.
@@ -111,15 +106,9 @@ interface StakingContracts {
// Contract wrappers for tokens.
interface TokenContracts {
<<<<<<< HEAD:contracts/integrations/test/deployment/deployment_mananger.ts
erc20: DummyERC20TokenContract[];
erc721: DummyERC721TokenContract[];
erc1155: ERC1155MintableContract[];
=======
erc1155: ERC1155Contract;
erc20: ERC20TokenContract[];
erc721: ERC721TokenContract;
>>>>>>> `@0x/contracts-integrations` Created the FunctionAssertion class and examples:contracts/integrations/test/utils/deployment_mananger.ts
weth: WETH9Contract;
zrx: ZRXTokenContract;
}
@@ -160,7 +149,7 @@ export class DeploymentManager {
exchangeArtifacts.Exchange,
environment.provider,
environment.txDefaults,
exchangeArtifacts,
{ ...ERC20Artifacts, ...exchangeArtifacts },
new BigNumber(chainId),
);
const governor = await ZeroExGovernorContract.deployFrom0xArtifactAsync(
@@ -418,7 +407,6 @@ export class DeploymentManager {
txDefaults: Partial<TxData>,
options: Partial<DeploymentOptions>,
): Promise<TokenContracts> {
<<<<<<< HEAD:contracts/integrations/test/deployment/deployment_mananger.ts
const numErc20TokensToDeploy =
options.numErc20TokensToDeploy !== undefined
? options.numErc20TokensToDeploy
@@ -447,26 +435,6 @@ export class DeploymentManager {
constants.DUMMY_TOKEN_TOTAL_SUPPLY,
),
),
=======
const erc20 = [];
erc20[0] = await ERC20TokenContract.deployFrom0xArtifactAsync(
ERC20Artifacts.ERC20Token,
environment.provider,
txDefaults,
ERC20Artifacts,
);
erc20[1] = await ERC20TokenContract.deployFrom0xArtifactAsync(
ERC20Artifacts.ERC20Token,
environment.provider,
txDefaults,
ERC20Artifacts,
);
erc20[2] = await ERC20TokenContract.deployFrom0xArtifactAsync(
ERC20Artifacts.ERC20Token,
environment.provider,
txDefaults,
ERC20Artifacts,
>>>>>>> `@0x/contracts-integrations` Created the FunctionAssertion class and examples:contracts/integrations/test/utils/deployment_mananger.ts
);
const erc721 = await Promise.all(
_.times(