Reimplement speculos-client communication

Author: MKowalski8

Cargo.lock

@@ -122,7 +122,6 @@ serde_path_to_error = "0.1.20"
 serde_with = "3.18.0"
 wiremock = "0.6.3"
 coins-ledger = "0.13.0"
-speculos-client = { git = "https://github.com/MKowalski8/speculos-client", rev = "58d9523" }
 const-hex = "1.18.1"
 indicatif = "0.18.3"
 shell-words = "1.1.0"

Cargo.toml

@@ -82,7 +82,6 @@ wiremock.workspace = true
 docs = { workspace = true, features = ["testing"] }
 shared = { path = "../shared", features = ["testing"] }
 packages_validation = { path = "../testing/packages_validation" }
-speculos-client.workspace = true
 
 [features]
 default = []

crates/sncast/Cargo.toml

@@ -12,7 +12,10 @@ use tempfile::TempDir;
 
 const DOCS_SNIPPETS_PORT_BASE: u16 = 4006;
 
-async fn setup_speculos_automation(client: &Arc<speculos_client::SpeculosClient>, args: &[&str]) {
+async fn setup_speculos_automation(
+    client: &Arc<crate::e2e::ledger::speculos::SpeculosClient>,
+    args: &[&str],
+) {
     if args.contains(&"get-public-key") && !args.contains(&"--no-display") {
         set_automation(client, &[automation::APPROVE_PUBLIC_KEY]).await;
     } else if args.contains(&"sign-hash") {

crates/sncast/tests/docs_snippets/ledger.rs

@@ -1,5 +1,6 @@
 use std::fs;
 
+use super::speculos::AutomationRule;
 use crate::e2e::ledger::{
     BRAAVOS_LEDGER_PATH, LEDGER_ACCOUNT_NAME, LEDGER_PUBLIC_KEY, OZ_LEDGER_PATH, READY_LEDGER_PATH,
     TEST_LEDGER_PATH, TEST_LEDGER_PATH_STORED, automation, set_automation, setup_speculos,
@@ -16,7 +17,6 @@ use shared::test_utils::output_assert::{assert_stderr_contains, assert_stdout_co
 use snapbox::assert_data_eq;
 use sncast::helpers::account::load_accounts;
 use sncast::helpers::constants::{BRAAVOS_CLASS_HASH, OZ_CLASS_HASH, READY_CLASS_HASH};
-use speculos_client::AutomationRule;
 use tempfile::tempdir;
 use test_case::test_case;
 
@@ -41,7 +41,7 @@ async fn test_create_ledger_account(
     saved_type: &str,
     class_hash: String,
     port: u16,
-    automations: &[speculos_client::AutomationRule<'static>],
+    automations: &[AutomationRule<'static>],
 ) {
     let (client, url) = setup_speculos(port);
     let tempdir = tempdir().unwrap();

crates/sncast/tests/e2e/ledger/account.rs

@@ -14,9 +14,7 @@ use sncast::helpers::constants::{
 };
 use sncast::helpers::ledger::{DerivationPathParser, SncastLedgerTransport};
 use sncast::response::ui::UI;
-use speculos_client::{
-    AutomationAction, AutomationCondition, AutomationRule, Button, DeviceModel, SpeculosClient,
-};
+use speculos::{AutomationAction, AutomationCondition, AutomationRule, Button, SpeculosClient};
 use starknet_rust::accounts::{AccountFactory, ArgentAccountFactory, OpenZeppelinAccountFactory};
 use starknet_rust::core::types::{BlockId, BlockTag};
 use starknet_rust::providers::Provider;
@@ -30,6 +28,7 @@ use url::Url;
 mod account;
 mod basic;
 mod network;
+pub(crate) mod speculos;
 
 pub(crate) const OZ_LEDGER_PATH: &str = "m//starknet'/sncast'/0'/0'/0";
 pub(crate) const READY_LEDGER_PATH: &str = "m//starknet'/sncast'/0'/1'/0";
@@ -46,21 +45,19 @@ pub(crate) const LEDGER_PUBLIC_KEY: &str =
 pub(crate) const LEDGER_ACCOUNT_NAME: &str = "my_ledger";
 
 pub(crate) fn setup_speculos(port: u16) -> (Arc<SpeculosClient>, String) {
-    let client = Arc::new(SpeculosClient::new(DeviceModel::Nanox, port, APP_PATH).unwrap());
+    let client = Arc::new(SpeculosClient::new(port, APP_PATH).unwrap());
     let url = format!("http://127.0.0.1:{port}");
     (client, url)
 }
 
-/// Sets automation rules and, when `ENABLE_BLIND_SIGN` is among them, presses RIGHT to
-/// navigate from the home screen to "App settings" so the rule triggers immediately.
+/// Sets automation rules and, when `ENABLE_BLIND_SIGN` is among them, presses RIGHT so the
+/// blind-sign flow advances immediately.
 pub(crate) async fn set_automation(
     client: &SpeculosClient,
-    rules: &[speculos_client::AutomationRule<'static>],
+    rules: &[speculos::AutomationRule<'static>],
 ) {
     client.automation(rules).await.unwrap();
-    let needs_blind_sign = rules
-        .iter()
-        .any(|r| r.text.as_deref() == Some("App settings"));
+    let needs_blind_sign = rules.iter().any(|r| r == &automation::ENABLE_BLIND_SIGN);
     if needs_blind_sign {
         client.click_button(Button::Right).await.unwrap();
     }