aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
diff options
context:
space:
mode:
authorAlex Browne <stephenalexbrowne@gmail.com>2018-05-22 05:26:25 +0800
committerAlex Browne <stephenalexbrowne@gmail.com>2018-06-07 03:39:42 +0800
commit72fb8460e90237fb7879fc47e95d84b6aa54911b (patch)
treeabb2c77b0e05cf73738c10766ba59b275183d602 /packages/contracts/src
parent577156fe5f63e581b101682d13b7e70e7a9336e5 (diff)
downloaddexon-sol-tools-72fb8460e90237fb7879fc47e95d84b6aa54911b.tar
dexon-sol-tools-72fb8460e90237fb7879fc47e95d84b6aa54911b.tar.gz
dexon-sol-tools-72fb8460e90237fb7879fc47e95d84b6aa54911b.tar.bz2
dexon-sol-tools-72fb8460e90237fb7879fc47e95d84b6aa54911b.tar.lz
dexon-sol-tools-72fb8460e90237fb7879fc47e95d84b6aa54911b.tar.xz
dexon-sol-tools-72fb8460e90237fb7879fc47e95d84b6aa54911b.tar.zst
dexon-sol-tools-72fb8460e90237fb7879fc47e95d84b6aa54911b.zip
Update code after rebase
Diffstat (limited to 'packages/contracts/src')
-rw-r--r--packages/contracts/src/utils/assertions.ts20
-rw-r--r--packages/contracts/src/utils/constants.ts1
-rw-r--r--packages/contracts/src/utils/web3_wrapper.ts8
3 files changed, 27 insertions, 2 deletions
diff --git a/packages/contracts/src/utils/assertions.ts b/packages/contracts/src/utils/assertions.ts
new file mode 100644
index 000000000..72c2734d8
--- /dev/null
+++ b/packages/contracts/src/utils/assertions.ts
@@ -0,0 +1,20 @@
+import * as chai from 'chai';
+import * as _ from 'lodash';
+
+import { constants } from './constants';
+
+const expect = chai.expect;
+
+// throws if the given promise does not reject with one of two expected error
+// messages.
+export const expectRevertOrAlwaysFailingTransaction = <T>(p: Promise<T>) => {
+ return expect(p)
+ .to.be.rejected()
+ .then(e => {
+ expect(e).to.satisfy(
+ (err: Error) =>
+ _.includes(err.message, constants.REVERT) ||
+ _.includes(err.message, constants.ALWAYS_FAILING_TRANSACTION),
+ );
+ });
+};
diff --git a/packages/contracts/src/utils/constants.ts b/packages/contracts/src/utils/constants.ts
index 9b0b92545..144e22bc2 100644
--- a/packages/contracts/src/utils/constants.ts
+++ b/packages/contracts/src/utils/constants.ts
@@ -19,6 +19,7 @@ const TESTRPC_PRIVATE_KEYS_STRINGS = [
export const constants = {
INVALID_OPCODE: 'invalid opcode',
REVERT: 'revert',
+ ALWAYS_FAILING_TRANSACTION: 'always failing transaction',
TESTRPC_NETWORK_ID: 50,
AWAIT_TRANSACTION_MINED_MS: 100,
MAX_ETHERTOKEN_WITHDRAW_GAS: 43000,
diff --git a/packages/contracts/src/utils/web3_wrapper.ts b/packages/contracts/src/utils/web3_wrapper.ts
index 1049ab967..a89d7e8d0 100644
--- a/packages/contracts/src/utils/web3_wrapper.ts
+++ b/packages/contracts/src/utils/web3_wrapper.ts
@@ -7,13 +7,17 @@ import { coverage } from './coverage';
export const txDefaults = {
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);
const isCoverageEnabled = env.parseBoolean(EnvVars.SolidityCoverage);
if (isCoverageEnabled) {
const coverageSubprovider = coverage.getCoverageSubproviderSingleton();
prependSubprovider(provider, coverageSubprovider);
}
+
export const web3Wrapper = new Web3Wrapper(provider);