Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor/splitting testnet #225

Merged
merged 20 commits into from Aug 20, 2019

fixing network references.

  • Loading branch information
Freydal committed Aug 19, 2019
commit 1fbd7c93ac14e5456f7110c39a53f9edfe0b1468
@@ -45,7 +45,7 @@ if (args["test-mnemonic"] || !mnemonic) {

const networkId = await web3.eth.net.getId();

if (networkId === 6174) {
if ([6174, 6175].includes(networkId)) {
// @ts-ignore
await new BlockchainLifecycle(new Web3Wrapper(new Web3.providers.HttpProvider(args["rpc-url"]))).startAsync();
if ((await web3.eth.getTransactionCount(normalizedFromAddress)) > 0) {
@@ -72,7 +72,7 @@ export async function migrations(
_rewardPeriod: 4,
},
};
const zeroExAddresses = getContractAddressesForNetworkOrThrow(netId === 6174 ? 50 : netId);
const zeroExAddresses = getContractAddressesForNetworkOrThrow([6174, 6175].includes(netId) ? 50 : netId);
const config = validatorValues[netId] || validatorValues.default;

const orderGateway = await OrderGatewayContract.deployFrom0xArtifactAsync(
@@ -58,7 +58,7 @@ before(async () => {

const ganacheSubprovider = new GanacheSubprovider({
mnemonic: process.env.npm_package_config_test_mnemonic,
network_id: 6174,
network_id: 6175,
});
provider.addProvider(ganacheSubprovider);
}
@@ -16,7 +16,7 @@ describe("ZeroExV2SubContract", () => {
const kosuToken = contracts.kosuToken;
const _arguments = JSON.parse(await contracts.zeroExV2SubContract.arguments.callAsync());
const networkId = await web3Wrapper.getNetworkIdAsync();
const zeroExWrappers = new ContractWrappers(provider, { networkId: networkId === 6174 ? 50 : networkId });
const zeroExWrappers = new ContractWrappers(provider, { networkId: [6174, 6175].includes(networkId) ? 50 : networkId });

const zeroExOrder = {
makerAddress: accounts[0],
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.