From 31ad94a906c44cf48ef317111c4c1886ff5c7e81 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 10:22:13 +0800 Subject: [PATCH 1/9] TEST --- src/botPage/bot/__tests__/tools.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/botPage/bot/__tests__/tools.js b/src/botPage/bot/__tests__/tools.js index 1999d2bdf9..4378f36783 100644 --- a/src/botPage/bot/__tests__/tools.js +++ b/src/botPage/bot/__tests__/tools.js @@ -66,7 +66,9 @@ export const expectReturnTrue = (msg, code) => let value; beforeAll(done => { + console.log('Running code...', code); run(code).then(v => { + console.log('Returned value:', v); value = v; done(); }); From 16aeafed37d31ea247a6e1e7dceb86dcee50ed28 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 10:36:59 +0800 Subject: [PATCH 2/9] test From 98eb0411ccc5cd90b28c45152b584de476138705 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 11:05:41 +0800 Subject: [PATCH 3/9] test From cc69a7f61af4e8a37a83aadf502a126187156f79 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 11:08:23 +0800 Subject: [PATCH 4/9] TEST --- .jest | 2 +- src/botPage/bot/__tests__/tools.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.jest b/.jest index 35ec7d7a44..091bbdd02a 100644 --- a/.jest +++ b/.jest @@ -1,3 +1,3 @@ -jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000 +jasmine.DEFAULT_TIMEOUT_INTERVAL = 180000 process.on('unhandledRejection', e => console.log(e)) diff --git a/src/botPage/bot/__tests__/tools.js b/src/botPage/bot/__tests__/tools.js index 4378f36783..3283cf5c5b 100644 --- a/src/botPage/bot/__tests__/tools.js +++ b/src/botPage/bot/__tests__/tools.js @@ -33,6 +33,7 @@ export const parts = { `, waitToSell: ` while (watch('during')) { + console.log('Attempting to sell...'); if (Bot.isSellAvailable()) { Bot.sellAtMarket(); } @@ -66,9 +67,7 @@ export const expectReturnTrue = (msg, code) => let value; beforeAll(done => { - console.log('Running code...', code); run(code).then(v => { - console.log('Returned value:', v); value = v; done(); }); From 476356013836bde92e2f8448420beba8f296ec8a Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 11:13:28 +0800 Subject: [PATCH 5/9] TEST --- src/botPage/bot/__tests__/tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/botPage/bot/__tests__/tools.js b/src/botPage/bot/__tests__/tools.js index 3283cf5c5b..4fb3b03977 100644 --- a/src/botPage/bot/__tests__/tools.js +++ b/src/botPage/bot/__tests__/tools.js @@ -33,7 +33,7 @@ export const parts = { `, waitToSell: ` while (watch('during')) { - console.log('Attempting to sell...'); + console.log('Attempting to sell...', Date.now()); if (Bot.isSellAvailable()) { Bot.sellAtMarket(); } From 3947a0fdddbd1b1eadea8e253936ef0e06a3d309 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 11:15:57 +0800 Subject: [PATCH 6/9] TEST --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa9f7a5dc1..38e77c3e21 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "scripts": { "start": "gulp watch", - "test": "eslint src/ && jest -w 10 --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", + "test": "eslint src/ && jest -w 10 --coverage Core.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", "release": "d() { test -z $1 && echo 'Please specify branch.' && exit 1; (git show-branch $1) || exit 1; git stash; git checkout $1; npm i; rm -rf branch/$1; mkdir -p branch/$1 ; gulp build-min; cp -r www/ branch/$1; gulp release-branch --branch $1;}; d", "release-production": "d() { git stash; git checkout master; npm i;gulp build-min;gulp release-master;}; d", "build": "webpack --config webpack.config.cli.js" From 883180773994ff166994a3717f4123baddd716c4 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 11:24:02 +0800 Subject: [PATCH 7/9] Empty From 7786e87a46142b98515d05e29a43f077bb10866c Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 11:36:18 +0800 Subject: [PATCH 8/9] Test --- src/botPage/bot/TradeEngine/Sell.js | 3 +++ src/botPage/bot/TradeEngine/index.js | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/botPage/bot/TradeEngine/Sell.js b/src/botPage/bot/TradeEngine/Sell.js index d099463fda..cf5a0d5856 100644 --- a/src/botPage/bot/TradeEngine/Sell.js +++ b/src/botPage/bot/TradeEngine/Sell.js @@ -8,11 +8,14 @@ let delayIndex = 0; export default Engine => class Sell extends Engine { isSellAtMarketAvailable() { + console.log('Called isSellAtMarketAvailable'); return this.contractId && !this.isSold && this.isSellAvailable && !this.isExpired; } sellAtMarket() { + console.log('called sellAtMarket'); // Prevent calling sell twice if (this.store.getState().scope !== DURING_PURCHASE) { + console.log('Scope is not DURING_PURCHASE'); return Promise.resolve(); } diff --git a/src/botPage/bot/TradeEngine/index.js b/src/botPage/bot/TradeEngine/index.js index 8ad3f62180..371a971216 100644 --- a/src/botPage/bot/TradeEngine/index.js +++ b/src/botPage/bot/TradeEngine/index.js @@ -74,6 +74,7 @@ export default class TradeEngine extends Balance(Purchase(Sell(OpenContract(Prop this.store = createStore(rootReducer, applyMiddleware(thunk)); } init(...args) { + console.log('Init called', args); const [token, options] = expectInitArg(args); const { symbol } = options; @@ -91,6 +92,8 @@ export default class TradeEngine extends Balance(Purchase(Sell(OpenContract(Prop throw createError('NotInitialized', translate('Bot.init is not called')); } + console.log('Start called', tradeOptions); + globalObserver.emit('bot.running'); globalObserver.setState({ isRunning: true }); @@ -135,6 +138,7 @@ export default class TradeEngine extends Balance(Purchase(Sell(OpenContract(Prop this.observeProposals(); } watch(watchName) { + console.log('Watching', watchName); if (watchName === 'before') { return watchBefore(this.store); } From 179e7b2d2194f16a20fde3e6aa16d0638c88aae2 Mon Sep 17 00:00:00 2001 From: Aaron Imming Date: Wed, 24 Jul 2019 11:40:36 +0800 Subject: [PATCH 9/9] Test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38e77c3e21..aa9f7a5dc1 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "scripts": { "start": "gulp watch", - "test": "eslint src/ && jest -w 10 --coverage Core.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", + "test": "eslint src/ && jest -w 10 --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage", "release": "d() { test -z $1 && echo 'Please specify branch.' && exit 1; (git show-branch $1) || exit 1; git stash; git checkout $1; npm i; rm -rf branch/$1; mkdir -p branch/$1 ; gulp build-min; cp -r www/ branch/$1; gulp release-branch --branch $1;}; d", "release-production": "d() { git stash; git checkout master; npm i;gulp build-min;gulp release-master;}; d", "build": "webpack --config webpack.config.cli.js"