Skip to content

Commit 8cad63b

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 e01ea05 commit 8cad63b

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
@@ -606,38 +606,40 @@ mod tests {
606606

607607
use rand::distributions::Alphanumeric;
608608
use rand::{thread_rng, Rng, RngCore};
609-
use tokio::runtime;
610609
use vss_client::headers::FixedHeaders;
611610

612611
use super::*;
613612
use crate::io::test_utils::do_read_write_remove_list_persist;
613+
use crate::logger::Logger;
614614

615615
#[test]
616616
fn vss_read_write_remove_list_persist() {
617-
let runtime = Arc::new(Runtime::new().unwrap());
618617
let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
619618
let mut rng = thread_rng();
620619
let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
621620
let mut vss_seed = [0u8; 32];
622621
rng.fill_bytes(&mut vss_seed);
623622
let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
623+
let logger = Arc::new(Logger::new_log_facade());
624+
let runtime = Arc::new(Runtime::new(logger).unwrap());
624625
let vss_store =
625-
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();
626+
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime);
626627

627628
do_read_write_remove_list_persist(&vss_store);
628629
}
629630

630631
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
631632
async fn vss_read_write_remove_list_persist_in_runtime_context() {
632-
let runtime = Arc::new(Runtime::new().unwrap());
633633
let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
634634
let mut rng = thread_rng();
635635
let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
636636
let mut vss_seed = [0u8; 32];
637637
rng.fill_bytes(&mut vss_seed);
638638
let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
639+
let logger = Arc::new(Logger::new_log_facade());
640+
let runtime = Arc::new(Runtime::new(logger).unwrap());
639641
let vss_store =
640-
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();
642+
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime);
641643

642644
do_read_write_remove_list_persist(&vss_store);
643645
drop(vss_store)

0 commit comments

Comments
 (0)