http2: cleanup Http2Stream/Http2Session destroy

PR-URL: https://github.com/nodejs/node/pull/17406
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>

This is a significant cleanup and refactoring of the
cleanup/close/destroy logic for Http2Stream and Http2Session.
There are significant changes here in the timing and ordering
of cleanup logic, JS apis. and various related necessary edits.

1 files changed, 6 insertions, 14 deletions

diff --git a/test/parallel/test-http2-misbehaving-flow-control-paused.js b/test/parallel/test-http2-misbehaving-flow-control-paused.js
index ee799b1d5a..0b7299d5ac 100644
--- a/test/parallel/test-http2-misbehaving-flow-control-paused.js
+++ b/test/parallel/test-http2-misbehaving-flow-control-paused.js
@@ -56,32 +56,24 @@ let client;
 
 const server = h2.createServer({ settings: { initialWindowSize: 36 } });
 server.on('stream', (stream) => {
-
-  // Not reading causes the flow control window to get backed up.
   stream.pause();
-
-  stream.on('error', common.mustCall((err) => {
-    common.expectsError({
-      code: 'ERR_HTTP2_STREAM_ERROR',
-      type: Error,
-      message: 'Stream closed with error code 3'
-    })(err);
+  stream.on('error', common.expectsError({
+    code: 'ERR_HTTP2_STREAM_ERROR',
+    type: Error,
+    message: 'Stream closed with error code 3'
+  }));
+  stream.on('close', common.mustCall(() => {
     server.close();
     client.destroy();
   }));
-
   stream.on('end', common.mustNotCall());
-
   stream.respond();
   stream.end('ok');
 });
 
 server.listen(0, () => {
   client = net.connect(server.address().port, () => {
-    client.on('error', console.log);
-
     client.write(preamble);
-
     client.write(data);
     client.write(data);
     client.write(data);