Test against monero 0.18.4.3 (#152)

* Test against monero 0.18.4.3

* Add get_version() method to DaemonJsonRpcClient, fix test

* Fix test

---------

Co-authored-by: silverpill <silverpill@firemail.cc>

Author: silverpill

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        monero: [ 0.18.1.2, 0.18.3.3, 0.18.3.4, 0.18.4.0, 0.18.4.1, 0.18.4.2 ]
+        monero: [ 0.18.1.2, 0.18.3.3, 0.18.3.4, 0.18.4.0, 0.18.4.1, 0.18.4.2, 0.18.4.3 ]
 
     steps:
       - uses: actions/checkout@v5

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added `subtract_fee_from_outputs` to `transfer` options by @thesn10 ([#141](https://github.com/monero-rs/monero-rpc-rs/pull/141)).
 - Added `destinations` field to `get_transfer` return value by @bytenotbark ([#128](https://github.com/monero-rs/monero-rpc-rs/pull/128)).
 - Added `block_height` field to struct returned by `incoming_transfers` by @silverpill ([#151](https://github.com/monero-rs/monero-rpc-rs/pull/151)).
+- Added `get_version` method to `DaemonJsonRpcClient` by @silverpill ([#152](https://github.com/monero-rs/monero-rpc-rs/pull/152)).
 
 ### Changed
 

src/lib.rs

@@ -552,6 +552,23 @@ impl DaemonJsonRpcClient {
         Ok((headers.into_iter().map(From::from).collect(), untrusted))
     }
 
+    pub async fn get_version(&self) -> anyhow::Result<(u16, u16)> {
+        #[derive(Deserialize)]
+        struct Rsp {
+            version: u32,
+        }
+
+        let version = self
+            .inner
+            .request::<Rsp>("get_version", RpcParams::None)
+            .await?;
+
+        let major = version.version >> 16;
+        let minor = version.version - (major << 16);
+
+        Ok((u16::try_from(major)?, u16::try_from(minor)?))
+    }
+
     /// Enable additional functions for daemons in regtest mode.
     pub fn regtest(self) -> RegtestDaemonJsonRpcClient {
         RegtestDaemonJsonRpcClient(self)

tests/clients_tests/empty_blockchain.rs

@@ -19,7 +19,7 @@ pub async fn run() {
     let genesis_block_hash = helpers::get_genesis_block_hash();
 
     helpers::regtest::get_block_count_assert_height(&regtest, 1).await;
-    helpers::regtest::on_get_block_hash_error_invalid_height(&regtest, 10).await;
+    helpers::regtest::on_get_block_hash_error_invalid_height(&regtest, 10, 0).await;
     helpers::regtest::on_get_block_hash_assert_hash(&regtest, 0, genesis_block_hash).await;
 
     let key_pair_1 = helpers::get_keypair_1();

tests/clients_tests/helpers/regtest.rs

@@ -8,6 +8,8 @@ use monero_rpc::{
 };
 use serde::Deserialize;
 
+const DAEMON_VERSION_0_18_4_3: u16 = 15;
+
 pub async fn get_block_count_assert_height(
     regtest: &RegtestDaemonJsonRpcClient,
     expected_height: u64,
@@ -28,12 +30,16 @@ pub async fn on_get_block_hash_assert_hash(
 pub async fn on_get_block_hash_error_invalid_height(
     regtest: &RegtestDaemonJsonRpcClient,
     height: u64,
+    expected_height: u64,
 ) {
+    let version = regtest.get_version().await.unwrap();
     let block_hash = regtest.on_get_block_hash(height).await.unwrap_err();
-    assert_eq!(
-        block_hash.to_string(),
+    let expected_error_message = if version.1 < DAEMON_VERSION_0_18_4_3 {
         format!("Invalid height {height} supplied.")
-    );
+    } else {
+        format!("Server error: Requested block height: {height} greater than current top block height: {expected_height}")
+    };
+    assert_eq!(block_hash.to_string(), expected_error_message);
 }
 
 fn get_expected_height_returned_by_generate_blocks(

tests/clients_tests/non_empty_blockchain.rs

@@ -50,6 +50,7 @@ pub async fn run() {
     helpers::regtest::on_get_block_hash_error_invalid_height(
         &regtest,
         generate_blocks_res.height + 1,
+        generate_blocks_res.height,
     )
     .await;
     helpers::regtest::on_get_block_hash_assert_hash(