From 96115da0398e468cf074da436b731a968e36ff79 Mon Sep 17 00:00:00 2001
From: Daniel Karzel <daniel@comit.network>
Date: Mon, 1 Mar 2021 17:17:02 +1100
Subject: [PATCH] Wait for wallet to catch up instead of block generation

The monero harness wallet always starts a miner that mines new blocks every second.
This can conflict with additionally triggering block generation  and cause this error:

```
monero_rpc::rpc::monerod: generate blocks response: {
  "error": {
    "code": -7,
    "message": "Block not accepted"
  },
  "id": "1",
  "jsonrpc": "2.0"
}
```

Since the miner is generating blocks anyway we can wait for the wallet to catch up.
Refresh is done upon querying the balance, thus the refresh calls were removed.
---
 monero-harness/tests/wallet.rs | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/monero-harness/tests/wallet.rs b/monero-harness/tests/wallet.rs
index 1238a89b..14ff5b93 100644
--- a/monero-harness/tests/wallet.rs
+++ b/monero-harness/tests/wallet.rs
@@ -1,6 +1,7 @@
 use crate::testutils::init_tracing;
-use monero_harness::Monero;
+use monero_harness::{Monero, MoneroWalletRpc};
 use spectral::prelude::*;
+use std::{thread::sleep, time::Duration};
 use testcontainers::clients::Cli;
 
 mod testutils;
@@ -22,9 +23,6 @@ async fn fund_transfer_and_check_tx_key() {
     .unwrap();
     let alice_wallet = monero.wallet("alice").unwrap();
     let bob_wallet = monero.wallet("bob").unwrap();
-    let miner_wallet = monero.wallet("miner").unwrap();
-
-    let miner_address = miner_wallet.address().await.unwrap().address;
 
     // fund alice
     monero
@@ -33,7 +31,6 @@ async fn fund_transfer_and_check_tx_key() {
         .unwrap();
 
     // check alice balance
-    alice_wallet.refresh().await.unwrap();
     let got_alice_balance = alice_wallet.balance().await.unwrap();
     assert_that(&got_alice_balance).is_equal_to(fund_alice);
 
@@ -44,14 +41,8 @@ async fn fund_transfer_and_check_tx_key() {
         .await
         .unwrap();
 
-    monero
-        .monerod()
-        .client()
-        .generate_blocks(10, &miner_address)
-        .await
-        .unwrap();
+    wait_for_wallet_to_catch_up(bob_wallet, send_to_bob).await;
 
-    bob_wallet.refresh().await.unwrap();
     let got_bob_balance = bob_wallet.balance().await.unwrap();
     assert_that(&got_bob_balance).is_equal_to(send_to_bob);
 
@@ -66,3 +57,16 @@ async fn fund_transfer_and_check_tx_key() {
 
     assert_that!(res.received).is_equal_to(send_to_bob);
 }
+
+async fn wait_for_wallet_to_catch_up(wallet: &MoneroWalletRpc, expected_balance: u64) {
+    let max_retry = 15;
+    let mut retry = 0;
+    loop {
+        retry += 1;
+        let balance = wallet.balance().await.unwrap();
+        if balance == expected_balance || max_retry == retry {
+            break;
+        }
+        sleep(Duration::from_secs(1));
+    }
+}