From a04f04f1a56670e0808c71110804b68d58cb4e73 Mon Sep 17 00:00:00 2001
From: Philipp Hoenisch <philipp@hoenisch.at>
Date: Tue, 3 Nov 2020 11:00:05 +1100
Subject: [PATCH] Fix failing test due to uninitialized miner

---
 monero-harness/src/lib.rs       | 17 ++++++++---------
 monero-harness/tests/monerod.rs |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/monero-harness/src/lib.rs b/monero-harness/src/lib.rs
index d1e45884..cdf8926f 100644
--- a/monero-harness/src/lib.rs
+++ b/monero-harness/src/lib.rs
@@ -121,12 +121,6 @@ impl<'c> Monero {
         let miner_wallet = self.wallet("miner")?;
         let miner_address = miner_wallet.address().await?.address;
 
-        let alice_wallet = self.wallet("alice")?;
-        let alice_address = alice_wallet.address().await?.address;
-
-        let bob_wallet = self.wallet("bob")?;
-        let bob_address = bob_wallet.address().await?.address;
-
         // generate the first 70 as bulk
         let monerod = &self.monerod;
         let block = monerod.inner().generate_blocks(70, &miner_address).await?;
@@ -134,17 +128,22 @@ impl<'c> Monero {
         miner_wallet.refresh().await?;
 
         if alice_amount > 0 {
+            let alice_wallet = self.wallet("alice")?;
+            let alice_address = alice_wallet.address().await?.address;
             miner_wallet.transfer(&alice_address, alice_amount).await?;
             tracing::info!("Funded alice wallet with {}", alice_amount);
+            monerod.inner().generate_blocks(10, &miner_address).await?;
+            alice_wallet.refresh().await?;
         }
         if bob_amount > 0 {
+            let bob_wallet = self.wallet("bob")?;
+            let bob_address = bob_wallet.address().await?.address;
             miner_wallet.transfer(&bob_address, bob_amount).await?;
             tracing::info!("Funded bob wallet with {}", bob_amount);
+            monerod.inner().generate_blocks(10, &miner_address).await?;
+            bob_wallet.refresh().await?;
         }
 
-        monerod.inner().generate_blocks(10, &miner_address).await?;
-        alice_wallet.refresh().await?;
-        bob_wallet.refresh().await?;
         monerod.start_miner(&miner_address).await?;
 
         tracing::info!("Waiting for miner wallet to catch up...");
diff --git a/monero-harness/tests/monerod.rs b/monero-harness/tests/monerod.rs
index 53a865e7..086e5006 100644
--- a/monero-harness/tests/monerod.rs
+++ b/monero-harness/tests/monerod.rs
@@ -9,6 +9,7 @@ async fn init_miner_and_mine_to_miner_address() {
     let tc = Cli::default();
     let (monero, _monerod_container) = Monero::new(&tc, None, None, vec![]).await.unwrap();
 
+    monero.init(0, 0).await.unwrap();
     let monerod = monero.monerod();
     let miner_wallet = monero.wallet("miner").unwrap();