Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
jobs:
checkout_and_compile:
docker:
- image: circleci/node:10.16
- image: circleci/node:12.22
working_directory: ~/set.js
steps:
- checkout
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
- ~/set.js
test:
docker:
- image: circleci/node:10.16
- image: circleci/node:12.22
working_directory: ~/set.js
parallelism: 2
steps:
Expand All @@ -64,7 +64,7 @@ jobs:
no_output_timeout: 30m
command: |
mkdir -p /tmp/test-results
TEST_FILES="$(circleci tests glob "./test/**/*.spec.ts")"
TEST_FILES="$(circleci tests glob "./test/**/*.spec.ts" | circleci tests split)"
echo $TEST_FILES
yarn test --findRelatedTests ${TEST_FILES}
when: always
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"chai-jest-mocks": "^1.2.4",
"ganache-cli": "^6.12.2",
"ganache": "^7.0.2",
"husky": "^4.2.5",
"jest": "^26.1.0",
"lint-staged": "^10.2.11",
Expand Down
8 changes: 7 additions & 1 deletion scripts/init_chain_internal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@ SET_PROTOCOL_JS=`pwd`

rm -rf blockchain && cp -r snapshots/0x-Kyber-Compound blockchain

ganache-cli --networkId 50 --accounts 20 -l 20000000 -e 10000000000 --mnemonic 'concert load couple harbor equip island argue ramp clarify fence smart topic'
ganache \
--chain.networkId 50 \
--chain.vmErrorsOnRPCResponse \
--miner.blockGasLimit 20000000 \
--wallet.totalAccounts 20 \
--wallet.defaultBalance 10000000000 \
--wallet.mnemonic 'concert load couple harbor equip island argue ramp clarify fence smart topic'
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ describe('DebtIssuanceModuleV2Wrapper', () => {

await tokenWithRoundingError.setError(accruedBalance);

blockchain.waitBlocksAsync(100);
await blockchain.waitBlocksAsync(100);
});

async function subject(): Promise<any> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ describe('ProtocolViewerWrapper', () => {

beforeEach(async () => {
subjectSetTokens = [setTokenOne.address, setTokenTwo.address];
subjectTimeFastForward = ONE_YEAR_IN_SECONDS;
subjectTimeFastForward = ONE_YEAR_IN_SECONDS.toNumber();
});

async function subject(): Promise<any> {
Expand Down
Loading