From 680298c7b5febe51bc6b91e49e17b6b7a5cd60e8 Mon Sep 17 00:00:00 2001
From: pete <pliljegr@linkedin.com>
Date: Mon, 29 Apr 2019 09:38:35 -0700
Subject: [PATCH] Reducing more noise

---
 .../addon/-private/system/deprecated-evented.js |  4 ++++
 .../store/addon/-private/system/model/errors.js | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/store/addon/-private/system/deprecated-evented.js b/packages/store/addon/-private/system/deprecated-evented.js
index 2c5186fdc19..53740e018f3 100644
--- a/packages/store/addon/-private/system/deprecated-evented.js
+++ b/packages/store/addon/-private/system/deprecated-evented.js
@@ -30,6 +30,10 @@ if (DEBUG) {
       return Evented.mixins[0].properties.has.call(this, name);
     },
 
+    _on() {
+      return Evented.mixins[0].properties.on.call(this, ...arguments);
+    },
+
     _deprecateEvented(eventName) {
       let deprecations = lookupDeprecations(this);
       const _deprecationData = this._getDeprecatedEventedInfo
diff --git a/packages/store/addon/-private/system/model/errors.js b/packages/store/addon/-private/system/model/errors.js
index 9d559fa713d..80e7f507b8f 100644
--- a/packages/store/addon/-private/system/model/errors.js
+++ b/packages/store/addon/-private/system/model/errors.js
@@ -3,6 +3,7 @@ import DeprecatedEvent from '../deprecated-evented';
 import ArrayProxy from '@ember/array/proxy';
 import { get, computed } from '@ember/object';
 import { makeArray, A } from '@ember/array';
+import { DEBUG } from '@glimmer/env';
 
 /**
 @module ember-data
@@ -90,8 +91,8 @@ export default ArrayProxy.extend(DeprecatedEvent, {
     @private
   */
   _registerHandlers(target, becameInvalid, becameValid) {
-    this.on('becameInvalid', target, becameInvalid);
-    this.on('becameValid', target, becameValid);
+    this._on('becameInvalid', target, becameInvalid);
+    this._on('becameValid', target, becameValid);
   },
 
   /**
@@ -226,7 +227,9 @@ export default ArrayProxy.extend(DeprecatedEvent, {
     this._add(attribute, messages);
 
     if (wasEmpty && !get(this, 'isEmpty')) {
-      this.trigger('becameInvalid');
+      if (DEBUG && this._has('becameInvalid')) {
+        this.trigger('becameInvalid');
+      }
     }
   },
 
@@ -304,7 +307,9 @@ export default ArrayProxy.extend(DeprecatedEvent, {
     this._remove(attribute);
 
     if (get(this, 'isEmpty')) {
-      this.trigger('becameValid');
+      if (DEBUG && this._has('becameInvalid')) {
+        this.trigger('becameValid');
+      }
     }
   },
 
@@ -371,7 +376,9 @@ export default ArrayProxy.extend(DeprecatedEvent, {
     }
 
     this._clear();
-    this.trigger('becameValid');
+    if (DEBUG && this._has('becameInvalid')) {
+      this.trigger('becameValid');
+    }
   },
 
   /**