Use separate tokio runtime for gossip persistence.

[rapid-gossip-sync-server] / src / tests / mod.rs

diff --git a/src/tests/mod.rs b/src/tests/mod.rs
index dfc7ce466ec7d5c7ce2634650b419125a7813e03..ef25ef0782d947c1e591a1cd348c6b39c1e80fb4 100644 (file)
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -4,7 +4,8 @@ use std::cell::RefCell;
 use std::sync::Arc;
 use std::{fs, thread};
 use std::time::{SystemTime, UNIX_EPOCH};
-use bitcoin::{BlockHash, Network};
+use bitcoin::blockdata::constants::ChainHash;
+use bitcoin::Network;
 use bitcoin::secp256k1::ecdsa::Signature;
 use bitcoin::secp256k1::{Secp256k1, SecretKey};
 use bitcoin::hashes::Hash;
@@ -31,8 +32,8 @@ fn blank_signature() -> Signature {
        Signature::from_compact(&[0u8; 64]).unwrap()
 }
 
-fn genesis_hash() -> BlockHash {
-       bitcoin::blockdata::constants::genesis_block(Network::Bitcoin).block_hash()
+fn genesis_hash() -> ChainHash {
+       ChainHash::using_genesis_block(Network::Bitcoin)
 }
 
 fn current_time() -> u32 {
@@ -172,6 +173,22 @@ async fn clean_test_db() {
        });
 }
 
+#[tokio::test]
+async fn test_persistence_runtime() {
+       let _sanitizer = SchemaSanitizer::new();
+       let logger = Arc::new(TestLogger::new());
+       let network_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
+       let network_graph_arc = Arc::new(network_graph);
+       let (_persister, _receiver) = GossipPersister::new(network_graph_arc.clone(), logger.clone());
+
+       tokio::task::spawn_blocking(move || {
+               drop(_persister);
+       }).await.unwrap();
+
+       clean_test_db().await;
+}
+
+
 #[tokio::test]
 async fn test_trivial_setup() {
        let _sanitizer = SchemaSanitizer::new();
@@ -239,6 +256,10 @@ async fn test_trivial_setup() {
        println!("last update b: {}", last_update_seen_b);
        assert_eq!(last_update_seen_a, update_result - CLIENT_BACKDATE_INTERVAL);
        assert_eq!(last_update_seen_b, update_result - CLIENT_BACKDATE_INTERVAL);
+
+       tokio::task::spawn_blocking(move || {
+               drop(persister);
+       }).await.unwrap();
 }
 
 /// If a channel has only seen updates in one direction, it should not be announced
@@ -302,6 +323,10 @@ async fn test_unidirectional_intermediate_update_consideration() {
        let client_channel_count = channels.len();
        assert_eq!(client_channel_count, 1);
 
+       tokio::task::spawn_blocking(move || {
+               drop(persister);
+       }).await.unwrap();
+
        clean_test_db().await;
 }
 
@@ -356,6 +381,10 @@ async fn test_bidirectional_intermediate_update_consideration() {
        assert_eq!(serialization.update_count_full, 0);
        assert_eq!(serialization.update_count_incremental, 1);
 
+       tokio::task::spawn_blocking(move || {
+               drop(persister);
+       }).await.unwrap();
+
        clean_test_db().await;
 }
 
@@ -398,6 +427,10 @@ async fn test_full_snapshot_recency() {
 
                drop(receiver);
                persister.persist_gossip().await;
+
+               tokio::task::spawn_blocking(move || {
+                       drop(persister);
+               }).await.unwrap();
        }
 
        let client_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
@@ -474,6 +507,10 @@ async fn test_full_snapshot_recency_with_wrong_seen_order() {
 
                drop(receiver);
                persister.persist_gossip().await;
+
+               tokio::task::spawn_blocking(move || {
+                       drop(persister);
+               }).await.unwrap();
        }
 
        let client_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
@@ -549,6 +586,10 @@ async fn test_full_snapshot_recency_with_wrong_propagation_order() {
 
                drop(receiver);
                persister.persist_gossip().await;
+
+               tokio::task::spawn_blocking(move || {
+                       drop(persister);
+               }).await.unwrap();
        }
 
        let client_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
@@ -678,6 +719,10 @@ async fn test_full_snapshot_mutiny_scenario() {
 
                drop(receiver);
                persister.persist_gossip().await;
+
+               tokio::task::spawn_blocking(move || {
+                       drop(persister);
+               }).await.unwrap();
        }
 
        let client_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
@@ -787,6 +832,10 @@ async fn test_full_snapshot_interlaced_channel_timestamps() {
 
                drop(receiver);
                persister.persist_gossip().await;
+
+               tokio::task::spawn_blocking(move || {
+                       drop(persister);
+               }).await.unwrap();
        }
 
        let client_graph = NetworkGraph::new(Network::Bitcoin, logger.clone());
@@ -858,6 +907,10 @@ async fn test_full_snapshot_persistence() {
 
                drop(receiver);
                persister.persist_gossip().await;
+
+               tokio::task::spawn_blocking(move || {
+                       drop(persister);
+               }).await.unwrap();
        }
 
        let cache_path = cache_sanitizer.cache_path();
@@ -899,6 +952,10 @@ async fn test_full_snapshot_persistence() {
 
                drop(receiver);
                persister.persist_gossip().await;
+
+               tokio::task::spawn_blocking(move || {
+                       drop(persister);
+               }).await.unwrap();
        }
 
        // regenerate snapshots