Skip to content

Remove test-helper warnings #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benthecarman wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −34
Open

Remove test-helper warnings #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 9 additions & 18 deletions tests/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ use in_memory_store::InMemoryStore;
/// Shared timeout (in seconds) for waiting on LDK events and external node operations.
pub(crate) const INTEROP_TIMEOUT_SECS: u64 = 60;

#[macro_export]
macro_rules! expect_event {
($node:expr, $event_type:ident) => {{
let event = tokio::time::timeout(
Expand All @@ -92,8 +93,7 @@ macro_rules! expect_event {
}};
}

pub(crate) use expect_event;

#[macro_export]
macro_rules! expect_channel_pending_event {
($node:expr, $counterparty_node_id:expr) => {{
let event = tokio::time::timeout(
Expand All @@ -118,8 +118,7 @@ macro_rules! expect_channel_pending_event {
}};
}

pub(crate) use expect_channel_pending_event;

#[macro_export]
macro_rules! expect_channel_ready_event {
($node:expr, $counterparty_node_id:expr) => {{
let event = tokio::time::timeout(
Expand All @@ -144,8 +143,7 @@ macro_rules! expect_channel_ready_event {
}};
}

pub(crate) use expect_channel_ready_event;

#[macro_export]
macro_rules! expect_channel_ready_events {
($node:expr, $counterparty_node_id_a:expr, $counterparty_node_id_b:expr) => {{
let mut ids = Vec::new();
Expand Down Expand Up @@ -180,8 +178,7 @@ macro_rules! expect_channel_ready_events {
}};
}

pub(crate) use expect_channel_ready_events;

#[macro_export]
macro_rules! expect_splice_negotiated_event {
($node:expr, $counterparty_node_id:expr) => {{
let event = tokio::time::timeout(
Expand All @@ -206,8 +203,7 @@ macro_rules! expect_splice_negotiated_event {
}};
}

pub(crate) use expect_splice_negotiated_event;

#[macro_export]
macro_rules! expect_payment_received_event {
($node:expr, $amount_msat:expr) => {{
let event = tokio::time::timeout(
Expand Down Expand Up @@ -236,8 +232,7 @@ macro_rules! expect_payment_received_event {
}};
}

pub(crate) use expect_payment_received_event;

#[macro_export]
macro_rules! expect_payment_claimable_event {
($node:expr, $payment_id:expr, $payment_hash:expr, $claimable_amount_msat:expr) => {{
let event = tokio::time::timeout(
Expand Down Expand Up @@ -272,8 +267,7 @@ macro_rules! expect_payment_claimable_event {
}};
}

pub(crate) use expect_payment_claimable_event;

#[macro_export]
macro_rules! expect_payment_successful_event {
($node:expr, $payment_id:expr, $fee_paid_msat:expr) => {{
let event = tokio::time::timeout(
Expand Down Expand Up @@ -302,8 +296,6 @@ macro_rules! expect_payment_successful_event {
}};
}

pub(crate) use expect_payment_successful_event;

pub(crate) fn setup_bitcoind_and_electrsd() -> (BitcoinD, ElectrsD) {
let bitcoind_exe =
env::var("BITCOIND_EXE").ok().or_else(|| corepc_node::downloaded_exe_path().ok()).expect(
Expand Down Expand Up @@ -465,6 +457,7 @@ impl Default for TestConfig {
}
}

#[macro_export]
macro_rules! setup_builder {
($builder:ident, $config:expr) => {
#[cfg(feature = "uniffi")]
Expand All @@ -474,8 +467,6 @@ macro_rules! setup_builder {
};
}

pub(crate) use setup_builder;

#[cfg(any(cln_test, lnd_test, eclair_test))]
pub(crate) mod scenarios;

Expand Down
5 changes: 2 additions & 3 deletions tests/integration_tests_hrn.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ mod common;

use bitcoin::Amount;
use common::{
expect_channel_ready_event, expect_payment_successful_event, generate_blocks_and_wait,
open_channel, premine_and_distribute_funds, random_chain_source, setup_bitcoind_and_electrsd,
setup_two_nodes, TestChainSource,
generate_blocks_and_wait, open_channel, premine_and_distribute_funds, random_chain_source,
setup_bitcoind_and_electrsd, setup_two_nodes, TestChainSource,
};
use ldk_node::payment::UnifiedPaymentResult;
use ldk_node::Event;
Expand Down
5 changes: 1 addition & 4 deletions tests/integration_tests_migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ mod common;

use std::path::PathBuf;

use common::{
drop_table, expect_channel_ready_event, expect_payment_received_event,
expect_payment_successful_event, test_connection_string,
};
use common::{drop_table, test_connection_string};
use ldk_node::entropy::NodeEntropy;
use ldk_node::io::postgres_store::PostgresStore;
use ldk_node::io::sqlite_store::{SqliteStore, KV_TABLE_NAME, SQLITE_DB_FILE_NAME};
Expand Down
9 changes: 3 additions & 6 deletions tests/integration_tests_rust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@ use bitcoin::{Address, Amount, ScriptBuf, Txid};
use common::logging::{init_log_logger, validate_log_entry, MultiNodeLogger, TestLogWriter};
use common::{
bump_fee_and_broadcast, distribute_funds_unconfirmed, do_channel_full_cycle,
expect_channel_pending_event, expect_channel_ready_event, expect_channel_ready_events,
expect_event, expect_payment_claimable_event, expect_payment_received_event,
expect_payment_successful_event, expect_splice_negotiated_event, generate_blocks_and_wait,
generate_listening_addresses, invalidate_blocks, open_channel, open_channel_push_amt,
open_channel_with_all, premine_and_distribute_funds, premine_blocks, prepare_rbf,
random_chain_source, random_config, setup_bitcoind_and_electrsd, setup_builder, setup_node,
generate_blocks_and_wait, generate_listening_addresses, invalidate_blocks, open_channel,
open_channel_push_amt, open_channel_with_all, premine_and_distribute_funds, premine_blocks,
prepare_rbf, random_chain_source, random_config, setup_bitcoind_and_electrsd, setup_node,
setup_two_nodes, splice_in_with_all, wait_for_block, wait_for_tx, TestChainSource, TestConfig,
TestStoreType, TestSyncStore,
};
Expand Down
6 changes: 3 additions & 3 deletions tests/reorg_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use proptest::prelude::prop;
use proptest::proptest;

use crate::common::{
expect_event, generate_blocks_and_wait, invalidate_blocks, open_channel,
premine_and_distribute_funds, random_chain_source, random_config, setup_bitcoind_and_electrsd,
setup_node, wait_for_outpoint_spend,
generate_blocks_and_wait, invalidate_blocks, open_channel, premine_and_distribute_funds,
random_chain_source, random_config, setup_bitcoind_and_electrsd, setup_node,
wait_for_outpoint_spend,
};

proptest! {
Expand Down
Loading