Skip to content

Commit 27e91a3

Browse files
Updated ton submodule
1 parent c6f1550 commit 27e91a3

6 files changed

Lines changed: 12 additions & 16 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ endif()
2828
if (TON_HTTP_API_CPP)
2929
# userver config
3030
set(USERVER_FEATURE_REDIS TRUE)
31-
set(USERVER_FEATURE_UBOOST_CORO TRUE)
3231
set(USERVER_FEATURE_CHAOTIC TRUE)
3332
set(USERVER_FEATURE_CHAOTIC_EXPERIMENAL TRUE)
3433
set(USERVER_FEATURE_UTEST FALSE)

external/ton

Submodule ton updated 181 files

ton-http-api/src/core/tonlib_worker.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class TonlibWorker {
269269
return std::move(result);
270270
}
271271
auto error = result.move_as_error();
272-
LOG(ERROR) << "RESULT ERROR: " << error;
272+
// LOG(ERROR) << "RESULT ERROR: " << error;
273273
if (request.parameters.archival.has_value() && request.parameters.archival.value()) {
274274
return std::move(error);
275275
}
@@ -284,9 +284,9 @@ class TonlibWorker {
284284
auto result_archival = tonlib_.send_request_function<T, userver::engine::Promise>(request);
285285
if (result_archival.is_error()) {
286286
auto error_archival = result_archival.move_as_error();
287-
LOG(ERROR) << "RESULT ERROR ARCHIVAL: " << error_archival;
288-
LOG(WARNING)
289-
<< "Failed archival retry of tonlib request: " << error_archival.code() << " " << error_archival.message();
287+
// LOG(ERROR) << "RESULT ERROR ARCHIVAL: " << error_archival;
288+
// LOG(WARNING)
289+
// << "Failed archival retry of tonlib request: " << error_archival.code() << " " << error_archival.message();
290290
if (error_archival.code() == 542) {
291291
return std::move(error);
292292
}

ton-http-api/src/core/tonlib_worker_blocks.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ td::Result<tonlib_api::blocks_lookupBlock::ReturnType> TonlibWorker::lookupBlock
4646
lookupMode += 4;
4747
}
4848

49-
LOG(ERROR)
50-
<< "lookupBlock with mode: " << lookupMode << ", workchain: " << workchain << ", shard: " << shard
51-
<< ", seqno: " << seqno.value_or(0) << ", lt: " << lt.value_or(0) << ", unixtime: " << unixtime.value_or(0);
5249
// try non-archival
5350
auto request = multiclient::RequestFunction<tonlib_api::blocks_lookupBlock>{
5451
.parameters = {.mode = multiclient::RequestMode::Single},

tonlib-multiclient/multi_client.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ MultiClient::MultiClient(MultiClientConfig config, std::unique_ptr<ResponseCallb
1313
scheduler_(
1414
std::make_shared<td::actor::Scheduler>(std::vector<td::actor::Scheduler::NodeInfo>{config.scheduler_threads})
1515
) {
16-
scheduler_->run_in_context_external([this, cb = std::move(callback)]() mutable {
16+
scheduler_->run_in_context([this, cb = std::move(callback)]() mutable {
1717
client_ = td::actor::create_actor<MultiClientActor>(
1818
"multiclient",
1919
MultiClientActorConfig{
@@ -39,15 +39,15 @@ td::Result<std::string> MultiClient::send_request_json(RequestJson req) const {
3939
auto promise =
4040
td::Promise<std::string>([p = std::move(request_promise)](auto result) mutable { p.set_value(std::move(result)); });
4141

42-
scheduler_->run_in_context_external([this, p = std::move(promise), req = std::move(req)]() mutable {
42+
scheduler_->run_in_context([this, p = std::move(promise), req = std::move(req)]() mutable {
4343
td::actor::send_closure(client_.get(), &MultiClientActor::send_request_json, std::move(req), std::move(p));
4444
});
4545

4646
return request_future.get();
4747
}
4848

4949
void MultiClient::send_callback_request(RequestCallback req) const {
50-
scheduler_->run_in_context_external([this, req = std::move(req)]() mutable {
50+
scheduler_->run_in_context([this, req = std::move(req)]() mutable {
5151
td::actor::send_closure(client_.get(), &MultiClientActor::send_callback_request, std::move(req));
5252
});
5353
}
@@ -59,7 +59,7 @@ td::Result<std::int32_t> MultiClient::get_consensus_block() const {
5959
p.set_value(std::move(result));
6060
});
6161

62-
scheduler_->run_in_context_external([this, p = std::move(promise)]() mutable {
62+
scheduler_->run_in_context([this, p = std::move(promise)]() mutable {
6363
td::actor::send_closure(client_.get(), &MultiClientActor::get_consensus_block, std::move(p));
6464
});
6565

@@ -72,7 +72,7 @@ td::Result<SessionPtr> MultiClient::get_session(const RequestParameters& params,
7272
auto promise =
7373
td::Promise<SessionPtr>([p = std::move(request_promise)](auto result) mutable { p.set_value(std::move(result)); });
7474

75-
scheduler_->run_in_context_external([this, params, session, p = std::move(promise)]() mutable {
75+
scheduler_->run_in_context([this, params, session, p = std::move(promise)]() mutable {
7676
td::actor::send_closure(client_.get(), &MultiClientActor::get_session, params, std::move(session), std::move(p));
7777
});
7878

tonlib-multiclient/multi_client.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ td::Result<typename T::ReturnType> MultiClient::send_request(Request<T> req) con
6161
auto promise =
6262
td::Promise<ReturnType>([p = std::move(request_promise)](auto result) mutable { p.set_value(std::move(result)); });
6363

64-
scheduler_->run_in_context_external([this, p = std::move(promise), req = std::move(req)]() mutable {
64+
scheduler_->run_in_context([this, p = std::move(promise), req = std::move(req)]() mutable {
6565
td::actor::send_closure(client_.get(), &MultiClientActor::send_request<T>, std::move(req), std::move(p));
6666
});
6767

@@ -78,7 +78,7 @@ td::Result<typename T::ReturnType> MultiClient::send_request_function(RequestFun
7878
auto promise =
7979
td::Promise<ReturnType>([p = std::move(request_promise)](auto result) mutable { p.set_value(std::move(result)); });
8080

81-
scheduler_->run_in_context_external([this, p = std::move(promise), req = std::move(req)]() mutable {
81+
scheduler_->run_in_context([this, p = std::move(promise), req = std::move(req)]() mutable {
8282
td::actor::send_closure(client_.get(), &MultiClientActor::send_request_function<T>, std::move(req), std::move(p));
8383
});
8484

0 commit comments

Comments
 (0)