Move Bot.init logic outside the loop

aminmarashi · aminmarashi · commit 7442365c194b · 2017-05-05T13:35:14.000+08:00
diff --git a/cli-examples/speed-test.js b/cli-examples/speed-test.js
@@ -2,13 +2,15 @@ var token = 'Replace with your own token';
 
 console.log('Starting bot...');
 
+Bot.init(token, {
+  symbol: 'R_100',
+  candleInterval: 60,
+  contractTypes: ['CALL', 'PUT'],
+});
+
 while (true) {
-  Bot.start(token, {
-    symbol: 'R_100',
+  Bot.start({
     amount: 1,
-    basis: 'stake',
-    candleInterval: 60,
-    contractTypes: ['CALL', 'PUT'],
     currency: 'USD',
     duration: 2,
     duration_unit: 'h',
diff --git a/src/botPage/bot/Interface/index.js b/src/botPage/bot/Interface/index.js
@@ -30,6 +30,7 @@ export default class Interface extends ToolsInterface(TicksInterface(class {}))
     const getDetail = i => createDetails(this.get('contract'))[i]
 
     return {
+      init: (...args) => this.tradeEngine.init(...args),
       start: (...args) => this.tradeEngine.start(...args),
       stop: (...args) => this.tradeEngine.stop(...args),
       purchase: contractType => this.tradeEngine.purchase(contractType),
diff --git a/src/botPage/bot/TradeEngine/index.js b/src/botPage/bot/TradeEngine/index.js
@@ -1,7 +1,9 @@
 import { Map } from 'immutable'
 import { observer as globalObserver } from 'binary-common-utils/lib/observer'
+import { translate } from '../../..//common/i18n'
+import { createError } from '../../common/error'
 import { doUntilDone } from '../tools'
-import { expectStartArg } from '../sanitize'
+import { expectInitArg } from '../sanitize'
 import Proposal from './Proposal'
 import Broadcast from './Broadcast'
 import Total from './Total'
@@ -30,22 +32,30 @@ export default class TradeEngine extends Balance(Purchase(Sell(
     this.watches = new Map()
     this.signals = new Map()
   }
-  start(...args) {
-    const [token, tradeOption] = expectStartArg(args)
+  init(...args) {
     this.watches = new Map()
     this.signals = new Map()
 
-    const { symbol } = tradeOption
+    const [token, options] = expectInitArg(args)
 
-    this.checkLimits(tradeOption)
+    const { symbol } = options
 
-    globalObserver.emit('bot.start', symbol)
-
-    this.makeProposals(tradeOption)
+    this.options = options
 
     this.startPromise = this.loginAndGetBalance(token)
 
     this.waitBeforePurchase(symbol)
+
+    globalObserver.emit('bot.init', symbol)
+  }
+  start(tradeOptions) {
+    if (!this.options) {
+      throw createError('NotInitialized', translate('Bot.init is not called'))
+    }
+
+    this.checkLimits(tradeOptions)
+
+    this.makeProposals({ ...this.options, ...tradeOptions })
   }
   loginAndGetBalance(token) {
     if (this.token === token) {
diff --git a/src/botPage/bot/__tests__/BotApi.js b/src/botPage/bot/__tests__/BotApi.js
@@ -22,15 +22,17 @@ describe('Interface', () => {
     let stay
 
     beforeAll((done) => {
-      Bot.start('Xkq6oGFEHh6hJH8', {
-        amount: 1,
-        basis: 'stake',
+      Bot.init('Xkq6oGFEHh6hJH8', {
         candleInterval: 60,
         contractTypes: ['DIGITEVEN', 'DIGITODD'],
+        symbol: 'R_100',
+      })
+
+      Bot.start({
+        amount: 1,
         currency: 'USD',
         duration: 5,
         duration_unit: 't',
-        symbol: 'R_100',
       })
 
       watch('before').then(c => {
diff --git a/src/botPage/bot/__tests__/UI.js b/src/botPage/bot/__tests__/UI.js
@@ -2,70 +2,83 @@ import { expectReturnTrue } from './tools'
 
 
 expectReturnTrue('UI Generated Code', `
-(function(){
-  var trade, before_purchase, during_purchase, after_purchase;
+   (function(){
+        var trade, before_purchase, during_purchase, after_purchase;
 
-  function run(f) {
-    if (f) return f();
-    return false;
-  }
+        var tick_analysis_list = [];
 
-  var limitations = {}
+        function run(f, arg) {
+          if (f) return f(arg);
+          return false;
+        }
 
-  var getTradeOptions;
-  getTradeOptions = function getTradeOptions() {
-    var tradeOptions = {}
-    tradeOptions = {
-      contractTypes: ['CALL', 'PUT'],
-      candleInterval: '60',
-      duration: 2,
-      duration_unit: 'h',
-      basis: 'stake',
-      currency: 'USD',
-      amount: 1,
-      restartOnError: false,
-    }
-    tradeOptions.symbol = 'R_100'
-    return tradeOptions
-  }
+        function tick_analysis() {
+          for (var i = 0; i < tick_analysis_list.length; i++) {
+            run(tick_analysis_list[i]);
+          }
+        }
+
+        var limitations = {};
+
+        var start;
+
+          start = function start() {
+          Bot.start({
+            limitations: limitations,
+            duration: 2,
+            duration_unit: 'h',
+            currency: 'USD',
+            amount: 1,
+            prediction: undefined,
+            barrierOffset: undefined,
+            secondBarrierOffset: undefined,
+          });
+        }
   trade = function trade(){
-    if (getTradeOptions !== undefined) {
-      Bot.start('Xkq6oGFEHh6hJH8', getTradeOptions(), limitations);
-    }
+    Bot.init('Xkq6oGFEHh6hJH8', {
+      symbol: 'R_100',
+      contractTypes: ["CALL","PUT"],
+      candleInterval: '60',
+    });
   };
 
-  before_purchase = function before_purchase(){
-    return Bot.purchase('CALL');
-  };
+before_purchase = function before_purchase(){
+      Bot.purchase('CALL');
 
-  during_purchase = function during_purchase(){
-    if (Bot.isSellAvailable()) {
-      Bot.sellAtMarket();
-    }
   };
 
-  var count = 2;
-  after_purchase = function after_purchase(){
-    if (--count !== 0)
-      return true;
-    return false;
+during_purchase = function during_purchase(){
+      if (Bot.isSellAvailable()) {
+        Bot.sellAtMarket();
+      }
+
   };
 
-  while(true) {
-    run(trade)
-    while(watch('before')) {
-      if (run(before_purchase)) {
-        break
-      }
-    }
-    while(watch('during')) {
-      run(during_purchase)
+  var count = 3;
+after_purchase = function after_purchase(){
+    if (--count === 0) {
+      return false;
     }
-    if(!run(after_purchase)) {
-      break;
-    }
-  }
-  return count === 0;
-})()
-  `)
+    return true;
+  };
+
+
+        run(trade)
+        while(true) {
+          run(start)
+          while(watch('before')) {
+            tick_analysis();
+            run(before_purchase);
+          }
+          while(watch('during')) {
+            tick_analysis();
+            run(during_purchase);
+          }
+          tick_analysis();
+          if(!run(after_purchase)) {
+            break;
+          }
+        }
+        return count === 0
+      })();`)
 
diff --git a/src/botPage/bot/__tests__/block-tests/sanitize-test/Trade.js b/src/botPage/bot/__tests__/block-tests/sanitize-test/Trade.js
@@ -7,7 +7,7 @@ describe('Trade Definition Blocks', () => {
 
   describe('Start arguments', () => {
     beforeAll(done =>
-      run('Bot.start("");').catch(e => {
+      run('Bot.init("");').catch(e => {
         error = e
         done()
       }))
@@ -19,7 +19,10 @@ describe('Trade Definition Blocks', () => {
 
   describe('Trade Option must be checked', () => {
     beforeAll(done =>
-      run('Bot.start("SomeToken", { amount: "hello" });').catch(e => {
+      run(`
+        Bot.init('Sametoken');
+        Bot.start({ amount: "hello" })
+      `).catch(e => {
         error = e
         done()
       }))
diff --git a/src/botPage/bot/__tests__/tools.js b/src/botPage/bot/__tests__/tools.js
@@ -1,11 +1,19 @@
 import { expect } from 'chai'
 import { createInterpreter } from '../cli'
 
+const init = `
+  Bot.init('Xkq6oGFEHh6hJH8', {
+    candleInterval: 60,
+    contractTypes: ['CALL', 'PUT'],
+    symbol: 'R_100',
+  })
+`
+
 const start = duration => `
-        Bot.start('Xkq6oGFEHh6hJH8', {
-          amount: 1, basis: 'stake', candleInterval: 60,
-          contractTypes: ['CALL', 'PUT'],
-          currency: 'USD', ${duration}, symbol: 'R_100',
+        ${init}
+        Bot.start({
+          amount: 1,
+          currency: 'USD', ${duration},
         });
 `
 
@@ -14,6 +22,7 @@ export const parts = {
       (function (){
         var result = {};
   `,
+  init,
   timeTrade: start('duration: 2, duration_unit: "h"'),
   tickTrade: start('duration: 5, duration_unit: "t"'),
   waitToPurchase: `
diff --git a/src/botPage/bot/sanitize.js b/src/botPage/bot/sanitize.js
@@ -24,8 +24,8 @@ export const expectPositiveNumber = (num, msg) => {
   return num
 }
 
-const expectTradeOption = tradeOption => {
-  const { symbol, contractTypes, amount, duration } = tradeOption
+const expectOptions = options => {
+  const { symbol, contractTypes } = options
 
   if (!symbol) {
     const error = createError('OptionError', translate('Underlying market is not selected'))
@@ -38,26 +38,32 @@ const expectTradeOption = tradeOption => {
     globalObserver.emit('Error', error)
     throw error
   }
-
-  expectPositiveInteger(duration, translate('Duration must be an integer'))
-
-  expectPositiveNumber(amount, translate('Amount must be a positive number'))
 }
 
-export const expectStartArg = args => {
-  const [token, tradeOption] = args
+export const expectInitArg = args => {
+  const [token, options] = args
 
   if (!token) {
     const error = createError('LoginError', translate('Please login'))
     globalObserver.emit('Error', error)
     throw error
   }
 
-  expectTradeOption(tradeOption)
+  expectOptions(options)
 
   return args
 }
 
+export const expectTradeOptions = tradeOptions => {
+  const { amount, duration } = tradeOptions
+
+  expectPositiveInteger(duration, translate('Duration must be an integer'))
+
+  expectPositiveNumber(amount, translate('Amount must be a positive number'))
+
+  return tradeOptions
+}
+
 const isCandle = candle => candle instanceof Object &&
   (['open', 'high', 'low', 'close'])
     .every(key => isPositiveNumber(candle[key])) &&
diff --git a/src/botPage/view/View.js b/src/botPage/view/View.js
@@ -490,7 +490,7 @@ export default class View {
       }
     })
 
-    globalObserver.register('bot.start', s => {
+    globalObserver.register('bot.init', s => {
       if (symbol !== s) {
         stopTickListeners()
         symbol = s
diff --git a/src/botPage/view/blockly/blocks/trade/index.js b/src/botPage/view/blockly/blocks/trade/index.js
@@ -96,25 +96,13 @@ Blockly.JavaScript.trade = (block) => {
     [contractTypeSelector]
   // TODO: Assemble JavaScript into code variable.
   const code = `
-  var getTradeOptions;
   ${initialization.trim()}
-  trade = function trade(limitations){
-    if (getTradeOptions !== undefined) {
-      var tradeOptions = getTradeOptions()
-      Bot.start('${account.trim()}', {
-        limitations: limitations,
-        duration: tradeOptions.duration,
-        duration_unit: tradeOptions.duration_unit,
-        currency: tradeOptions.currency,
-        amount: tradeOptions.amount,
-        prediction: tradeOptions.prediction,
-        barrierOffset: tradeOptions.barrierOffset,
-        secondBarrierOffset: tradeOptions.secondBarrierOffset,
-        symbol: '${block.getFieldValue('SYMBOL_LIST')}',
-        contractTypes: ${JSON.stringify(contractTypeList)},
-        candleInterval: '${candleIntervalValue}',
-      });
-    }
+  trade = function trade(){
+    Bot.init('${account.trim()}', {
+      symbol: '${block.getFieldValue('SYMBOL_LIST')}',
+      contractTypes: ${JSON.stringify(contractTypeList)},
+      candleInterval: '${candleIntervalValue}',
+    });
   };
   `
   return code
diff --git a/src/botPage/view/blockly/blocks/trade/market.js b/src/botPage/view/blockly/blocks/trade/market.js
diff --git a/src/botPage/view/blockly/index.js b/src/botPage/view/blockly/index.js

Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ export default class View {`
`490`	`490`	`}`
`491`	`491`	`})`
`492`	`492`
`493`		`- globalObserver.register('bot.start', s => {`
	`493`	`+ globalObserver.register('bot.init', s => {`
`494`	`494`	`if (symbol !== s) {`
`495`	`495`	`stopTickListeners()`
`496`	`496`	`symbol = s`