From 4a2b76e1efb4406ca50ae89ed7043005c7b4cc91 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Tue, 23 Jul 2019 01:13:20 +0300
Subject: [PATCH] Fix testProxy.

GitOrigin-RevId: fcce1611113bec089ac3ca20df56eba85895a753
---
 td/mtproto/HandshakeActor.cpp | 2 +-
 td/telegram/Td.cpp            | 5 +++--
 tdnet/td/net/Wget.cpp         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/td/mtproto/HandshakeActor.cpp b/td/mtproto/HandshakeActor.cpp
index fb4e0832..fae45f6c 100644
--- a/td/mtproto/HandshakeActor.cpp
+++ b/td/mtproto/HandshakeActor.cpp
@@ -55,7 +55,7 @@ void HandshakeActor::return_connection(Status status) {
     CHECK(!raw_connection_promise_);
     return;
   }
-  if (status.is_error()) {
+  if (status.is_error() && !raw_connection->debug_str_.empty()) {
     status = Status::Error(status.code(), PSLICE() << status.message() << " : " << raw_connection->debug_str_);
   }
   Scheduler::unsubscribe(raw_connection->get_poll_info().get_pollable_fd_ref());
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index f5ff9dda..a71ffdc0 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -617,7 +617,7 @@ class TestProxyRequest : public RequestOnceActor {
   }
   void on_handshake_connection(Result<unique_ptr<mtproto::RawConnection>> r_raw_connection) {
     if (r_raw_connection.is_error()) {
-      promise_.set_error(Status::Error(400, r_raw_connection.move_as_error().public_message()));
+      return promise_.set_error(Status::Error(400, r_raw_connection.move_as_error().public_message()));
     }
   }
   void on_handshake(Result<unique_ptr<mtproto::AuthKeyHandshake>> r_handshake) {
@@ -625,13 +625,14 @@ class TestProxyRequest : public RequestOnceActor {
       return;
     }
     if (r_handshake.is_error()) {
-      promise_.set_error(Status::Error(400, r_handshake.move_as_error().public_message()));
+      return promise_.set_error(Status::Error(400, r_handshake.move_as_error().public_message()));
     }
 
     auto handshake = r_handshake.move_as_ok();
     if (!handshake->is_ready_for_finish()) {
       promise_.set_error(Status::Error(400, "Handshake is not ready"));
     }
+    promise_.set_value(Unit());
   }
 
  public:
diff --git a/tdnet/td/net/Wget.cpp b/tdnet/td/net/Wget.cpp
index 94c7a0c6..9599ad5d 100644
--- a/tdnet/td/net/Wget.cpp
+++ b/tdnet/td/net/Wget.cpp
@@ -131,7 +131,7 @@ void Wget::start_up() {
 }
 
 void Wget::timeout_expired() {
-  on_error(Status::Error("Timeout expired"));
+  on_error(Status::Error("Response timeout expired"));
 }
 
 void Wget::tear_down() {