Remove network lock (#840)

* Initial work on removing libp2p lock

* Removes lock from libp2p service

* Completed network lock removal

* Correct network termination future

* Correct fmt issues

* Remove Drop implementation for network service

* Address reviewers suggestions

* Fix dht persistence test (#844)

* Fix persistence test

* Block until dht is persisted

* Fix libp2p test

* Correct test ordering check

* Remove expensive tests from debug testing

Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com>

beacon_node/network/src/persisted_dht.rs

@@ -1,11 +1,37 @@
+use beacon_chain::BeaconChainTypes;
 use eth2_libp2p::Enr;
 use rlp;
+use std::sync::Arc;
+use store::Store;
 use store::{DBColumn, Error as StoreError, SimpleStoreItem};
+use types::Hash256;
 
 /// 32-byte key for accessing the `DhtEnrs`.
 pub const DHT_DB_KEY: &str = "PERSISTEDDHTPERSISTEDDHTPERSISTE";
 
-/// Wrapper around dht for persistence to disk.
+pub fn load_dht<T: BeaconChainTypes>(store: Arc<T::Store>) -> Vec<Enr> {
+    // Load DHT from store
+    let key = Hash256::from_slice(&DHT_DB_KEY.as_bytes());
+    match store.get(&key) {
+        Ok(Some(p)) => {
+            let p: PersistedDht = p;
+            p.enrs
+        }
+        _ => Vec::new(),
+    }
+}
+
+/// Attempt to persist the ENR's in the DHT to `self.store`.
+pub fn persist_dht<T: BeaconChainTypes>(
+    store: Arc<T::Store>,
+    enrs: Vec<Enr>,
+) -> Result<(), store::Error> {
+    let key = Hash256::from_slice(&DHT_DB_KEY.as_bytes());
+    store.put(&key, &PersistedDht { enrs })?;
+    Ok(())
+}
+
+/// Wrapper around DHT for persistence to disk.
 pub struct PersistedDht {
     pub enrs: Vec<Enr>,
 }