test: add monero 0.18.1.2 version

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        monero: [ 0.17.3.0, 0.17.3.2, 0.18.0.0 ]
+        monero: [ 0.17.3.0, 0.17.3.2, 0.18.0.0, 0.18.1.2 ]
 
     services:
       monerod:

README.md

@@ -36,13 +36,13 @@ async fn monero_daemon_transactions_test() {
 
 ## Testing
 
-First, you'll need `docker` and `docker-compose` to run the RPC integration tests, which are in `tests/`, in case you don't want to run `monerod` and `monero-wallet-rpc` on your own.
+First, you'll need `docker` and `docker compose` to run the RPC integration tests, which are in `tests/`, in case you don't want to run `monerod` and `monero-wallet-rpc` on your own.
 
-If you have the docker stack installed, go to the `tests` folder and run `docker-compose up`. Note that the daemon will run on port `18081` and `monero-wallet-rpc` will run on port `18083`.
+If you have the docker stack installed, go to the `tests` folder and run `docker compose up`. Note that the daemon will run on port `18081` and `monero-wallet-rpc` will run on port `18083`.
 
 After that, just run `cargo test` as you normally would.
 
-Also, you can run `docker-compose down` to stop and remove the two containers started by `docker-compose up`.
+Also, you can run `docker compose down` to stop and remove the two containers started by `docker compose up`.
 
 **Important**: the blockchain must be empty when running the `main_functional_test` test on `tests/rpc.rs`, i.e. it must have only the genesis block. In `regtest`, the blockchain restarts when `monerod` restarts (as a side note, if you want to keep the blockchain in `regtest` between restarts, you should pass the `--keep-fakechain` flag when starting `monerod`).
 

tests/clients_tests/basic_wallet.rs

@@ -24,7 +24,7 @@ pub async fn run() {
     // where errors could happen.
     // Note that the wallets created in this step are created "from scratch", i.e.
     // they are not created from known spend/view keys.
-    let expected_wallet_version = (1, 22..26);
+    let expected_wallet_version = (1..2, 22..27);
     helpers::wallet::get_version_assert_version(&wallet, expected_wallet_version).await;
 
     let (wallet_with_pwd, wallet_with_no_pwd, wallet_with_empty_pwd) = tokio::join!(

tests/clients_tests/helpers/wallet.rs

@@ -24,10 +24,10 @@ fn get_random_name() -> String {
 
 pub async fn get_version_assert_version(
     wallet: &WalletClient,
-    expected_version: (u16, Range<u16>),
+    expected_version: (Range<u16>, Range<u16>),
 ) {
     let version = wallet.get_version().await.unwrap();
-    assert_eq!(version.0, expected_version.0);
+    assert!(expected_version.0.contains(&version.0));
     assert!(expected_version.1.contains(&version.1));
 }
 

tests/docker-compose.yml

@@ -1,7 +1,7 @@
-version: "3.7"
+version: "3.9"
 services:
   monerod:
-    image: ghcr.io/farcaster-project/containers/monerod:0.18.0.0
+    image: ghcr.io/farcaster-project/containers/monerod:0.18.1.2
     environment:
       NETWORK: regtest
       OFFLINE: --offline
@@ -10,7 +10,7 @@ services:
       - 18081:18081
 
   monero-wallet-rpc:
-    image: ghcr.io/farcaster-project/containers/monero-wallet-rpc:0.18.0.0
+    image: ghcr.io/farcaster-project/containers/monero-wallet-rpc:0.18.1.2
     environment:
       MONERO_DAEMON_ADDRESS: monerod:18081
       WALLET_RPC_PORT: 18083