Fix/ledger tests org update (#1343)

cmd/crates/stellar-ledger/src/hd_path.rs

@@ -1,7 +1,7 @@
 use crate::Error;
 
 #[derive(Clone, Copy)]
-pub struct HdPath(pub(crate) u32);
+pub struct HdPath(pub u32);
 
 impl HdPath {
     pub fn depth(&self) -> u8 {

cmd/crates/stellar-ledger/src/lib.rs

@@ -14,14 +14,8 @@ use stellar_xdr::curr::{
 };
 
 pub use crate::signer::Blob;
-
-mod emulator_http_transport;
-mod signer;
-mod speculos;
-
-#[cfg(all(test, feature = "emulator-tests"))]
-mod emulator_tests;
 pub mod hd_path;
+mod signer;
 
 // this is from https://github.com/LedgerHQ/ledger-live/blob/36cfbf3fa3300fd99bcee2ab72e1fd8f280e6280/libs/ledgerjs/packages/hw-app-str/src/Str.ts#L181
 const APDU_MAX_SIZE: u8 = 150;
@@ -300,16 +294,23 @@ fn get_transport() -> Result<TransportNativeHID, Error> {
 
 pub const TEST_NETWORK_PASSPHRASE: &[u8] = b"Test SDF Network ; September 2015";
 #[cfg(test)]
-fn test_network_hash() -> Hash {
+pub fn test_network_hash() -> Hash {
     use sha2::Digest;
     Hash(sha2::Sha256::digest(TEST_NETWORK_PASSPHRASE).into())
 }
+
 #[cfg(test)]
 mod test {
+    mod test_helpers {
+        pub mod test {
+            include!("../tests/utils/mod.rs");
+        }
+    }
     use httpmock::prelude::*;
     use serde_json::json;
 
-    use crate::{emulator_http_transport::EmulatorHttpTransport, Blob};
+    use crate::Blob;
+    use test_helpers::test::emulator_http_transport::EmulatorHttpTransport;
 
     use soroban_env_host::xdr::Transaction;
     use std::vec;

cmd/crates/stellar-ledger/src/emulator_tests.rs → cmd/crates/stellar-ledger/tests/test/emulator_tests.rs

@@ -1,13 +1,11 @@
 use ledger_transport::Exchange;
 use serde::Deserialize;
-use soroban_env_host::xdr::Transaction;
 use soroban_env_host::xdr::{self, Operation, OperationBody, Uint256};
+use soroban_env_host::xdr::{Hash, Transaction};
 use std::vec;
 
-use crate::emulator_http_transport::EmulatorHttpTransport;
-use crate::hd_path::HdPath;
-use crate::speculos::Speculos;
-use crate::{test_network_hash, Blob, Error, LedgerSigner};
+use stellar_ledger::hd_path::HdPath;
+use stellar_ledger::{Blob, Error, LedgerSigner};
 
 use std::sync::Arc;
 use std::{collections::HashMap, time::Duration};
@@ -19,10 +17,24 @@ use stellar_xdr::curr::{
 use testcontainers::clients;
 use tokio::time::sleep;
 
+pub const TEST_NETWORK_PASSPHRASE: &[u8] = b"Test SDF Network ; September 2015";
+pub fn test_network_hash() -> Hash {
+    use sha2::Digest;
+    Hash(sha2::Sha256::digest(TEST_NETWORK_PASSPHRASE).into())
+}
+
 fn ledger(host_port: u16) -> LedgerSigner<impl Exchange> {
     LedgerSigner::new(get_http_transport("127.0.0.1", host_port).unwrap())
 }
 
+mod test_helpers {
+    pub mod test {
+        include!("../utils/mod.rs");
+    }
+}
+
+use test_helpers::test::{emulator_http_transport::EmulatorHttpTransport, speculos::Speculos};
+
 #[tokio::test]
 async fn test_get_public_key() {
     let docker = clients::Cli::default();

cmd/crates/stellar-ledger/tests/test/main.rs

@@ -0,0 +1,2 @@
+#[cfg(all(test, feature = "emulator-tests"))]
+mod emulator_tests;

cmd/crates/stellar-ledger/tests/utils/mod.rs

@@ -0,0 +1,2 @@
+pub(crate) mod emulator_http_transport;
+pub(crate) mod speculos;

cmd/crates/stellar-ledger/src/speculos.rs → cmd/crates/stellar-ledger/tests/utils/speculos.rs

@@ -3,6 +3,8 @@ use testcontainers::{core::WaitFor, Image, ImageArgs};
 
 const NAME: &str = "docker.io/zondax/builder-zemu";
 const TAG: &str = "speculos-3a3439f6b45eca7f56395673caaf434c202e7005";
+const TEST_SEED_PHRASE: &str =
+    "\"other base behind follow wet put glad muscle unlock sell income october\"";
 
 #[allow(dead_code)]
 static ENV: &Map = &Map(phf::phf_map! {
@@ -28,7 +30,10 @@ impl Speculos {
     #[allow(dead_code)]
     pub fn new() -> Self {
         #[allow(unused_mut)]
-        let apps_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("apps");
+        let apps_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+            .join("tests")
+            .join("test_fixtures")
+            .join("apps");
         let mut volumes = HashMap::new();
         volumes.insert(
             apps_dir.to_str().unwrap().to_string(),
@@ -44,7 +49,7 @@ pub struct Args;
 impl ImageArgs for Args {
     fn into_iterator(self) -> Box<dyn Iterator<Item = String>> {
         let container_elf_path = format!("{DEFAULT_APP_PATH}/stellarNanosApp.elf");
-        let command_string = format!("/home/zondax/speculos/speculos.py --log-level speculos:DEBUG --color JADE_GREEN --display headless -s \"other base behind follow wet put glad muscle unlock sell income october\" -m nanos {container_elf_path}");
+        let command_string = format!("/home/zondax/speculos/speculos.py --log-level speculos:DEBUG --color JADE_GREEN --display headless -s {TEST_SEED_PHRASE} -m nanos {container_elf_path}");
         Box::new(vec![command_string].into_iter())
     }
 }