From 340b770d3f4c3b50a5d36c0776afd63d9b4f22de Mon Sep 17 00:00:00 2001
From: Robert Nagy <ronagy@icloud.com>
Date: Sat, 13 Nov 2021 14:42:30 +0200
Subject: [PATCH] stream: unify writableErrored and readableErrored

Both of these should always refer to the same error, hence
there is no reason to separate them.

PR-URL: https://github.com/nodejs/node/pull/40799
Refs: https://github.com/nodejs/node/pull/40696
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/stream.md                             | 4 ++--
 lib/internal/streams/readable.js              | 2 +-
 lib/internal/streams/writable.js              | 2 +-
 test/parallel/test-stream-finished.js         | 4 ++--
 test/parallel/test-stream-readable-destroy.js | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/api/stream.md b/doc/api/stream.md
index c20afc5f8dce25..4f242a5d519da2 100644
--- a/doc/api/stream.md
+++ b/doc/api/stream.md
@@ -633,7 +633,7 @@ added:
 Number of times [`writable.uncork()`][stream-uncork] needs to be
 called in order to fully uncork the stream.
 
-##### `writable.writableErrored`
+##### `writable.errored`
 
 <!-- YAML
 added:
@@ -1389,7 +1389,7 @@ added: v12.9.0
 
 Becomes `true` when [`'end'`][] event is emitted.
 
-##### `readable.readableErrored`
+##### `readable.errored`
 
 <!-- YAML
 added:
diff --git a/lib/internal/streams/readable.js b/lib/internal/streams/readable.js
index 37469311067c28..d0125386c8ae8e 100644
--- a/lib/internal/streams/readable.js
+++ b/lib/internal/streams/readable.js
@@ -1242,7 +1242,7 @@ ObjectDefineProperties(Readable.prototype, {
     }
   },
 
-  readableErrored: {
+  errored: {
     enumerable: false,
     get() {
       return this._readableState ? this._readableState.errored : null;
diff --git a/lib/internal/streams/writable.js b/lib/internal/streams/writable.js
index 54ddfbaccab81b..7c082c075642eb 100644
--- a/lib/internal/streams/writable.js
+++ b/lib/internal/streams/writable.js
@@ -858,7 +858,7 @@ ObjectDefineProperties(Writable.prototype, {
     }
   },
 
-  writableErrored: {
+  errored: {
     enumerable: false,
     get() {
       return this._writableState ? this._writableState.errored : null;
diff --git a/test/parallel/test-stream-finished.js b/test/parallel/test-stream-finished.js
index e2d654a4645a97..d8714c8baf5555 100644
--- a/test/parallel/test-stream-finished.js
+++ b/test/parallel/test-stream-finished.js
@@ -612,7 +612,7 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
   const w = new Writable();
   const _err = new Error();
   w.destroy(_err);
-  assert.strictEqual(w.writableErrored, _err);
+  assert.strictEqual(w.errored, _err);
   finished(w, common.mustCall((err) => {
     assert.strictEqual(_err, err);
     assert.strictEqual(w.closed, true);
@@ -625,7 +625,7 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
 {
   const w = new Writable();
   w.destroy();
-  assert.strictEqual(w.writableErrored, null);
+  assert.strictEqual(w.errored, null);
   finished(w, common.mustCall((err) => {
     assert.strictEqual(w.closed, true);
     assert.strictEqual(err.code, 'ERR_STREAM_PREMATURE_CLOSE');
diff --git a/test/parallel/test-stream-readable-destroy.js b/test/parallel/test-stream-readable-destroy.js
index fe47995f11822b..51f4521686e70d 100644
--- a/test/parallel/test-stream-readable-destroy.js
+++ b/test/parallel/test-stream-readable-destroy.js
@@ -13,7 +13,7 @@ const assert = require('assert');
   read.on('close', common.mustCall());
 
   read.destroy();
-  assert.strictEqual(read.readableErrored, null);
+  assert.strictEqual(read.errored, null);
   assert.strictEqual(read.destroyed, true);
 }
 
@@ -32,7 +32,7 @@ const assert = require('assert');
   }));
 
   read.destroy(expected);
-  assert.strictEqual(read.readableErrored, expected);
+  assert.strictEqual(read.errored, expected);
   assert.strictEqual(read.destroyed, true);
 }