From 89771e2a2c354a4ead5ee160876b4e29e9ba5ab7 Mon Sep 17 00:00:00 2001
From: SpyCheese <mikle98@yandex.ru>
Date: Thu, 6 Oct 2022 13:53:53 +0300
Subject: [PATCH] Generate tlo and other changes after merge

---
 adnl/adnl-peer.cpp                |   2 +-
 overlay/overlay-broadcast.hpp     |   4 ++--
 overlay/overlay-fec-broadcast.hpp |   6 +++---
 rldp/rldp.cpp                     |   2 +-
 tl/generate/scheme/ton_api.tlo    | Bin 69060 -> 73376 bytes
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/adnl/adnl-peer.cpp b/adnl/adnl-peer.cpp
index 1d73b8f6..46a097d9 100644
--- a/adnl/adnl-peer.cpp
+++ b/adnl/adnl-peer.cpp
@@ -621,7 +621,7 @@ void AdnlPeerPairImpl::process_message(const adnlmessage::AdnlMessageQueryError
     return;
   }
 
-  td::actor::send_closure_later(Q->second, &AdnlQuery::reject_query);
+  td::actor::send_closure_later(Q->second, &AdnlQuery::set_error, td::Status::Error("adnl query rejected"));
   out_queries_.erase(Q);
 }
 
diff --git a/overlay/overlay-broadcast.hpp b/overlay/overlay-broadcast.hpp
index 906a94a0..8a5d1324 100644
--- a/overlay/overlay-broadcast.hpp
+++ b/overlay/overlay-broadcast.hpp
@@ -73,9 +73,9 @@ class BroadcastSimple : public td::ListNode {
       , date_(date)
       , signature_(std::move(signature))
       , is_valid_(is_valid)
+      , is_ours_(is_ours)
       , overlay_(overlay)
-      , src_peer_id_(src_peer_id)
-      , is_ours_(is_ours) {
+      , src_peer_id_(src_peer_id) {
   }
 
   Overlay::BroadcastHash get_hash() const {
diff --git a/overlay/overlay-fec-broadcast.hpp b/overlay/overlay-fec-broadcast.hpp
index 7f038b41..c97ad885 100644
--- a/overlay/overlay-fec-broadcast.hpp
+++ b/overlay/overlay-fec-broadcast.hpp
@@ -284,10 +284,10 @@ class OverlayFecBroadcastPart : public td::ListNode {
       , date_(date)
       , signature_(std::move(signature))
       , is_short_(is_short)
+      , is_ours_(is_ours)
       , bcast_(bcast)
-      , overlay_(overlay) 
-      , src_peer_id_(src_peer_id)
-      , is_ours_(is_ours) {
+      , overlay_(overlay)
+      , src_peer_id_(src_peer_id) {
   }
 
   td::uint32 data_size() const {
diff --git a/rldp/rldp.cpp b/rldp/rldp.cpp
index 952a7d69..1834aac3 100644
--- a/rldp/rldp.cpp
+++ b/rldp/rldp.cpp
@@ -238,7 +238,7 @@ void RldpIn::process_message(adnl::AdnlNodeIdShort source, adnl::AdnlNodeIdShort
                              ton_api::rldp_queryError &message) {
   auto it = queries_.find(message.query_id_);
   if (it != queries_.end()) {
-    td::actor::send_closure(it->second, &adnl::AdnlQuery::reject_query);
+    td::actor::send_closure(it->second, &adnl::AdnlQuery::set_error, td::Status::Error("adnl query rejected"));
     queries_.erase(it);
   } else {
     VLOG(RLDP_INFO) << "received reject to unknown query " << message.query_id_;
diff --git a/tl/generate/scheme/ton_api.tlo b/tl/generate/scheme/ton_api.tlo
index d89402883f7b46eb1700a121d1d38ff367ee2df2..d535668aa423585bb2be3319dbf46d3f4f610efc 100644
GIT binary patch
delta 3357
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

delta 1033
zcmaKrQAiVU9LN3No$GWH*Km01NU0NNtn-3EiRCsGESkB8Js3#rbk{sMZfkdCJ_KnI
zQwof~P@sjT^dvF)EAzo>hFFl84+RB1NG}CRR4Dln)c$vy2%`U|Kflla`~Cm^zx&?!
zb82anD*7^7cRDY-R%VJyNqfTo;;TgnD>Bz6s;UqXGnBsXD@6e^O`!lipKrIl9yo3Z
zcX6sFXd-uB?8_WEgpXK?tt2{Ya}d;2*{fC5Q{txJ2J;d5%Vj`qr|;2lp(2F*j#&b_
zD|x&2`Ek$^m&37LSCOc{@*h!_4!zte(W1(QXjtT$g_zJK$&x0CDx4^&K(j}K0D9Rs
z=u~wH1)9*g+Io8dZv4}-%}>CS^_7sHqhYeKio#X+zR|UVNgW3U^5F?jtAVe3SYtEp
z;j;n{%jEp<bmGk>7k%c=qV8t(vO8`73QvzgFHajfc^4w!BVP?ndz}W_*n_;jEL!tr
z@89-~=!em8QyLhuV2j%*jkK)Wkle9Q&fxLmhwg3+*PvH*?GJCO&i&!iK}uTV_g4nA
z18j#6fGE*RnGtoX(^QSaQYtDDNfEhgf-HpvEgI*#qsnC|f*F3S8UEUG!I{B#Xnu$W
zkRPlvGREFbm{G&Sn*g~-gQi*>GA5H0v0IizMa!CS5jol=$eDp*ZiHm<VjcW8VTCIl
zP9vJ3Cu3-7(oqaqG)>`X!ekQzL#@^aYbL<f;tHNPULTGWc1mr1Lxp;HuUr-5eR-H;
zXG;I<vDw%j1=;y`(yS{4MeP;iIfW4ve$J`iist8B)&iV=qtE_lHE?X1g;f$w;VSyM
zyiTI&w+R9zS63Y161wrdoj_|pk_4iEXMR!FAI*~5B*D~SCg*~C&P5p4Qk!-#3{njY
H=rR2Vt^$ip