Fix CI tests and general cleanup

althea-net · Sep 20, 2023 · 944638c · 944638c
1 parent 2df26e8
commit 944638c
Show file tree

Hide file tree

Showing 41 changed files with 972 additions and 915 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -80,24 +80,6 @@ jobs:
       - uses: Swatinem/rust-cache@v1
       - name: Cross test armv7
         run: cargo install cross && cross test --target armv7-unknown-linux-musleabihf --verbose -- --test-threads=1
-  legacy_integration-test-with-backcompat:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Wireguard
-        run: sudo apt-get update && sudo apt install -y wireguard linux-source linux-headers-$(uname -r) build-essential && sudo modprobe wireguard
-      - name: Run integration test
-        run: bash scripts/legacy_integration_test/test-ci-backcompat.sh
-  legacy_integration-test:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install Wireguard
-        run: sudo apt-get update && sudo apt install -y wireguard linux-source linux-headers-$(uname -r) build-essential && sudo modprobe wireguard
-      - name: Run integration test
-        run: bash scripts/legacy_integration_test/test-ci.sh
   integration-test-five-nodes:
     needs: test
     runs-on: ubuntu-latest
@@ -144,4 +126,13 @@ jobs:
       - name: Install Wireguard
         run: sudo apt-get update && sudo apt install -y wireguard linux-source linux-headers-$(uname -r) build-essential && sudo modprobe wireguard
       - name: Run integration test
-        run: bash scripts/integration_tests/all-up-test.sh MULTI_EXIT
+        run: bash scripts/integration_tests/all-up-test.sh MULTI_EXIT
+  integration-test-validate-contract:
+    needs: integration-test-five-nodes
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Wireguard
+        run: sudo apt-get update && sudo apt install -y wireguard linux-source linux-headers-$(uname -r) build-essential && sudo modprobe wireguard
+      - name: Run integration test
+        run: bash scripts/integration_tests/all-up-test.sh CONTRACT_TEST
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,6 @@ members = [
     "althea_kernel_interface",
     "settings",
     "clu",
-    "exit_db",
     "antenna_forwarding_client",
     "antenna_forwarding_protocol",
     "auto_bridge",

diff --git a/exit_db/Cargo.toml b/exit_db/Cargo.toml
diff --git a/exit_db/diesel.toml b/exit_db/diesel.toml
diff --git a/exit_db/migrations/00000000000000_diesel_initial_setup/down.sql b/exit_db/migrations/00000000000000_diesel_initial_setup/down.sql
diff --git a/exit_db/migrations/00000000000000_diesel_initial_setup/up.sql b/exit_db/migrations/00000000000000_diesel_initial_setup/up.sql
diff --git a/exit_db/migrations/2019-02-22-214628_rita-setup/down.sql b/exit_db/migrations/2019-02-22-214628_rita-setup/down.sql