From c9b665298c39b9ffafb73a457ef2dc8544358719 Mon Sep 17 00:00:00 2001
From: pls148 <184445976+pls148@users.noreply.github.com>
Date: Fri, 11 Oct 2024 13:19:33 -0600
Subject: [PATCH] remove references to dependency-tasks in CI and Cargo files
---
.github/workflows/build-and-test.yml | 44 -------------------
crates/hotshot/Cargo.toml | 1 -
crates/task-impls/Cargo.toml | 1 -
crates/testing/Cargo.toml | 1 -
.../tests_1/upgrade_task_with_proposal.rs | 1 -
.../tests/tests_1/upgrade_task_with_vote.rs | 1 -
justfile | 24 ++--------
7 files changed, 3 insertions(+), 70 deletions(-)
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e5d0a76ccf..0aacdac8ea 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -59,50 +59,6 @@ jobs:
timeout-minutes: 60
env:
RUST_BACKTRACE: full
- test-dependency-tasks:
- strategy:
- matrix:
- just_variants:
- - async-std
- - tokio
- test_suites:
- - test-ci-1
- - test-ci-2
- - test-ci-3
- - test-ci-4
- - test-ci-5
- - test-ci-rest
- fail-fast: false
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- name: Checkout Repository
-
- - name: Install Rust
- uses: mkroening/rust-toolchain-toml@main
-
- - uses: Swatinem/rust-cache@v2
- name: Enable Rust Caching
- with:
- shared-key: "test"
- prefix-key: ${{ matrix.just_variants }}
- cache-on-failure: "true"
- save-if: "false"
-
- - name: Install Just
- run: |
- wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
- tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
- sudo cp just /usr/bin/just
-
- - uses: taiki-e/install-action@nextest
-
- - name: Unit and integration tests for all crates in workspace
- run: |
- just ${{ matrix.just_variants }} ${{ matrix.test_suites }} --features dependency-tasks
- timeout-minutes: 60
- env:
- RUST_BACKTRACE: full
test-examples:
strategy:
diff --git a/crates/hotshot/Cargo.toml b/crates/hotshot/Cargo.toml
index 3b00f7e0a9..874e94939d 100644
--- a/crates/hotshot/Cargo.toml
+++ b/crates/hotshot/Cargo.toml
@@ -11,7 +11,6 @@ rust-version = { workspace = true }
default = ["docs", "doc-images"]
example-upgrade = ["hotshot-task-impls/example-upgrade"]
gpu-vid = ["hotshot-task-impls/gpu-vid"]
-dependency-tasks = ["hotshot-task-impls/dependency-tasks"]
rewind = ["hotshot-task-impls/rewind"]
# Features required for binaries
diff --git a/crates/task-impls/Cargo.toml b/crates/task-impls/Cargo.toml
index 71fb1013f5..2492438ea4 100644
--- a/crates/task-impls/Cargo.toml
+++ b/crates/task-impls/Cargo.toml
@@ -8,7 +8,6 @@ version = { workspace = true }
[features]
example-upgrade = []
gpu-vid = ["hotshot-types/gpu-vid"]
-dependency-tasks = []
rewind = []
test-srs = ["jf-vid/test-srs"]
diff --git a/crates/testing/Cargo.toml b/crates/testing/Cargo.toml
index 0bc5566167..82473f3d34 100644
--- a/crates/testing/Cargo.toml
+++ b/crates/testing/Cargo.toml
@@ -10,7 +10,6 @@ default = []
# NOTE this is used to activate the slow tests we don't wish to run in CI
slow-tests = []
gpu-vid = ["hotshot-types/gpu-vid"]
-dependency-tasks = ["hotshot/dependency-tasks"]
rewind = ["hotshot/rewind"]
test-srs = ["jf-vid/test-srs"]
diff --git a/crates/testing/tests/tests_1/upgrade_task_with_proposal.rs b/crates/testing/tests/tests_1/upgrade_task_with_proposal.rs
index 7b2f40e73e..74ef7800e1 100644
--- a/crates/testing/tests/tests_1/upgrade_task_with_proposal.rs
+++ b/crates/testing/tests/tests_1/upgrade_task_with_proposal.rs
@@ -4,7 +4,6 @@
// You should have received a copy of the MIT License
// along with the HotShot repository. If not, see .
-// TODO: Remove after integration of dependency-tasks
#![allow(unused_imports)]
use std::time::Duration;
diff --git a/crates/testing/tests/tests_1/upgrade_task_with_vote.rs b/crates/testing/tests/tests_1/upgrade_task_with_vote.rs
index 8cda11c0e3..d7bdb28dad 100644
--- a/crates/testing/tests/tests_1/upgrade_task_with_vote.rs
+++ b/crates/testing/tests/tests_1/upgrade_task_with_vote.rs
@@ -4,7 +4,6 @@
// You should have received a copy of the MIT License
// along with the HotShot repository. If not, see .
-// TODO: Remove after integration of dependency-tasks
#![allow(unused_imports)]
use std::time::Duration;
diff --git a/justfile b/justfile
index 317aa18a45..64bf115ae1 100644
--- a/justfile
+++ b/justfile
@@ -92,10 +92,6 @@ test_success:
echo Testing success test
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_success -- --test-threads=1 --nocapture
-test_success_dependency_tasks:
- echo Testing success test
- cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_success -- --test-threads=1 --nocapture
-
test_timeout:
echo Testing timeout test
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_timeout -- --test-threads=1 --nocapture
@@ -112,10 +108,6 @@ test_with_failures:
echo Testing nodes leaving the network
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_with_failures -- --test-threads=1 --nocapture
-test_with_failures_dependency_tasks:
- echo Testing nodes leaving the network with dependency tasks
- cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_with_failures -- --test-threads=1 --nocapture
-
test_network_task:
echo Testing the DA task
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_network_task -- --test-threads=1 --nocapture
@@ -130,11 +122,11 @@ test_consensus_task:
test_quorum_vote_task:
echo Testing the quorum vote task
- cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_quorum_vote_task -- --test-threads=1 --nocapture
+ cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_quorum_vote_task -- --test-threads=1 --nocapture
test_quorum_proposal_task:
echo Testing the quorum proposal task
- cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_quorum_proposal_task -- --test-threads=1 --nocapture
+ cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_quorum_proposal_task -- --test-threads=1 --nocapture
test_da_task:
echo Testing the DA task
@@ -150,16 +142,12 @@ test_view_sync_task:
test_quorum_proposal_recv_task:
echo Testing the quorum proposal recv task
- cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_quorum_proposal_recv_task -- --test-threads=1 --nocapture
+ cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_quorum_proposal_recv_task -- --test-threads=1 --nocapture
test_upgrade_task:
echo Testing the upgrade task without dependency tasks
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_upgrade_task -- --test-threads=1 --nocapture
-test_upgrade_task_dependency_tasks:
- echo Testing the upgrade task without dependency tasks
- cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_upgrade_task -- --test-threads=1 --nocapture
-
test_pkg := "hotshot"
default_test := ""
@@ -186,10 +174,6 @@ clippy:
echo clippy
cargo clippy --workspace --examples --bins --tests -- -D warnings
-clippy_dependency_tasks:
- echo clippy release
- cargo clippy --workspace --examples --bins --tests --features "dependency-tasks" -- -D warnings
-
clippy_release:
echo clippy release
cargo clippy --package hotshot --no-default-features --features="docs, doc-images" -- -D warnings
@@ -210,8 +194,6 @@ lint_release: clippy_release fmt_check
fmt_clippy: fmt clippy
-fmt_clippy_dependency_tasks: fmt clippy_dependency_tasks
-
careful:
echo Careful-ing with tokio executor
cargo careful test --profile careful --lib --bins --tests --benches --workspace --no-fail-fast -- --test-threads=1 --nocapture