Skip to content

Fix broken swap-core unit tests #991

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
dicnunz wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −16
Open

Fix broken swap-core unit tests #991

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
24 changes: 12 additions & 12 deletions bitcoin-wallet/src/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2921,7 +2921,7 @@ impl TestWalletBuilder {
}
}

/// Implement BitcoinWallet trait for a stub wallet and panic when the function is not implemented
/// Implement the wallet trait for the in-memory static-fee wallet used by tests.
#[async_trait::async_trait]
#[allow(unused)]
impl BitcoinWallet for Wallet<Connection, StaticFeeRate> {
Expand All @@ -2934,15 +2934,15 @@ impl BitcoinWallet for Wallet<Connection, StaticFeeRate> {
}

async fn balance(&self) -> Result<Amount> {
unimplemented!("stub method called erroneously")
Wallet::balance(self).await
}

async fn balance_info(&self) -> Result<Balance> {
unimplemented!("stub method called erroneously")
Wallet::balance_info(self).await
}

async fn new_address(&self) -> Result<Address> {
unimplemented!("stub method called erroneously")
Wallet::new_address(self).await
}

async fn send_to_address(
Expand All @@ -2952,7 +2952,7 @@ impl BitcoinWallet for Wallet<Connection, StaticFeeRate> {
spending_fee: Amount,
change_override: Option<Address>,
) -> Result<Psbt> {
unimplemented!("stub method called erroneously")
Wallet::send_to_address(self, address, amount, spending_fee, change_override).await
}

async fn send_to_address_dynamic_fee(
Expand All @@ -2961,15 +2961,15 @@ impl BitcoinWallet for Wallet<Connection, StaticFeeRate> {
amount: Amount,
change_override: Option<Address>,
) -> Result<Psbt> {
unimplemented!("stub method called erroneously")
Wallet::send_to_address_dynamic_fee(self, address, amount, change_override).await
}

async fn sweep_balance_to_address_dynamic_fee(&self, address: Address) -> Result<Psbt> {
unimplemented!("stub method called erroneously")
Wallet::sweep_balance_to_address_dynamic_fee(self, address).await
}

async fn sign_and_finalize(&self, psbt: Psbt) -> Result<bitcoin::Transaction> {
unimplemented!("stub method called erroneously")
Wallet::sign_and_finalize(self, psbt).await
}

async fn sync(&self) -> Result<()> {
Expand All @@ -2992,23 +2992,23 @@ impl BitcoinWallet for Wallet<Connection, StaticFeeRate> {
}

async fn max_giveable(&self, locking_script_size: usize) -> Result<(Amount, Amount)> {
unimplemented!("stub method called erroneously")
Wallet::max_giveable(self, locking_script_size).await
}

async fn estimate_fee(
&self,
weight: Weight,
transfer_amount: Option<Amount>,
) -> Result<Amount> {
unimplemented!("stub method called erroneously")
Wallet::estimate_fee(self, weight, transfer_amount).await
}

fn network(&self) -> Network {
unimplemented!("stub method called erroneously")
Wallet::network(self)
}

fn finality_confirmations(&self) -> u32 {
unimplemented!("stub method called erroneously")
Wallet::finality_confirmations(self)
}

async fn wallet_export(&self, role: &str) -> Result<FullyNodedExport> {
Expand Down
5 changes: 1 addition & 4 deletions swap-core/src/monero/primitives.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,10 +506,7 @@ mod tests {
fn parse_monero_overflows() {
let overflow_pics = "18446744.073709551616";
let error = Amount::parse_monero(overflow_pics).unwrap_err();
assert_eq!(
error.downcast_ref::<OverflowError>().unwrap(),
&OverflowError(overflow_pics.to_owned())
);
assert_eq!(error.to_string(), format!("{overflow_pics} too big"));
}

#[test]
Expand Down