Optimize the buy-sell loop

aminmarashi · aminmarashi · commit 8f6bbde7e166 · 2017-04-13T10:01:46.000+08:00
diff --git a/src/botPage/bot/TradeEngine/OpenContract.js b/src/botPage/bot/TradeEngine/OpenContract.js
@@ -21,7 +21,6 @@ export default Engine => class OpenContract extends Engine {
         this.ongoingPurchase = false
         this.contractId = ''
         this.updateTotals(contract)
-        this.api.unsubscribeByID(this.openContractId)
         if (this.afterPromise) {
           this.afterPromise()
         }
@@ -59,9 +58,7 @@ export default Engine => class OpenContract extends Engine {
       doUntilDone(() => this.api.subscribeToTransactions())
     }
 
-    doUntilDone(() => this.api.subscribeToOpenContract(contractId)).then(r => {
-      ({ proposal_open_contract: { id: this.openContractId } } = r)
-    })
+    doUntilDone(() => this.api.subscribeToOpenContract(contractId))
   }
   setContractFlags(contract) {
     const {
diff --git a/src/botPage/bot/TradeEngine/Proposal.js b/src/botPage/bot/TradeEngine/Proposal.js
@@ -26,11 +26,14 @@ export default Engine => class Proposal extends Engine {
       throw translate('Selected proposal does not exist')
     }
 
-    return toBuy
+    return {
+      id: toBuy.id,
+      askPrice: toBuy.ask_price,
+    }
   }
-  renewProposalsOnPurchase() {
-    this.unsubscribeProposals()
+  renewProposalsOnPurchase(toBuyId) {
     this.requestProposals()
+    this.unsubscribeProposals(toBuyId)
   }
   waitForProposals() {
     this.data = this.data.set('proposals', new Map())
@@ -60,7 +63,7 @@ export default Engine => class Proposal extends Engine {
       }
     })
   }
-  unsubscribeProposals() {
+  unsubscribeProposals(toBuyId) {
     if (!this.data.has('proposals')) {
       return
     }
@@ -70,7 +73,11 @@ export default Engine => class Proposal extends Engine {
     this.data = this.data.set('proposals', new Map())
 
     proposals.forEach(proposal => {
-      const { uuid: id } = proposal
+      const { uuid: id, id: streamId } = proposal
+
+      if (toBuyId === streamId) {
+        return
+      }
 
       this.data = this.data.setIn(['forgetProposals', id], true)
 
diff --git a/src/botPage/bot/TradeEngine/Purchase.js b/src/botPage/bot/TradeEngine/Purchase.js
@@ -4,11 +4,11 @@ let delayIndex = 0
 
 export default Engine => class Purchase extends Engine {
   purchase(contractType) {
-    const toBuy = this.selectProposal(contractType)
+    const { id, askPrice } = this.selectProposal(contractType)
 
     this.ongoingPurchase = true
 
-    return recoverFromError(() => this.api.buyContract(toBuy.id, toBuy.ask_price),
+    return recoverFromError(() => this.api.buyContract(id, askPrice),
       (errorCode, makeDelay) => {
         // if disconnected no need to resubscription (handled by live-api)
         if (errorCode !== 'DisconnectError') {
@@ -19,11 +19,11 @@ export default Engine => class Purchase extends Engine {
           .then(() => makeDelay().then(() => this.observer.emit('REVERT', 'before')))
       }, ['PriceMoved'], delayIndex++)
       .then(r => {
-        delayIndex = 0
-        this.broadcastPurchase(r.buy, contractType)
         this.subscribeToOpenContract(r.buy.contract_id)
-        this.renewProposalsOnPurchase()
         this.signal('purchase')
+        delayIndex = 0
+        this.broadcastPurchase(r.buy, contractType)
+        this.renewProposalsOnPurchase(id)
       })
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ export default Engine => class OpenContract extends Engine {`
`21`	`21`	`this.ongoingPurchase = false`
`22`	`22`	`this.contractId = ''`
`23`	`23`	`this.updateTotals(contract)`
`24`		`- this.api.unsubscribeByID(this.openContractId)`
`25`	`24`	`if (this.afterPromise) {`
`26`	`25`	`this.afterPromise()`
`27`	`26`	`}`
`@@ -59,9 +58,7 @@ export default Engine => class OpenContract extends Engine {`
`59`	`58`	`doUntilDone(() => this.api.subscribeToTransactions())`
`60`	`59`	`}`
`61`	`60`
`62`		`- doUntilDone(() => this.api.subscribeToOpenContract(contractId)).then(r => {`
`63`		`- ({ proposal_open_contract: { id: this.openContractId } } = r)`
`64`		`- })`
	`61`	`+ doUntilDone(() => this.api.subscribeToOpenContract(contractId))`
`65`	`62`	`}`
`66`	`63`	`setContractFlags(contract) {`
`67`	`64`	`const {`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,14 @@ export default Engine => class Proposal extends Engine {`
`26`	`26`	`throw translate('Selected proposal does not exist')`
`27`	`27`	`}`
`28`	`28`
`29`		`- return toBuy`
	`29`	`+ return {`
	`30`	`+ id: toBuy.id,`
	`31`	`+ askPrice: toBuy.ask_price,`
	`32`	`+ }`
`30`	`33`	`}`
`31`		`- renewProposalsOnPurchase() {`
`32`		`- this.unsubscribeProposals()`
	`34`	`+ renewProposalsOnPurchase(toBuyId) {`
`33`	`35`	`this.requestProposals()`
	`36`	`+ this.unsubscribeProposals(toBuyId)`
`34`	`37`	`}`
`35`	`38`	`waitForProposals() {`
`36`	`39`	`this.data = this.data.set('proposals', new Map())`
`@@ -60,7 +63,7 @@ export default Engine => class Proposal extends Engine {`
`60`	`63`	`}`
`61`	`64`	`})`
`62`	`65`	`}`
`63`		`- unsubscribeProposals() {`
	`66`	`+ unsubscribeProposals(toBuyId) {`
`64`	`67`	`if (!this.data.has('proposals')) {`
`65`	`68`	`return`
`66`	`69`	`}`
`@@ -70,7 +73,11 @@ export default Engine => class Proposal extends Engine {`
`70`	`73`	`this.data = this.data.set('proposals', new Map())`
`71`	`74`
`72`	`75`	`proposals.forEach(proposal => {`
`73`		`- const { uuid: id } = proposal`
	`76`	`+ const { uuid: id, id: streamId } = proposal`
	`77`	`+`
	`78`	`+ if (toBuyId === streamId) {`
	`79`	`+ return`
	`80`	`+ }`
`74`	`81`
`75`	`82`	`this.data = this.data.setIn(['forgetProposals', id], true)`
`76`	`83`