Prepare to use rldp2 in validator group

Author: SpyCheese

validator/manager.cpp

@@ -2633,8 +2633,8 @@ td::actor::ActorOwn<ValidatorGroup> ValidatorManagerImpl::create_validator_group
         descr->addr.is_zero() ? ValidatorFullId{descr->key}.compute_short_id().bits256_value() : descr->addr};
     auto G = td::actor::create_actor<ValidatorGroup>(
         PSTRING() << "valgroup" << shard.to_str(), shard, validator_id, session_id, validator_set, key_seqno, opts,
-        keyring_, adnl_, rldp_, overlays_, db_root_, actor_id(this), get_collation_manager(adnl_id), init_session,
-        opts_->check_unsafe_resync_allowed(validator_set->get_catchain_seqno()), opts_,
+        keyring_, adnl_, rldp_, rldp2_, overlays_, db_root_, actor_id(this), get_collation_manager(adnl_id),
+        init_session, opts_->check_unsafe_resync_allowed(validator_set->get_catchain_seqno()), opts_,
         opts_->need_monitor(shard, last_masterchain_state_));
     return G;
   }

validator/validator-group.cpp

@@ -409,6 +409,7 @@ void ValidatorGroup::create_session() {
   }
 
   td::actor::send_closure(rldp_, &rldp::Rldp::add_id, local_adnl_id_);
+  td::actor::send_closure(rldp2_, &rldp2::Rldp::add_id, local_adnl_id_);
 }
 
 void ValidatorGroup::start(std::vector<BlockIdExt> prev, BlockIdExt min_masterchain_block_id) {

validator/validator-group.hpp

@@ -24,6 +24,7 @@
 #include "validator-session/validator-session.h"
 
 #include "rldp/rldp.h"
+#include "rldp2/rldp.h"
 
 #include <list>
 
@@ -77,8 +78,8 @@ class ValidatorGroup : public td::actor::Actor {
                  td::Ref<ValidatorSet> validator_set, BlockSeqno last_key_block_seqno,
                  validatorsession::ValidatorSessionOptions config, td::actor::ActorId<keyring::Keyring> keyring,
                  td::actor::ActorId<adnl::Adnl> adnl, td::actor::ActorId<rldp::Rldp> rldp,
-                 td::actor::ActorId<overlay::Overlays> overlays, std::string db_root,
-                 td::actor::ActorId<ValidatorManager> validator_manager,
+                 td::actor::ActorId<rldp2::Rldp> rldp2, td::actor::ActorId<overlay::Overlays> overlays,
+                 std::string db_root, td::actor::ActorId<ValidatorManager> validator_manager,
                  td::actor::ActorId<CollationManager> collation_manager, bool create_session,
                  bool allow_unsafe_self_blocks_resync, td::Ref<ValidatorManagerOptions> opts, bool monitoring_shard)
       : shard_(shard)
@@ -90,6 +91,7 @@ class ValidatorGroup : public td::actor::Actor {
       , keyring_(keyring)
       , adnl_(adnl)
       , rldp_(rldp)
+      , rldp2_(rldp2)
       , overlays_(overlays)
       , db_root_(std::move(db_root))
       , manager_(validator_manager)
@@ -131,6 +133,7 @@ class ValidatorGroup : public td::actor::Actor {
   td::actor::ActorId<keyring::Keyring> keyring_;
   td::actor::ActorId<adnl::Adnl> adnl_;
   td::actor::ActorId<rldp::Rldp> rldp_;
+  td::actor::ActorId<rldp2::Rldp> rldp2_;
   td::actor::ActorId<overlay::Overlays> overlays_;
   std::string db_root_;
   td::actor::ActorId<ValidatorManager> manager_;