fix: tests fix

fedimint · Mar 10, 2024 · 8e9eb29 · 8e9eb29
1 parent ae3f6af
commit 8e9eb29
Showing 1 changed file with 42 additions and 13 deletions.
diff --git a/devimint/src/tests.rs b/devimint/src/tests.rs
@@ -411,29 +411,58 @@ pub async fn cli_tests(dev_fed: DevFed) -> Result<()> {
 
     let fed_id = fed.calculate_federation_id().await;
     let invite = fed.invite_code()?;
-    let (decode_invite_cmd, encode_invite_cmd) =
+    let (decode_invite_cmds, encode_invite_cmds) =
         if VersionReq::parse(">=0.3.0-alpha")?.matches(&fedimint_cli_version) {
-            ("decode invite-code", "encode invite-code")
+            (
+                ["decode", "invite-code"].as_slice(),
+                ["encode", "invite-code"].as_slice(),
+            )
         } else {
-            ("decode-invite-code", "encode-invite-code")
+            (
+                ["decode-invite-code"].as_slice(),
+                ["encode-invite-code"].as_slice(),
+            )
         };
-    let invite_code = cmd!(client, "dev", decode_invite_cmd, invite.clone())
-        .out_json()
-        .await?;
-    anyhow::ensure!(
+
+    let invite_code = if decode_invite_cmds.len() == 1 {
+        cmd!(client, "dev", decode_invite_cmds[0], invite.clone())
+    } else {
         cmd!(
             client,
             "dev",
-            encode_invite_cmd,
+            decode_invite_cmds[0],
+            decode_invite_cmds[1],
+            invite.clone()
+        )
+    }
+    .out_json()
+    .await?;
+
+    let encoded_invite = if encode_invite_cmds.len() == 1 {
+        cmd!(
+            client,
+            "dev",
+            encode_invite_cmds[0],
             format!("--url={}", invite_code["url"].as_str().unwrap()),
             "--federation_id={fed_id}",
             "--peer=0"
         )
-        .out_json()
-        .await?["invite_code"]
-            .as_str()
-            .unwrap()
-            == invite,
+    } else {
+        cmd!(
+            client,
+            "dev",
+            encode_invite_cmds[0],
+            encode_invite_cmds[1],
+            format!("--url={}", invite_code["url"].as_str().unwrap()),
+            "--federation_id={fed_id}",
+            "--peer=0"
+        )
+    }
+    .out_json()
+    .await?;
+
+    anyhow::ensure!(
+        encoded_invite["invite_code"] == invite,
         "failed to decode and encode the client invite code",
     );