Generate tlo and other changes after merge

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);
 }
 

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 {

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 {

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_;