wip on adapting to bootstrap contact changes

Author: chandraprakash

include/maidsafe/client.h

@@ -37,14 +37,14 @@
 #include "maidsafe/passport/passport.h"
 #include "maidsafe/passport/types.h"
 
+#include "maidsafe/routing/bootstrap_file_operations.h"
+
 namespace maidsafe {
 
 namespace test { class ClientTest_FUNC_RegisterVault_Test; }
 
 namespace detail { class ClientImpl; }
 
-typedef std::vector<std::pair<boost::asio::ip::udp::endpoint, asymm::PublicKey>> BootstrapInfo;
-
 class Client {
  public:
   typedef boost::future<void> RegisterVaultFuture, UnregisterVaultFuture;
@@ -56,10 +56,11 @@ class Client {
   typedef boost::signals2::signal<void(int32_t)> OnNetworkHealthChange;
 
   // For already existing accounts.
-  Client(const passport::Maid& maid, const BootstrapInfo& bootstrap_info);
+  Client(const passport::Maid& maid, const routing::BootstrapContacts& bootstrap_contacts);
 
   // For new accounts.  Throws on failure to create account.
-  Client(const passport::MaidAndSigner& maid_and_signer, const BootstrapInfo& bootstrap_info);
+  Client(const passport::MaidAndSigner& maid_and_signer,
+         const routing::BootstrapContacts& bootstrap_contacts);
 
   ~Client();
 

include/maidsafe/detail/session_getter.h

@@ -36,13 +36,13 @@
 
 namespace maidsafe {
 
-typedef std::vector<std::pair<boost::asio::ip::udp::endpoint, asymm::PublicKey>> BootstrapInfo;
+//typedef std::vector<std::pair<boost::asio::ip::udp::endpoint, asymm::PublicKey>> BootstrapInfo;
 
 namespace detail {
 
 class SessionGetter {
  public:
-  explicit SessionGetter(const BootstrapInfo& bootstrap_info);
+  explicit SessionGetter(const BootstrapContacts& bootstrap_contacts);
   nfs_client::DataGetter& data_getter() { return *data_getter_; }
 
  private:

src/maidsafe/client.cc

@@ -21,8 +21,8 @@
 
 namespace maidsafe {
 
-Client::Client(const passport::Maid& maid, const BootstrapInfo& bootstrap_info)
-    : pimpl_(new detail::ClientImpl(maid, bootstrap_info)) {}
+Client::Client(const passport::Maid& maid, const routing::BootstrapContacts& bootstrap_contacts)
+    : pimpl_(new detail::ClientImpl(maid, bootstrap_contacts)) {}
 
 Client::Client(const passport::MaidAndSigner& maid_and_signer, const BootstrapInfo& bootstrap_info)
     : pimpl_(new detail::ClientImpl(maid_and_signer, bootstrap_info)) {}

src/maidsafe/detail/client_impl.cc

@@ -184,8 +184,8 @@ routing::Functors ClientImpl::InitialiseRoutingCallbacks() {
       [this](const routing::GroupToSingleMessage& /*message*/) {};
   functors.typed_message_and_caching.group_to_group.put_cache_data =
       [this](const routing::GroupToGroupMessage& /*message*/) {};
-  functors.new_bootstrap_endpoint =
-      [this](const boost::asio::ip::udp::endpoint& /*endpoint*/) {};
+  functors.new_bootstrap_contact =
+      [this](const routing::BootstrapContact& /*bootstrap_contact*/) {};
 
   return functors;
 }

src/maidsafe/detail/session_getter.cc

@@ -24,7 +24,7 @@ namespace maidsafe {
 
 namespace detail {
 
-SessionGetter::SessionGetter(const BootstrapInfo& bootstrap_info)
+SessionGetter::SessionGetter(const routing::BootstrapContacts& bootstrap_contacts)
     : network_health_mutex_(),
       network_health_condition_variable_(),
       network_health_(-1),
@@ -34,16 +34,12 @@ SessionGetter::SessionGetter(const BootstrapInfo& bootstrap_info)
       asio_service_(2) {
   data_getter_ = maidsafe::make_unique<nfs_client::DataGetter>(asio_service_, routing_);
   // FIXME need to update routing to get bootstrap endpoints along with public keys
-  InitRouting(bootstrap_info);
+  InitRouting(bootstrap_contacts);
 }
 
-void SessionGetter::InitRouting(const BootstrapInfo& bootstrap_info) {
+void SessionGetter::InitRouting(const routing::BootstrapContacts& bootstrap_contacts) {
   routing::Functors functors{ InitialiseRoutingCallbacks() };
-  // BEFORE_RELEASE temp work around, need to update routing/rudp to take bootstrap_info
-  std::vector<boost::asio::ip::udp::endpoint> peer_endpoints;
-  for (const auto& i : bootstrap_info)
-    peer_endpoints.push_back(i.first);
-  routing_.Join(functors, peer_endpoints);
+  routing_.Join(functors, bootstrap_contacts);
   // FIXME BEFORE_RELEASE discuss this
   std::unique_lock<std::mutex> lock{ network_health_mutex_ };
   network_health_condition_variable_.wait(lock, [this] { return network_health_ == 100; });