Remove preroll logic from strategyImpl and move it to base-strategy.ts (

#236)
magic8bot · Sep 6, 2018 · 41ee4b4 · 41ee4b4
1 parent bffc37c
commit 41ee4b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/strategy/strategies/base-strategy.ts b/src/strategy/strategies/base-strategy.ts
@@ -92,7 +92,7 @@ export abstract class BaseStrategy<TOptions = any, TCalcResult = any> {
     /* istanbul ignore next */
     periodNewListener(() => {
       const signal = this.onPeriod()
-      if (signal) {
+      if (signal && !this.isPreroll) {
         this.signalEmitter({ signal })
       }
     })

diff --git a/src/strategy/strategies/macd/macd.ts b/src/strategy/strategies/macd/macd.ts
@@ -176,12 +176,12 @@ export class Macd extends BaseStrategy<MacdOptions, { rsi: number; signal: numbe
     this.periods[0].avgGain = avgGain
 
     this.periods[0].avgLoss = avgLoss
-    this.overbought = !this.isPreroll && rsi >= this.options.overboughtRsi && !this.overbought
+    this.overbought = rsi >= this.options.overboughtRsi && !this.overbought
   }
 
   public onPeriod() {
     /* istanbul ignore next */
-    const signal = this.isPreroll ? null : this.overboughtSell() ? 'sell' : this.getSignal()
+    const signal = this.overboughtSell() ? 'sell' : this.getSignal()
     /* istanbul ignore next */
     if (this.periods.length) {
       logger.verbose(