tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve testNetwork implementation.

Browse Source
This commit is contained in:
levlam 2021-10-02 16:54:01 +03:00
parent d1532ef1f8
commit 0455b313b3
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
td/telegram/Td.cpp
View File

@ -470,9 +470,11 @@ class SaveAppLogQuery final : public Td::ResultHandler {
} }
}; };
class TestQuery final : public Td::ResultHandler { class TestNetworkQuery final : public Td::ResultHandler {
Promise<Unit> promise_;
public: public:
explicit TestQuery(uint64 request_id) : request_id_(request_id) { explicit TestNetworkQuery(Promise<Unit> &&promise) : promise_(std::move(promise)) {
} }
void send() { void send() {
@ -485,17 +487,14 @@ class TestQuery final : public Td::ResultHandler {
return on_error(id, Status::Error(500, "Fetch failed")); return on_error(id, Status::Error(500, "Fetch failed"));
} }
LOG(DEBUG) << "TestOK: " << to_string(result_ptr.ok()); LOG(DEBUG) << "TestNetwork OK: " << to_string(result_ptr.ok());
send_closure(G()->td(), &Td::send_result, request_id_, make_tl_object<td_api::ok>()); promise_.set_value(Unit());
} }
void on_error(uint64 id, Status status) final { void on_error(uint64 id, Status status) final {
status.ignore();
LOG(ERROR) << "Test query failed: " << status; LOG(ERROR) << "Test query failed: " << status;
promise_.set_error(std::move(status));
} }
private:
uint64 request_id_;
}; };
class TestProxyRequest final : public RequestOnceActor { class TestProxyRequest final : public RequestOnceActor {
@ -8426,7 +8425,8 @@ td_api::object_ptr<td_api::Object> Td::do_static_request(td_api::testReturnError
// test // test
void Td::on_request(uint64 id, const td_api::testNetwork &request) { void Td::on_request(uint64 id, const td_api::testNetwork &request) {
create_handler<TestQuery>(id)->send(); CREATE_OK_REQUEST_PROMISE();
create_handler<TestNetworkQuery>(std::move(promise))->send();
} }
void Td::on_request(uint64 id, td_api::testProxy &request) { void Td::on_request(uint64 id, td_api::testProxy &request) {

1
td/telegram/Td.h
View File

@ -332,7 +332,6 @@ class Td final : public Actor {
template <class T> template <class T>
friend class RequestActor; // uses send_result/send_error friend class RequestActor; // uses send_result/send_error
friend class TestQuery; // uses send_result/send_error, TODO pass Promise<>
friend class AuthManager; // uses send_result/send_error, TODO pass Promise<> friend class AuthManager; // uses send_result/send_error, TODO pass Promise<>
friend class PhoneNumberManager; // uses send_result/send_error, TODO pass Promise<> friend class PhoneNumberManager; // uses send_result/send_error, TODO pass Promise<>