test: replacing nostr-rs-relay crate with github aciton (#791)

Author: hulxv

.github/workflows/test.yaml

@@ -13,13 +13,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        partition: [1,2,3,4,5,6,7,8,9,10]
+        partition: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
+      - name: Start up Nostr Relay
+        uses: hulxv/[email protected]
+        with:
+          version: "0.9.0"
+          port: "8000"
+          address: "127.0.0.1"
       - name: Install protobuf compiler
         run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
       - name: Cache
         uses: actions/cache@v4
@@ -60,4 +65,4 @@ jobs:
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ./coverage/reports/cobertura-${{ strategy.job-index }}.xml
+          files: ./coverage/reports/cobertura-${{ strategy.job-index }}.xml

Cargo.toml

@@ -41,7 +41,6 @@ crossbeam-channel = "0.5.15"
 [dev-dependencies]
 flate2 = {version = "1.0.35"}
 tar = {version = "0.4.43"}
-nostr-rs-relay = "0.8.12"
 
 #Empty default feature set, (helpful to generalise in github actions)
 [features]

tests/test_framework/mod.rs

@@ -29,19 +29,17 @@ macro_rules! assert_in_range {
 
 use bip39::rand;
 use bitcoin::Amount;
-use nostr_rs_relay::{config, server::start_server};
 use std::{
     env,
     fs::{self, create_dir_all, File},
     io::{BufReader, Read},
-    net::TcpStream,
     path::{Path, PathBuf},
     sync::{
         atomic::{AtomicBool, Ordering::Relaxed},
-        mpsc, Arc, Mutex,
+        Arc, Mutex,
     },
     thread::{self, JoinHandle},
-    time::{Duration, Instant},
+    time::Duration,
 };
 
 use flate2::read::GzDecoder;
@@ -536,8 +534,6 @@ pub struct TestFramework {
     pub(super) bitcoind: BitcoinD,
     pub(super) temp_dir: PathBuf,
     shutdown: AtomicBool,
-    nostr_relay_shutdown: mpsc::Sender<()>,
-    nostr_relay_handle: Option<JoinHandle<()>>,
     block_generation_handle: Mutex<Option<JoinHandle<()>>>,
     makers: Mutex<Option<Vec<Arc<Maker>>>>,
     taproot_makers: Mutex<Option<Vec<Arc<TaprootMaker>>>>, // Added
@@ -576,17 +572,11 @@ impl TestFramework {
 
         let bitcoind = init_bitcoind(&temp_dir, zmq_addr.clone());
 
-        log::info!("🌐 Spawning local nostr relay for tests");
-        let (nostr_relay_shutdown, nostr_relay_handle) = spawn_nostr_relay(&temp_dir);
-        _ = wait_for_relay_healthy();
-
         let shutdown = AtomicBool::new(false);
         let test_framework = Arc::new(Self {
             bitcoind,
             temp_dir: temp_dir.clone(),
             shutdown,
-            nostr_relay_shutdown,
-            nostr_relay_handle: Some(nostr_relay_handle),
             block_generation_handle: Mutex::new(None),
             makers: Mutex::new(None),
             taproot_makers: Mutex::new(None),
@@ -714,16 +704,11 @@ impl TestFramework {
 
         let bitcoind = init_bitcoind(&temp_dir, zmq_addr.clone());
 
-        log::info!("🌐 Spawning local nostr relay for tests");
-        let (nostr_relay_shutdown, nostr_relay_handle) = spawn_nostr_relay(&temp_dir);
-
         let shutdown = AtomicBool::new(false);
         let test_framework = Arc::new(Self {
             bitcoind,
             temp_dir: temp_dir.clone(),
             shutdown,
-            nostr_relay_shutdown,
-            nostr_relay_handle: Some(nostr_relay_handle),
             block_generation_handle: Mutex::new(None),
             makers: Mutex::new(None),
             taproot_makers: Mutex::new(None),
@@ -848,15 +833,6 @@ impl Drop for TestFramework {
         log::info!("Shutting down bitcoind...");
         let _ = self.bitcoind.client.stop().unwrap();
 
-        log::info!("Shutting down nostr relay...");
-        _ = self.nostr_relay_shutdown.send(());
-
-        if let Some(handle) = self.nostr_relay_handle.take() {
-            if let Err(e) = handle.join() {
-                log::error!("Nostr relay thread join failed: {:?}", e);
-            }
-        }
-
         log::info!("Test Framework cleanup complete.");
     }
 }
@@ -873,46 +849,3 @@ impl From<&TestFramework> for RPCConfig {
         }
     }
 }
-
-fn spawn_nostr_relay(temp_dir: &Path) -> (mpsc::Sender<()>, JoinHandle<()>) {
-    let data_dir = temp_dir.join("nostr-relay");
-    std::fs::create_dir_all(&data_dir).unwrap();
-
-    let addr = "127.0.0.1".to_string();
-    let port = 8000;
-
-    let mut settings = config::Settings::default();
-    settings.network.address = addr;
-    settings.network.port = port;
-    settings.database.min_conn = 4;
-    settings.database.max_conn = 8;
-    settings.database.in_memory = true;
-    settings.diagnostics.tracing = true;
-
-    let (shutdown_tx, shutdown_rx) = mpsc::channel::<()>();
-
-    let handle = thread::spawn(move || {
-        start_server(&settings, shutdown_rx).expect("nostr relay crashed");
-    });
-
-    (shutdown_tx, handle)
-}
-
-fn wait_for_relay_healthy() -> Result<(), String> {
-    let addr = "127.0.0.1:8000".to_string();
-    let timeout = Duration::from_secs(10);
-    let start = Instant::now();
-
-    while start.elapsed() < timeout {
-        if TcpStream::connect(&addr).is_ok() {
-            log::info!("Nostr relay is alive");
-            return Ok(());
-        }
-
-        std::thread::sleep(Duration::from_millis(50));
-    }
-
-    log::error!("Nostr relay not alive");
-
-    Err("nostr relay did not become healthy on port 8000".to_string())
-}