Skip to content

Commit 90462f9

Browse files
0xEgao0xEgao
committed
test: use absolute value in assertions
1 parent 54baf1d commit 90462f9

12 files changed

+220
-515
lines changed

‎tests/taproot_hashlock_recovery.rs‎

Lines changed: 8 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,7 @@ fn test_taproot_hashlock_recovery_end_to_end() {
8484
maker.wallet().write().unwrap().sync_and_save().unwrap();
8585
}
8686

87-
// Get balances before swap
88-
let maker_balance_before = {
89-
let wallet = taproot_makers[0].wallet().read().unwrap();
90-
let balances = wallet.get_balances().unwrap();
91-
info!(
92-
"Maker balance before swap: Regular: {}, Spendable: {}",
93-
balances.regular, balances.spendable
94-
);
95-
balances.spendable
96-
};
97-
87+
let actual_maker_spendable_balances = verify_maker_pre_swap_balance_taproot(&taproot_makers);
9888
info!("🔄 Initiating taproot coinswap (will fail mid-swap)...");
9989

10090
// Swap params - small amount for faster testing
@@ -150,70 +140,27 @@ fn test_taproot_hashlock_recovery_end_to_end() {
150140
generate_blocks(bitcoind, 2);
151141
taproot_taker.get_wallet_mut().sync_and_save().unwrap();
152142

153-
info!("📊 Taker balance after recovery:");
143+
info!("📊 Taproot Taker balance after recovery:");
154144
let taker_balances_after = taproot_taker.get_wallet().get_balances().unwrap();
155145
info!(
156146
" Regular: {}, Contract: {}, Spendable: {}",
157147
taker_balances_after.regular, taker_balances_after.contract, taker_balances_after.spendable
158148
);
159149

160-
// Verify taker recovered their funds via hashlock
161-
let max_taker_fees = Amount::from_sat(100000);
162-
assert!(
163-
taker_balances_after.spendable > taproot_taker_original_balance - max_taker_fees,
164-
"Taker should have recovered via hashlock. Original: {}, After: {}, Lost: {}",
165-
taproot_taker_original_balance,
166-
taker_balances_after.spendable,
167-
taproot_taker_original_balance - taker_balances_after.spendable
168-
);
169-
170150
// Now wait for maker to extract preimage and recover via hashlock
171151
info!("⏳ Waiting for maker to extract preimage and recover via hashlock...");
172152
std::thread::sleep(std::time::Duration::from_secs(60));
173-
174153
// Mine more blocks to give maker time to see the hashlock sweep
175154
generate_blocks(bitcoind, 2);
176155

177-
// Wait a bit more for maker's recovery
178-
std::thread::sleep(std::time::Duration::from_secs(10));
179-
180-
// Verify maker recovered their incoming contract via hashlock
181-
let maker_balance_after = {
182-
let mut wallet = taproot_makers[0].wallet().write().unwrap();
183-
wallet.sync_and_save().unwrap();
184-
let balances = wallet.get_balances().unwrap();
185-
info!(
186-
"📊 Maker balance after hashlock recovery: Regular: {}, Spendable: {}",
187-
balances.regular, balances.spendable
188-
);
189-
balances.spendable
190-
};
191-
192-
// Maker should have recovered their outgoing contract via hashlock after extracting preimage
193-
// They swept incoming (~500k sats) and should have it confirmed
194-
let max_maker_fees = Amount::from_sat(100000); // 0.001 BTC max fees
195-
assert!(
196-
maker_balance_after >= maker_balance_before - max_maker_fees,
197-
"Maker should have recovered via hashlock. Before: {}, After: {}, Lost: {}",
198-
maker_balance_before,
199-
maker_balance_after,
200-
maker_balance_before - maker_balance_after
201-
);
202-
203-
info!("✅ Hashlock recovery test passed!");
204-
info!(
205-
" Taker original balance: {}, Recovered: {}, Fees paid: {}",
156+
// Verify swap results
157+
verify_taproot_swap_results(
158+
taproot_taker.get_wallet(),
159+
&taproot_makers,
206160
taproot_taker_original_balance,
207-
taker_balances_after.spendable,
208-
taproot_taker_original_balance - taker_balances_after.spendable
161+
actual_maker_spendable_balances,
209162
);
210-
info!(
211-
" Maker balance before: {}, After: {} (change: {})",
212-
maker_balance_before,
213-
maker_balance_after,
214-
maker_balance_after.to_sat() as i64 - maker_balance_before.to_sat() as i64
215-
);
216-
163+
info!("✅ Hashlock recovery test passed!");
217164
// Shutdown maker
218165
taproot_makers
219166
.iter()

‎tests/taproot_maker_abort1.rs‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,7 @@ fn test_taproot_maker_abort1() {
7171
}
7272

7373
// Get balances before swap
74-
let maker_balance_before = {
75-
let wallet = taproot_makers[0].wallet().read().unwrap();
76-
let balances = wallet.get_balances().unwrap();
77-
info!(
78-
"Maker balance before swap: Regular: {}, Spendable: {}",
79-
balances.regular, balances.spendable
80-
);
81-
balances.spendable
82-
};
83-
74+
let actual_maker_spendable_balances = verify_maker_pre_swap_balance_taproot(&taproot_makers);
8475
info!("🔄 Initiating taproot coinswap (It will fail due to availabity of less makers)");
8576

8677
// Swap params - small amount for faster testing
@@ -107,40 +98,18 @@ fn test_taproot_maker_abort1() {
10798

10899
taproot_taker.get_wallet_mut().sync_and_save().unwrap();
109100
let taker_balances_after = taproot_taker.get_wallet().get_balances().unwrap();
110-
info!("📊 Taker balance after attempting swap:");
101+
info!("📊 Taproot Taker balance after attempting swap:");
111102
info!(
112103
" Regular: {}, Contract: {}, Spendable: {}",
113104
taker_balances_after.regular, taker_balances_after.contract, taker_balances_after.spendable
114105
);
115-
// Verify taker funds
116-
assert!(
117-
taker_balances_after.spendable == taproot_taker_original_balance,
118-
"Taker shouldn't have any fund loss. Original: {}, After: {}, Lost: {}",
106+
// Verify swap results
107+
verify_taproot_swap_results(
108+
taproot_taker.get_wallet(),
109+
&taproot_makers,
119110
taproot_taker_original_balance,
120-
taker_balances_after.spendable,
121-
taproot_taker_original_balance - taker_balances_after.spendable
122-
);
123-
124-
// Verify maker's final balance
125-
let maker_balance_after = {
126-
let mut wallet = taproot_makers[0].wallet().write().unwrap();
127-
wallet.sync_and_save().unwrap();
128-
let balances = wallet.get_balances().unwrap();
129-
info!(
130-
"📊 Maker balance after swap: Regular: {}, Spendable: {}",
131-
balances.regular, balances.spendable
132-
);
133-
balances.spendable
134-
};
135-
136-
assert!(
137-
maker_balance_after == maker_balance_before,
138-
"Maker's balance -: Before: {}, After: {}, Change: {}",
139-
maker_balance_before,
140-
maker_balance_after,
141-
maker_balance_after.to_sat() as i64 - maker_balance_before.to_sat() as i64
111+
actual_maker_spendable_balances,
142112
);
143-
144113
info!("✅ Taproot maker abort 1 test passed!");
145114
// Shutdown maker
146115
taproot_makers

‎tests/taproot_maker_abort2.rs‎

Lines changed: 8 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,7 @@ fn test_taproot_maker_abort2() {
7979
for maker in &taproot_makers {
8080
maker.wallet().write().unwrap().sync_and_save().unwrap();
8181
}
82-
83-
// Get balances before swap
84-
let maker_balance_before = {
85-
let wallet = taproot_makers[0].wallet().read().unwrap();
86-
let balances = wallet.get_balances().unwrap();
87-
info!(
88-
"Maker balance before swap: Regular: {}, Spendable: {}",
89-
balances.regular, balances.spendable
90-
);
91-
balances.spendable
92-
};
93-
82+
let actual_maker_spendable_balances = verify_maker_pre_swap_balance_taproot(&taproot_makers);
9483
info!("🔄 Initiating taproot maker abort 2 case. (Will fail mid-swap due to one maker closing connection at handling private key step)");
9584

9685
// Swap params - small amount for faster testing
@@ -121,69 +110,28 @@ fn test_taproot_maker_abort2() {
121110
generate_blocks(bitcoind, 2);
122111
taproot_taker.get_wallet_mut().sync_and_save().unwrap();
123112

124-
info!("📊 Taker balance after hashlock recovery:");
113+
info!("📊 Taproot Taker balance after hashlock recovery:");
125114
let taker_balances_after = taproot_taker.get_wallet().get_balances().unwrap();
126115
info!(
127116
" Regular: {}, Contract: {}, Spendable: {}",
128117
taker_balances_after.regular, taker_balances_after.contract, taker_balances_after.spendable
129118
);
130-
// Verify taker recovered their funds via hashlock
131-
let max_taker_fees = Amount::from_sat(100000);
132-
assert!(
133-
taker_balances_after.spendable > taproot_taker_original_balance - max_taker_fees,
134-
"Taker should have recovered via hashlock. Original: {}, After: {}, Lost: {}",
135-
taproot_taker_original_balance,
136-
taker_balances_after.spendable,
137-
taproot_taker_original_balance - taker_balances_after.spendable
138-
);
139119

140120
// Now wait for maker to extract preimage and recover via hashlock
141121
info!("⏳ Waiting for maker to extract preimage and recover via hashlock...");
142122
std::thread::sleep(std::time::Duration::from_secs(60));
143-
144123
// Mine more blocks to give maker time to see the hashlock sweep
145124
generate_blocks(bitcoind, 2);
146125

147-
// Wait a bit more for maker's recovery
148-
std::thread::sleep(std::time::Duration::from_secs(10));
149-
150-
// Verify maker recovered their incoming contract via hashlock
151-
let maker_balance_after = {
152-
let mut wallet = taproot_makers[0].wallet().write().unwrap();
153-
wallet.sync_and_save().unwrap();
154-
let balances = wallet.get_balances().unwrap();
155-
info!(
156-
"📊 Maker balance after hashlock recovery: Regular: {}, Spendable: {}",
157-
balances.regular, balances.spendable
158-
);
159-
balances.spendable
160-
};
161-
162-
// Maker should have recovered their outgoing contract via hashlock after extracting preimage
163-
// They swept incoming (~500k sats) and should have it confirmed
164-
let max_maker_fees = Amount::from_sat(100000); // 0.001 BTC max fees
165-
assert!(
166-
maker_balance_after >= maker_balance_before - max_maker_fees,
167-
"Maker should have recovered via hashlock. Before: {}, After: {}, Lost: {}",
168-
maker_balance_before,
169-
maker_balance_after,
170-
maker_balance_before - maker_balance_after
171-
);
172-
173-
info!("✅ Taproot Maker abort 2 recovery test passed!");
174-
info!(
175-
" Taker original balance: {}, Recovered: {}, Fees paid: {}",
126+
// Verify swap results
127+
verify_taproot_swap_results(
128+
taproot_taker.get_wallet(),
129+
&taproot_makers,
176130
taproot_taker_original_balance,
177-
taker_balances_after.spendable,
178-
taproot_taker_original_balance - taker_balances_after.spendable
179-
);
180-
info!(
181-
" Maker balance before: {}, After: {} (change: {})",
182-
maker_balance_before,
183-
maker_balance_after,
184-
maker_balance_after.to_sat() as i64 - maker_balance_before.to_sat() as i64
131+
actual_maker_spendable_balances,
185132
);
186133

134+
info!("✅ Taproot Maker abort 2 recovery test passed!");
187135
// Shutdown maker
188136
taproot_makers
189137
.iter()

‎tests/taproot_maker_abort3.rs‎

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,7 @@ fn test_taproot_maker_abort3() {
7474
maker.wallet().write().unwrap().sync_and_save().unwrap();
7575
}
7676

77-
// Get balances before swap
78-
let maker_balance_before = {
79-
let wallet = taproot_makers[0].wallet().read().unwrap();
80-
let balances = wallet.get_balances().unwrap();
81-
info!(
82-
"Maker balance before swap: Regular: {}, Spendable: {}",
83-
balances.regular, balances.spendable
84-
);
85-
balances.spendable
86-
};
87-
77+
let actual_maker_spendable_balances = verify_maker_pre_swap_balance_taproot(&taproot_makers);
8878
info!("🔄 Initiating taproot abort 3 case (will fail due to one maker closing after accpeting swap details)");
8979

9080
// Swap params - small amount for faster testing
@@ -110,41 +100,20 @@ fn test_taproot_maker_abort3() {
110100
}
111101

112102
taproot_taker.get_wallet_mut().sync_and_save().unwrap();
113-
info!("📊 Taker balance after failed swap:");
103+
info!("📊 Taproot Taker balance after failed swap:");
114104
let taker_balances_after = taproot_taker.get_wallet().get_balances().unwrap();
115105
info!(
116106
" Regular: {}, Contract: {}, Spendable: {}",
117107
taker_balances_after.regular, taker_balances_after.contract, taker_balances_after.spendable
118108
);
119109

120-
assert!(
121-
taker_balances_after.spendable == taproot_taker_original_balance,
122-
"Taker should have no fund loss. Original: {}, After: {}, Lost: {}",
110+
// Verify swap results
111+
verify_taproot_swap_results(
112+
taproot_taker.get_wallet(),
113+
&taproot_makers,
123114
taproot_taker_original_balance,
124-
taker_balances_after.spendable,
125-
taproot_taker_original_balance - taker_balances_after.spendable
126-
);
127-
128-
// Verify maker's final balance
129-
let maker_balance_after = {
130-
let mut wallet = taproot_makers[0].wallet().write().unwrap();
131-
wallet.sync_and_save().unwrap();
132-
let balances = wallet.get_balances().unwrap();
133-
info!(
134-
"📊 Maker balance after swap: Regular: {}, Spendable: {}",
135-
balances.regular, balances.spendable
136-
);
137-
balances.spendable
138-
};
139-
140-
assert!(
141-
maker_balance_after == maker_balance_before,
142-
"Maker's balance -: Before: {}, After: {}, Change: {}",
143-
maker_balance_before,
144-
maker_balance_after,
145-
maker_balance_after.to_sat() as i64 - maker_balance_before.to_sat() as i64
115+
actual_maker_spendable_balances,
146116
);
147-
148117
info!("✅ Taproot maker abort 3 recovery test passed!");
149118
// Shutdown maker
150119
taproot_makers

0 commit comments

Comments
 (0)