From 02242cf7324d772bbab83b6716d445de2267d591 Mon Sep 17 00:00:00 2001
From: Lars Lubkoll <11710767+lubkoll@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:21:47 +0200
Subject: [PATCH 1/3] Refactor rust_test_tube.yml to allow enabling of optional
 dependencies

---
 .github/workflows/cl_vault.yml       | 30 ++++------------------------
 .github/workflows/rust_test_tube.yml |  9 +++++++++
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/cl_vault.yml b/.github/workflows/cl_vault.yml
index 5bcc41ba3..a980f156b 100644
--- a/.github/workflows/cl_vault.yml
+++ b/.github/workflows/cl_vault.yml
@@ -27,29 +27,7 @@ jobs:
     with:
       target: 'contracts/cl-vault'
   test-tube:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-      - name: Restore dependencies
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            ~/.cargo
-            ~/go
-            **/target
-          key: ${{ runner.os }}-cargo-$GITHUB_SHA
-          restore-keys: ${{ runner.os }}-cargo
-      - name: Build dex-router-osmosis
-        run: cargo test-tube-build
-        working-directory: smart-contracts/contracts/dex-router-osmosis
-      - name: Build cl-vault
-        run: cargo test-tube-build
-        working-directory: smart-contracts/contracts/cl-vault
-      - name: Run test-tube tests
-        run: cargo test-tube
-        env:
-          PROPTEST_CASES: 10
-        working-directory: smart-contracts/contracts/cl-vault
+    uses: ./.github/workflows/rust_test_tube.yml
+    with:
+      contract: 'cl-vault'
+      dex_router_osmosis: true
diff --git a/.github/workflows/rust_test_tube.yml b/.github/workflows/rust_test_tube.yml
index 4ee2ef265..6f984a5d5 100644
--- a/.github/workflows/rust_test_tube.yml
+++ b/.github/workflows/rust_test_tube.yml
@@ -6,6 +6,10 @@ on:
       contract:
         required: true
         type: string
+      dex_router_osmosis:
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   test-tube:
@@ -27,6 +31,11 @@ jobs:
       - name: Build ${{ inputs.contract }}
         run: cargo test-tube-build
         working-directory: smart-contracts/contracts/${{ inputs.contract }}
+      // OPTIONAL DEPENDENCIES
+      - name: Build dex-router-osmosis
+        if: ${{inputs.dex_router_osmosis}}
+        run: cargo test-tube-build
+        working-directory: smart-contracts/contracts/dex-router-osmosis
       - name: Run test-tube tests
         run: cargo test-tube
         working-directory: smart-contracts/contracts/${{ inputs.contract }}

From aaacdbc465ae839f8eb54e607901300714fa73f6 Mon Sep 17 00:00:00 2001
From: Lars Lubkoll <11710767+lubkoll@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:22:20 +0200
Subject: [PATCH 2/3] Clear temporary test-tube files after running test-tube

---
 .github/workflows/rust_test_tube.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/rust_test_tube.yml b/.github/workflows/rust_test_tube.yml
index 6f984a5d5..56c1dfff5 100644
--- a/.github/workflows/rust_test_tube.yml
+++ b/.github/workflows/rust_test_tube.yml
@@ -39,3 +39,7 @@ jobs:
       - name: Run test-tube tests
         run: cargo test-tube
         working-directory: smart-contracts/contracts/${{ inputs.contract }}
+      - name: Clear temporary test-tube files
+        if: always()
+        run: rm -rf .osmosis-test-tube-temp-*
+        working-directory: /tmp

From df1f666f3199b6be63bf5e5f0e0024fc1392dceb Mon Sep 17 00:00:00 2001
From: Lars Lubkoll <11710767+lubkoll@users.noreply.github.com>
Date: Fri, 19 Jul 2024 17:12:15 +0200
Subject: [PATCH 3/3] Remove comment

---
 .github/workflows/rust_test_tube.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/rust_test_tube.yml b/.github/workflows/rust_test_tube.yml
index 56c1dfff5..d1f8dca91 100644
--- a/.github/workflows/rust_test_tube.yml
+++ b/.github/workflows/rust_test_tube.yml
@@ -31,7 +31,6 @@ jobs:
       - name: Build ${{ inputs.contract }}
         run: cargo test-tube-build
         working-directory: smart-contracts/contracts/${{ inputs.contract }}
-      // OPTIONAL DEPENDENCIES
       - name: Build dex-router-osmosis
         if: ${{inputs.dex_router_osmosis}}
         run: cargo test-tube-build