Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Sync signet
run: cargo test --verbose test_signet_syncs
run: cargo test --verbose signet_syncs
bitcoind:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Integration test
run: cargo test -- --test-threads 1 --skip test_signet_syncs --nocapture
run: cargo test -- --test-threads 1 --skip signet_syncs --nocapture
6 changes: 3 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ test:
cargo test --doc

sync:
cargo test test_signet_syncs -- --nocapture
cargo test signet_syncs -- --nocapture

integrate:
cargo test -- --test-threads 1 --nocapture --skip test_signet_syncs
cargo test -- --test-threads 1 --nocapture --skip signet_syncs

example:
cargo run --example signet --release
Expand All @@ -32,5 +32,5 @@ all:
cargo clippy --all-targets
cargo test --lib
cargo test --doc
cargo test -- --test-threads 1 --nocapture --skip test_signet_syncs
cargo test -- --test-threads 1 --nocapture --skip signet_syncs
cargo run --example signet
16 changes: 8 additions & 8 deletions tests/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ async fn print_logs(mut log_rx: Receiver<Log>, mut warn_rx: UnboundedReceiver<Wa
}

#[tokio::test]
async fn test_reorg() {
async fn live_reorg() {
let rpc_result = start_bitcoind(false);
// If we can't fetch the genesis block then bitcoind is not running. Just exit.
if rpc_result.is_err() {
Expand Down Expand Up @@ -198,7 +198,7 @@ async fn test_reorg() {
}

#[tokio::test]
async fn test_mine_after_reorg() {
async fn live_reorg_additional_sync() {
let rpc_result = start_bitcoind(false);
// If we can't fetch the genesis block then bitcoind is not running. Just exit.
if rpc_result.is_err() {
Expand Down Expand Up @@ -256,7 +256,7 @@ async fn test_mine_after_reorg() {
}

#[tokio::test]
async fn test_various_client_methods() {
async fn various_client_methods() {
let rpc_result = start_bitcoind(false);
// If we can't fetch the genesis block then bitcoind is not running. Just exit.
if rpc_result.is_err() {
Expand Down Expand Up @@ -294,7 +294,7 @@ async fn test_various_client_methods() {
}

#[tokio::test]
async fn test_sql_reorg() {
async fn stop_reorg_resync() {
let rpc_result = start_bitcoind(true);
// If we can't fetch the genesis block then bitcoind is not running. Just exit.
if rpc_result.is_err() {
Expand Down Expand Up @@ -378,7 +378,7 @@ async fn test_sql_reorg() {
}

#[tokio::test]
async fn test_two_deep_reorg() {
async fn stop_reorg_two_resync() {
let rpc_result = start_bitcoind(true);
// If we can't fetch the genesis block then bitcoind is not running. Just exit.
if rpc_result.is_err() {
Expand Down Expand Up @@ -462,7 +462,7 @@ async fn test_two_deep_reorg() {
}

#[tokio::test]
async fn test_sql_stale_anchor() {
async fn stop_reorg_start_on_orphan() {
let rpc_result = start_bitcoind(true);
// If we can't fetch the genesis block then bitcoind is not running. Just exit.
if rpc_result.is_err() {
Expand Down Expand Up @@ -580,7 +580,7 @@ async fn test_sql_stale_anchor() {

#[tokio::test]
#[allow(clippy::collapsible_match)]
async fn test_halting_works() {
async fn halting_download_works() {
let rpc_result = start_bitcoind(true);
// If we can't fetch the genesis block then bitcoind is not running. Just exit.
if rpc_result.is_err() {
Expand Down Expand Up @@ -639,7 +639,7 @@ async fn test_halting_works() {
}

#[tokio::test]
async fn test_signet_syncs() {
async fn signet_syncs() {
let address = bitcoin::Address::from_str("tb1q9pvjqz5u5sdgpatg3wn0ce438u5cyv85lly0pc")
.unwrap()
.require_network(bitcoin::Network::Signet)
Expand Down