Skip to content

Commit eedfb12

Browse files
committed
Fix and run all tests under cfg(vss_test)
.. we previously avoided running some tests which turned out to be broken.
1 parent db79781 commit eedfb12

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/vss-integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ jobs:
4444
run: |
4545
cd ldk-node
4646
export TEST_VSS_BASE_URL="http://localhost:8080/vss"
47+
RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
4748
RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

src/io/vss_store.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -598,38 +598,40 @@ mod tests {
598598

599599
use rand::distributions::Alphanumeric;
600600
use rand::{thread_rng, Rng, RngCore};
601-
use tokio::runtime;
602601
use vss_client::headers::FixedHeaders;
603602

604603
use super::*;
605604
use crate::io::test_utils::do_read_write_remove_list_persist;
605+
use crate::logger::Logger;
606606

607607
#[test]
608608
fn vss_read_write_remove_list_persist() {
609-
let runtime = Arc::new(Runtime::new().unwrap());
610609
let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
611610
let mut rng = thread_rng();
612611
let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
613612
let mut vss_seed = [0u8; 32];
614613
rng.fill_bytes(&mut vss_seed);
615614
let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
615+
let logger = Arc::new(Logger::new_log_facade());
616+
let runtime = Arc::new(Runtime::new(logger).unwrap());
616617
let vss_store =
617-
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();
618+
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime);
618619

619620
do_read_write_remove_list_persist(&vss_store);
620621
}
621622

622623
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
623624
async fn vss_read_write_remove_list_persist_in_runtime_context() {
624-
let runtime = Arc::new(Runtime::new().unwrap());
625625
let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
626626
let mut rng = thread_rng();
627627
let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
628628
let mut vss_seed = [0u8; 32];
629629
rng.fill_bytes(&mut vss_seed);
630630
let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
631+
let logger = Arc::new(Logger::new_log_facade());
632+
let runtime = Arc::new(Runtime::new(logger).unwrap());
631633
let vss_store =
632-
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();
634+
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime);
633635

634636
do_read_write_remove_list_persist(&vss_store);
635637
drop(vss_store)

0 commit comments

Comments
 (0)