Skip to content

Commit

Permalink
Merge pull request #280 from nomic-io/bitcoin-test-fix
Browse files Browse the repository at this point in the history 
Add polling for updated account balances
  • Loading branch information
@mappum
mappum authored Feb 12, 2024
2 parents 5bbc01a + cf01d61 commit 10b63b1
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 58 deletions.
23 changes: 23 additions & 0 deletions src/utils.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,29 @@ pub async fn poll_for_completed_checkpoint(num_checkpoints: u32) {
}
}

pub async fn poll_for_updated_balance(address: Address, expected_balance: u64) -> u64 {
info!("Polling for updated balance...");
let initial_balance = app_client(DEFAULT_RPC)
.query(|app| app.bitcoin.accounts.balance(address))
.await
.unwrap();

if initial_balance == expected_balance {
return initial_balance.into();
}

loop {
let balance = app_client(DEFAULT_RPC)
.query(|app| app.bitcoin.accounts.balance(address))
.await
.unwrap();
if balance != initial_balance {
break balance.into();
}
tokio::time::sleep(Duration::from_secs(1)).await;
}
}

pub async fn poll_for_bitcoin_header(height: u32) -> Result<()> {
info!("Scanning for bitcoin header {}...", height);
loop {
Expand Down
94 changes: 36 additions & 58 deletions tests/bitcoin.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ use nomic::bitcoin::Config as BitcoinConfig;
use nomic::error::{Error, Result};
use nomic::utils::*;
use nomic::utils::{
declare_validator, poll_for_active_sigset, poll_for_blocks, populate_bitcoin_block, retry,
set_time, setup_test_app, setup_test_signer, test_bitcoin_client, NomicTestWallet,
declare_validator, poll_for_active_sigset, poll_for_blocks, poll_for_updated_balance,
populate_bitcoin_block, retry, set_time, setup_test_app, setup_test_signer,
test_bitcoin_client, NomicTestWallet,
};
use orga::abci::Node;
use orga::client::{
Expand Down Expand Up @@ -384,11 +385,9 @@ async fn bitcoin_test() {

poll_for_bitcoin_header(1120).await.unwrap();

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(0));
let expected_balance = 0;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, expected_balance);

poll_for_active_sigset().await;
poll_for_signatory_key(consensus_key).await;
Expand All @@ -401,11 +400,9 @@ async fn bitcoin_test() {
.await
.unwrap();

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(0));
let expected_balance = 0;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, expected_balance);

btc_client
.generate_to_address(4, &async_wallet_address)
Expand All @@ -415,11 +412,9 @@ async fn bitcoin_test() {
poll_for_bitcoin_header(1124).await.unwrap();
poll_for_signing_checkpoint().await;

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(0));
let expected_balance = 0;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, expected_balance);

let confirmed_index = app_client()
.query(|app| Ok(app.bitcoin.checkpoints.confirmed_index))
Expand All @@ -431,11 +426,9 @@ async fn bitcoin_test() {

tx.send(Some(())).await.unwrap();

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(989996871600000));
let expected_balance = 989996871600000;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, Amount::from(expected_balance));

btc_client
.generate_to_address(3, &async_wallet_address)
Expand All @@ -460,12 +453,9 @@ async fn bitcoin_test() {
poll_for_bitcoin_header(1131).await.unwrap();
poll_for_completed_checkpoint(2).await;

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[1].address))
.await
.unwrap();

assert_eq!(balance, Amount::from(39595307400000));
let expected_balance = 39595307400000;
let balance = poll_for_updated_balance(funded_accounts[1].address, expected_balance).await;
assert_eq!(balance, Amount::from(expected_balance));

withdraw_bitcoin(
&funded_accounts[0],
Expand Down Expand Up @@ -495,11 +485,9 @@ async fn bitcoin_test() {
.unwrap();
assert!(signer_jailed);

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(989989871600000));
let expected_balance = 989989871600000;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, Amount::from(expected_balance));

let disbursal_txs = app_client()
.query(|app: InnerApp| {
Expand Down Expand Up @@ -1042,11 +1030,9 @@ async fn pending_deposits() {

poll_for_bitcoin_header(1120).await.unwrap();

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(0));
let expected_balance = 0;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, expected_balance);

poll_for_active_sigset().await;
poll_for_signatory_key(consensus_key).await;
Expand All @@ -1059,11 +1045,9 @@ async fn pending_deposits() {
.await
.unwrap();

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(0));
let expected_balance = 0;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, expected_balance);

loop {
let deposits = reqwest::get(format!(
Expand Down Expand Up @@ -1269,11 +1253,9 @@ async fn signer_key_updating() {

poll_for_bitcoin_header(1120).await.unwrap();

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(0));
let expected_balance = 0;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, expected_balance);

poll_for_active_sigset().await;
poll_for_signatory_key(consensus_key).await;
Expand Down Expand Up @@ -1615,11 +1597,9 @@ async fn recover_expired_deposit() {

poll_for_bitcoin_header(1120).await.unwrap();

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[0].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(0));
let expected_balance = 0;
let balance = poll_for_updated_balance(funded_accounts[0].address, expected_balance).await;
assert_eq!(balance, expected_balance);

poll_for_active_sigset().await;
poll_for_signatory_key(consensus_key).await;
Expand Down Expand Up @@ -1707,11 +1687,9 @@ async fn recover_expired_deposit() {
poll_for_bitcoin_header(1185).await.unwrap();
poll_for_completed_checkpoint(3).await;

let balance = app_client()
.query(|app| app.bitcoin.accounts.balance(funded_accounts[1].address))
.await
.unwrap();
assert_eq!(balance, Amount::from(39595129200000));
let expected_balance = 39595129200000;
let balance = poll_for_updated_balance(funded_accounts[1].address, expected_balance).await;
assert_eq!(balance, Amount::from(expected_balance));

Err::<(), Error>(Error::Test("Test completed successfully".to_string()))
};
Expand Down

0 comments on commit 10b63b1

Please sign in to comment.