Skip to content

Commit 4622fb1

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 f97766c commit 4622fb1

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

605605
use rand::distributions::Alphanumeric;
606606
use rand::{thread_rng, Rng, RngCore};
607-
use tokio::runtime;
608607
use vss_client::headers::FixedHeaders;
609608

610609
use super::*;
611610
use crate::io::test_utils::do_read_write_remove_list_persist;
611+
use crate::logger::Logger;
612612

613613
#[test]
614614
fn vss_read_write_remove_list_persist() {
615-
let runtime = Arc::new(Runtime::new().unwrap());
616615
let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
617616
let mut rng = thread_rng();
618617
let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
619618
let mut vss_seed = [0u8; 32];
620619
rng.fill_bytes(&mut vss_seed);
621620
let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
621+
let logger = Arc::new(Logger::new_log_facade());
622+
let runtime = Arc::new(Runtime::new(logger).unwrap());
622623
let vss_store =
623-
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();
624+
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime);
624625

625626
do_read_write_remove_list_persist(&vss_store);
626627
}
627628

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

640642
do_read_write_remove_list_persist(&vss_store);
641643
drop(vss_store)

0 commit comments

Comments
 (0)