Skip to content

test: (V1) move balance verification to individual test cases #672

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

Merged
mojoX911 merged 2 commits into from
Jan 2, 2026
Merged

test: (V1) move balance verification to individual test cases #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74564c1
test: (V1) Make test cases better
0xEgao Dec 28, 2025
71ffc49
revert incorrect assertion change in standard swap
stark-3k Jan 2, 2026
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
6 changes: 2 additions & 4 deletions src/maker/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,14 +475,12 @@ fn handle_client(maker: &Arc<Maker>, stream: &mut TcpStream) -> Result<(), Maker
}
Err(err) => {
match &err {
// Shutdown server if special behavior is set
MakerError::SpecialBehaviour(sp) => {
log::error!(
"[{}] Maker Special Behavior : {:?}",
"[{}] Maker Special Behavior Triggered Disconnection : {:?}",
maker.config.network_port,
sp
);
maker.shutdown.store(true, Relaxed);
}
e => {
log::error!(
Expand All @@ -492,7 +490,7 @@ fn handle_client(maker: &Arc<Maker>, stream: &mut TcpStream) -> Result<(), Maker
);
}
}
return Err(err);
break;
}
}
}
Expand Down
143 changes: 113 additions & 30 deletions tests/abort1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use test_framework::*;
/// The Taker after coming live again will see unfinished coinswaps in his wallet. He can reclaim his funds via
/// broadcasting his contract transactions and claiming via timelock.
#[test]
fn test_stop_taker_after_setup() {
fn taker_abort1() {
// ---- Setup ----

// 2 Makers with Normal behavior.
Expand Down Expand Up @@ -130,41 +130,124 @@ fn test_stop_taker_after_setup() {
taker.recover_from_swap().unwrap();

// ## Fee Tracking and Workflow:
//
// ### Fee Breakdown:
//
// +------------------+-------------------------+--------------------------+------------+----------------------------+-------------------+
// | Participant | Amount Received (Sats) | Amount Forwarded (Sats) | Fee (Sats) | Funding Mining Fees (Sats) | Total Fees (Sats) |
// +------------------+-------------------------+--------------------------+------------+----------------------------+-------------------+
// | Taker | _ | 500,000 | _ | 3,000 | 3,000 |
// | Maker16102 | 500,000 | 463,500 | 33,500 | 3,000 | 36,500 |
// | Maker6102 | 463,500 | 438,642 | 21,858 | 3,000 | 24,858 |
// +------------------+-------------------------+--------------------------+------------+----------------------------+-------------------+
//
//
// **Taker** => DropConnectionAfterFullSetup
//
// Participants regain their initial funding amounts but incur a total loss of **6,768 sats**
// due to mining fees (recovery + initial transaction fees).
// Participants regain their initial funding amounts but incur a total loss of **858 sats**
// due to mining fees (timelock recovery fee).
//
// ### Recovery Fees Breakdown:
// | Participant | Mining Fee for Contract txes (Sats) | Timelock Fee (Sats) | Funding Fee (Sats)| Total Recovery Fees (Sats) |
// |----------------|------------------------------------|---------------------|--------------------|----------------------------|
// | **Taker** | - | 858 | - | 858 |
// | **Maker6102** | - | 858 | - | 858 |
// | **Maker6102** | - | 858 | - | 858 |
//
// +------------------+------------------------------------+---------------------+--------------------+----------------------------+
// | Participant | Mining Fee for Contract txes (Sats) | Timelock Fee (Sats) | Funding Fee (Sats) | Total Recovery Fees (Sats) |
// +------------------+------------------------------------+---------------------+--------------------+----------------------------+
// | Taker | 3,000 | 768 | 3,000 | 6,768 |
// | Maker16102 | 3,000 | 768 | 3,000 | 6,768 |
// | Maker6102 | 3,000 | 768 | 3,000 | 6,768 |
// +------------------+------------------------------------+---------------------+--------------------+----------------------------+
//

info!("📊 Verifying swap results after taker recovery");
verify_swap_results(
taker,
&makers,
org_taker_spend_balance,
org_maker_spend_balances,
);
// Check Taker balances
{
let wallet = taker.get_wallet();
let balances = wallet.get_balances().unwrap();

// Debug logging for taker
log::info!(
"🔍 DEBUG Taker - Regular: {}, Swap: {}, Spendable: {},Contract: {}",
balances.regular.to_btc(),
balances.swap.to_btc(),
balances.spendable.to_btc(),
balances.contract.to_btc()
);
assert_in_range!(
balances.regular.to_sat(),
[
14999142,// Recover via timelock
],
"Taker seed balance mismatch"
);

assert_in_range!(
balances.swap.to_sat(),
[
0 // No swap happened,each party recovered their outgoing contract via timelock
],
"Taker swapcoin balance mismatch"
);

assert_in_range!(balances.contract.to_sat(), [0], "Contract balance mismatch");
assert_eq!(balances.fidelity, Amount::ZERO);

// Check balance difference
let balance_diff = org_taker_spend_balance
.checked_sub(balances.spendable)
.unwrap();

log::info!(
"🔍 DEBUG Taker balance diff: {} sats",
balance_diff.to_sat()
);
assert_in_range!(
balance_diff.to_sat(),
[
858 // Timlock recovery fee
],
"Taker spendable balance change mismatch"
);
}

// Check Maker balances
makers
.iter()
.zip(org_maker_spend_balances.iter())
.enumerate()
.for_each(|(maker_index, (maker, org_spend_balance))| {
let mut wallet = maker.get_wallet().write().unwrap();
wallet.sync_and_save().unwrap();
let balances = wallet.get_balances().unwrap();

// Debug logging for makers
log::info!(
"🔍 DEBUG Maker {} - Regular: {}, Swap: {}, Contract: {}, Spendable: {}",
maker_index,
balances.regular.to_btc(),
balances.swap.to_btc(),
balances.contract.to_btc(),
balances.spendable.to_btc()
);

assert_in_range!(
balances.regular.to_sat(),
[
14998642, // Makers after recovering via timelock,it has lost some sats here.
],
"Maker seed balance mismatch"
);

assert!(
balances.swap.to_sat() == 0,
"Maker swapcoin balance mismatch"
);
assert_eq!(balances.fidelity, Amount::from_btc(0.05).unwrap());
// Check spendable balance difference.
let balance_diff = match org_spend_balance.checked_sub(balances.spendable) {
None => balances.spendable.checked_sub(*org_spend_balance).unwrap(), // Successful swap as Makers balance increase by Coinswap fee.
Some(diff) => diff, // No spending or unsuccessful swap , Maker may have lost some funds here, generally due to timelock recovery transaction
};

log::info!(
"🔍 DEBUG Maker {} balance diff: {} sats",
maker_index,
balance_diff.to_sat()
);

assert_in_range!(
balance_diff.to_sat(),
[
858,// Maker has lost some sats here due to timelock recovery transaction fee
],
"Maker spendable balance change mismatch"
);
});

log::info!("✅ Swap results verification complete");

info!("🎉 All checks successful. Terminating integration test case");

Expand Down
Loading