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

Update code after rebase

Browse Source
This commit is contained in:
Alex Browne
2018-05-21 14:26:25 -07:00
parent 577156fe5f
commit 72fb8460e9
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/test/utils/assertions.ts → packages/contracts/src/utils/assertions.ts
View File

@@ -1,7 +1,7 @@
import * as chai from 'chai'; import * as chai from 'chai';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { constants } from '../../util/constants'; import { constants } from './constants';
const expect = chai.expect; const expect = chai.expect;

1
packages/contracts/src/utils/constants.ts
View File

@@ -19,6 +19,7 @@ const TESTRPC_PRIVATE_KEYS_STRINGS = [
export const constants = { export const constants = {
INVALID_OPCODE: 'invalid opcode', INVALID_OPCODE: 'invalid opcode',
REVERT: 'revert', REVERT: 'revert',
ALWAYS_FAILING_TRANSACTION: 'always failing transaction',
TESTRPC_NETWORK_ID: 50, TESTRPC_NETWORK_ID: 50,
AWAIT_TRANSACTION_MINED_MS: 100, AWAIT_TRANSACTION_MINED_MS: 100,
MAX_ETHERTOKEN_WITHDRAW_GAS: 43000, MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,

8
packages/contracts/src/utils/web3_wrapper.ts
View File

@@ -7,13 +7,17 @@ import { coverage } from './coverage';
export const txDefaults = { export const txDefaults = {
from: devConstants.TESTRPC_FIRST_ADDRESS, from: devConstants.TESTRPC_FIRST_ADDRESS,
gas: devConstants.GAS_LIMIT, // gas: devConstants.GAS_LIMIT,
};
const providerConfigs = {
shouldUseInProcessGanache: false,
rpcUrl: 'http://localhost:8501',
}; };
const providerConfigs = { shouldUseInProcessGanache: true };
export const provider = web3Factory.getRpcProvider(providerConfigs); export const provider = web3Factory.getRpcProvider(providerConfigs);
const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage); const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
if (isCoverageEnabled) { if (isCoverageEnabled) {
const coverageSubprovider = coverage.getCoverageSubproviderSingleton(); const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
prependSubprovider(provider, coverageSubprovider); prependSubprovider(provider, coverageSubprovider);
} }
export const web3Wrapper = new Web3Wrapper(provider); export const web3Wrapper = new Web3Wrapper(provider);