From 619d359e914255cd925cc1ae5ca8cac6a5510d2b Mon Sep 17 00:00:00 2001
From: Thomas Eizinger <thomas@eizinger.io>
Date: Mon, 7 Dec 2020 10:49:50 +1100
Subject: [PATCH] Remove wrapper functions

---
 monero-harness/src/lib.rs         | 15 +++++----------
 monero-harness/src/rpc/monerod.rs | 22 ----------------------
 monero-harness/tests/monerod.rs   |  9 ++-------
 monero-harness/tests/wallet.rs    |  4 ++--
 4 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/monero-harness/src/lib.rs b/monero-harness/src/lib.rs
index 394d315e..658856c3 100644
--- a/monero-harness/src/lib.rs
+++ b/monero-harness/src/lib.rs
@@ -35,6 +35,7 @@ use crate::{
     },
     rpc::{
         monerod,
+        monerod_api::MonerodRpcApi,
         wallet::{self, GetAddress, Refreshed, Transfer},
     },
 };
@@ -118,10 +119,7 @@ impl<'c> Monero {
 
         // generate the first 70 as bulk
         let monerod = &self.monerod;
-        let block = monerod
-            .client()?
-            .generate_blocks(70, &miner_address)
-            .await?;
+        let block = monerod.client()?.generateblocks(70, &miner_address).await?;
         tracing::info!("Generated {:?} blocks", block);
         miner_wallet.refresh().await?;
 
@@ -131,10 +129,7 @@ impl<'c> Monero {
                 let address = wallet.address().await?.address;
                 miner_wallet.transfer(&address, *amount).await?;
                 tracing::info!("Funded {} wallet with {}", wallet.name, amount);
-                monerod
-                    .client()?
-                    .generate_blocks(10, &miner_address)
-                    .await?;
+                monerod.client()?.generateblocks(10, &miner_address).await?;
                 wallet.refresh().await?;
             }
         }
@@ -142,7 +137,7 @@ impl<'c> Monero {
         monerod.start_miner(&miner_address).await?;
 
         tracing::info!("Waiting for miner wallet to catch up...");
-        let block_height = monerod.client()?.get_block_count_rpc().await?;
+        let block_height = monerod.client()?.get_block_count().await?;
         miner_wallet
             .wait_for_wallet_height(block_height)
             .await
@@ -302,6 +297,6 @@ impl<'c> MoneroWalletRpc {
 async fn mine(monerod: monerod::Client, reward_address: String) -> Result<()> {
     loop {
         time::delay_for(Duration::from_secs(BLOCK_TIME_SECS)).await;
-        monerod.generate_blocks(1, &reward_address).await?;
+        monerod.generateblocks(1, &reward_address).await?;
     }
 }
diff --git a/monero-harness/src/rpc/monerod.rs b/monero-harness/src/rpc/monerod.rs
index 773558e1..f7080769 100644
--- a/monero-harness/src/rpc/monerod.rs
+++ b/monero-harness/src/rpc/monerod.rs
@@ -15,28 +15,6 @@ impl Client {
             base_url: reqwest::Url::parse(format!("http://127.0.0.1:{}/json_rpc", port).as_str())?,
         })
     }
-
-    pub async fn generate_blocks(
-        &self,
-        amount_of_blocks: u32,
-        wallet_address: &str,
-    ) -> anyhow::Result<GenerateBlocks> {
-        let res: GenerateBlocks = self
-            .generateblocks(amount_of_blocks, wallet_address)
-            .await?;
-        Ok(res)
-    }
-
-    // TODO: We should not need wrapper functions, why does it not compile without?
-    pub async fn get_block_header_by_height_rpc(&self, height: u32) -> anyhow::Result<BlockHeader> {
-        let res: BlockHeader = self.get_block_header_by_height(height).await?;
-        Ok(res)
-    }
-
-    pub async fn get_block_count_rpc(&self) -> anyhow::Result<u32> {
-        let res: u32 = self.get_block_count().await?;
-        Ok(res)
-    }
 }
 
 #[derive(Clone, Debug, Serialize)]
diff --git a/monero-harness/tests/monerod.rs b/monero-harness/tests/monerod.rs
index 2c72c66b..956098da 100644
--- a/monero-harness/tests/monerod.rs
+++ b/monero-harness/tests/monerod.rs
@@ -1,4 +1,4 @@
-use monero_harness::Monero;
+use monero_harness::{rpc::monerod_api::MonerodRpcApi, Monero};
 use spectral::prelude::*;
 use std::time::Duration;
 use testcontainers::clients::Cli;
@@ -20,12 +20,7 @@ async fn init_miner_and_mine_to_miner_address() {
     time::delay_for(Duration::from_millis(1010)).await;
 
     // after a bit more than 1 sec another block should have been mined
-    let block_height = monerod
-        .client()
-        .unwrap()
-        .get_block_count_rpc()
-        .await
-        .unwrap();
+    let block_height = monerod.client().unwrap().get_block_count().await.unwrap();
 
     assert_that(&block_height).is_greater_than(70);
 }
diff --git a/monero-harness/tests/wallet.rs b/monero-harness/tests/wallet.rs
index 191d73f0..7b417041 100644
--- a/monero-harness/tests/wallet.rs
+++ b/monero-harness/tests/wallet.rs
@@ -1,4 +1,4 @@
-use monero_harness::Monero;
+use monero_harness::{rpc::monerod_api::MonerodRpcApi, Monero};
 use spectral::prelude::*;
 use testcontainers::clients::Cli;
 
@@ -43,7 +43,7 @@ async fn fund_transfer_and_check_tx_key() {
         .monerod()
         .client()
         .unwrap()
-        .generate_blocks(10, &miner_address)
+        .generateblocks(10, &miner_address)
         .await
         .unwrap();