Merge pull request #20 from Chia-Network/20240904-m1-tests

20240904 m1 tests

Author: prozacchiwawa

.github/workflows/m1-test.yml

@@ -0,0 +1,59 @@
+name: Run tests on MacOS
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+  release:
+    types: [published]
+  pull_request:
+    branches:
+      - '**'
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}--${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/') || startsWith(github.ref, 'refs/heads/long_lived/')) && github.sha || '' }}
+  cancel-in-progress: true
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  build_wheels:
+    name: Build wheel on Mac M1
+    runs-on: [MacOS, ARM64]
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: Chia-Network/actions/clean-workspace@main
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Set up rust
+      run: |
+        curl https://static.rust-lang.org/rustup/dist/aarch64-apple-darwin/rustup-init.sha256 | awk '{print $1 " *rustup-init"}' > checksum.txt
+        curl -O https://static.rust-lang.org/rustup/dist/aarch64-apple-darwin/rustup-init
+        cat checksum.txt
+        shasum -a 256 -c checksum.txt
+
+    - name: Install rust
+      run: |
+        chmod +x rustup-init
+        ./rustup-init -y || (echo "Rust is already installed. Exiting..." && exit 2)
+        rm rustup-init checksum.txt
+
+    - name: Set up a venv for chia-blockchain
+      run: |
+        python3 -m venv ./test
+        source ./test/bin/activate
+        pip install chia-blockchain
+
+    - name: Run tests
+      run: |
+        source ./test/bin/activate
+        cargo test --features=sim-tests

Cargo.toml

@@ -33,6 +33,7 @@ tracing-subscriber = "0.3"
 ctor = "0.2.8"
 log = "0.4.22"
 env_logger = "0.11.3"
+exec = "0.3.1"
 pyo3 = { version = "0.20.0", features = ["auto-initialize"], optional = true }
 
 [dev-dependencies]

src/simulator.rs

@@ -109,6 +109,30 @@ fn to_spend_result(py: Python<'_>, spend_res: PyObject) -> PyResult<IncludeTrans
 
 impl Default for Simulator {
     fn default() -> Self {
+        // https://github.com/PyO3/pyo3/issues/1741
+        #[cfg(target_os = "macos")]
+        if let Ok(venv) = std::env::var("VIRTUAL_ENV") {
+            Python::with_gil(|py| -> PyResult<_> {
+                let version_info = py.version_info();
+                let sys = py.import("sys").unwrap();
+                let sys_path = sys.getattr("path").unwrap();
+                sys_path
+                    .call_method1(
+                        "insert",
+                        (
+                            0,
+                            format!(
+                                "{}/lib/python{}.{}/site-packages",
+                                venv, version_info.major, version_info.minor
+                            ),
+                        ),
+                    )
+                    .unwrap();
+                Ok(())
+            })
+            .unwrap();
+        }
+
         Python::with_gil(|py| -> PyResult<_> {
             let module = PyModule::from_code(
                 py,

src/tests/mod.rs

@@ -1,3 +1,6 @@
+use exec::execvp;
+use std::ffi::OsString;
+
 pub mod calpoker;
 pub mod channel_handler;
 pub mod chialisp;
@@ -9,3 +12,31 @@ pub mod referee;
 #[cfg(feature = "sim-tests")]
 pub mod simenv;
 pub mod standard_coin;
+
+fn detect_run_as_python(args: &[String]) -> bool {
+    args.iter().any(|x: &String| x == "-c")
+}
+
+// Catch attempts on macos to run the test rig as 'python' and run python code in it.
+#[ctor::ctor]
+fn init() {
+    let mut args = std::env::args();
+    let args_vec: Vec<String> = args.collect();
+    if detect_run_as_python(&args_vec) {
+        let new_args: Vec<OsString> = args_vec
+            .iter()
+            .enumerate()
+            .map(
+                |(i, arg)| {
+                    if i == 0 {
+                        "python3".into()
+                    } else {
+                        arg.into()
+                    }
+                },
+            )
+            .collect();
+        let exec_err = execvp("python3", &new_args);
+        eprintln!("Error Running: {:?}\n{:?}\n", new_args, exec_err);
+    }
+}