quic: Fix cosmetic problems after review

Author: martenrichter

src/quic/session.cc

@@ -1402,18 +1402,11 @@ bool Session::is_destroyed_or_closing() const {
 
 void Session::Close(CloseMethod method) {
   if (is_destroyed()) return;
-  // auto& stats_ = impl_->stats_;
 
   if (impl_->last_error_) {
     Debug(this, "Closing with error: %s", impl_->last_error_);
   }
 
-  // This is done already in the implmentation
-  // STAT_RECORD_TIMESTAMP(Stats, closing_at);
-  // The next line would prevent,
-  // that close of the implementation is executed!
-  // impl_->state_->closing = 1;
-
   // With both the DEFAULT and SILENT options, we will proceed to closing
   // the session immediately. All open streams will be immediately destroyed
   // with whatever is set as the last error. The session will then be destroyed
@@ -1467,9 +1460,6 @@ void Session::FinishClose() {
   // and as a result of, Close()
   // being called first.
   DCHECK(!is_destroyed());
-  // The next line does not make sense, as in the implementation
-  // is also checking if closing is not in progress
-  // DCHECK(impl_->state_->closing);
 
   // If impl_->Close() returns true, then the session can be destroyed
   // immediately without round-tripping through JavaScript.

src/quic/streams.cc

@@ -17,7 +17,6 @@
 
 namespace node {
 
-using quic::BindingData;
 using v8::Array;
 using v8::ArrayBuffer;
 using v8::ArrayBufferView;
@@ -31,6 +30,7 @@ using v8::Maybe;
 using v8::Nothing;
 using v8::Object;
 using v8::ObjectTemplate;
+using v8::Promise;
 using v8::SharedArrayBuffer;
 using v8::TypedArray;
 using v8::Uint8Array;
@@ -1462,6 +1462,7 @@ JS_METHOD_IMPL(DataQueueFeeder::AddFakePull) {
   feeder->tryWakePulls();
 }
 
+using quic::BindingData;
 JS_CONSTRUCTOR_IMPL(DataQueueFeeder, dataqueuefeeder_constructor_template, {
   auto isolate = env->isolate();
   JS_NEW_CONSTRUCTOR();

src/quic/streams.h

@@ -17,8 +17,6 @@
 
 namespace node {
 
-using v8::Global;
-using v8::Promise;
 namespace quic {
 
 class Session;
@@ -407,7 +405,7 @@ class DataQueueFeeder final : public AsyncWrap {
 
   void tryWakePulls() {
     if (!readFinish_.IsEmpty()) {
-      Local<Promise::Resolver> resolver = readFinish_.Get(env()->isolate());
+      v8::Local<v8::Promise::Resolver> resolver = readFinish_.Get(env()->isolate());
       // I do not think, that this can error...
       [[maybe_unused]] v8::Maybe<bool> ignoredResult =
           resolver->Resolve(env()->context(), v8::True(env()->isolate()));
@@ -426,7 +424,7 @@ class DataQueueFeeder final : public AsyncWrap {
       pending.next(bob::STATUS_EOS, nullptr, 0, [](uint64_t) {});
     }
     if (!readFinish_.IsEmpty()) {
-      Local<Promise::Resolver> resolver = readFinish_.Get(env()->isolate());
+      Local<v8::Promise::Resolver> resolver = readFinish_.Get(env()->isolate());
       [[maybe_unused]] v8::Maybe<bool> ignoredResult =
           resolver->Resolve(env()->context(), v8::False(env()->isolate()));
       readFinish_.Reset();
@@ -458,7 +456,7 @@ class DataQueueFeeder final : public AsyncWrap {
 
  private:
   std::shared_ptr<DataQueue> dataQueue_;
-  Global<Promise::Resolver> readFinish_;
+  v8::Global<v8::Promise::Resolver> readFinish_;
 
   std::deque<PendingPull> pendingPulls_;
   bool done = false;