diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 167fa155f961cf02da7e9fbf11fe39d86f0f4f02..2e15d54d7e94d9496cf78d84bc02063e08635e3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ test-rust-stable: script: - ./scripts/init.sh - ./scripts/build.sh - - time cargo test --all --release --features spectests --locked + - time cargo test --all --release --locked - sccache -s only: - triggers diff --git a/yamltests/ssztests/Cargo.toml b/yamltests/ssztests/Cargo.toml index fa9b9e7e402f0fd13a182036d14bf4b6dfeeed01..72b3ae12e1c1cec24c0e3710c1e4ae589909c708 100644 --- a/yamltests/ssztests/Cargo.toml +++ b/yamltests/ssztests/Cargo.toml @@ -14,6 +14,3 @@ beacon = { path = "../../beacon" } crypto = { package = "shasper-crypto", path = "../../crypto" } hex = "0.3" sha2 = "0.8" - -[features] -spectests = [] diff --git a/yamltests/ssztests/src/main.rs b/yamltests/ssztests/src/main.rs index 32330fe30e2aa54ec908358b64b731ef7bdac27c..d4f2c8941d070db2519a040299600a83a52b407b 100644 --- a/yamltests/ssztests/src/main.rs +++ b/yamltests/ssztests/src/main.rs @@ -137,7 +137,7 @@ fn main() { } } -#[cfg(all(test, feature = "spectests"))] +#[cfg(test)] mod spectests { use super::*; use std::path::PathBuf; diff --git a/yamltests/transitiontests/Cargo.toml b/yamltests/transitiontests/Cargo.toml index d3e2ad6ecfa334048e586afc1d8395b44c455522..c2243942ab4117171d1fe2fc6fbb5796b2fe406b 100644 --- a/yamltests/transitiontests/Cargo.toml +++ b/yamltests/transitiontests/Cargo.toml @@ -12,6 +12,3 @@ clap = "2.32" ssz = { path = "../../utils/ssz" } beacon = { path = "../../beacon" } crypto = { package = "shasper-crypto", path = "../../crypto" } - -[features] -spectests = [] diff --git a/yamltests/transitiontests/src/lib.rs b/yamltests/transitiontests/src/lib.rs index af3b7a7a66ac67c8418ca0276074f723362171da..9186bc6a85c40141e5038379dac7681f7ac65dff 100644 --- a/yamltests/transitiontests/src/lib.rs +++ b/yamltests/transitiontests/src/lib.rs @@ -77,15 +77,3 @@ pub fn run_collection<T: Test>(coll: Collection<T>) { test.run(); } } - -#[cfg(test)] -mod tests { - use super::*; - use beacon::MinimalConfig; - - #[test] - fn deposit_small() { - let coll = serde_yaml::from_str(&include_str!("../../spectests/tests/operations/deposit/deposit_minimal.yaml")).unwrap(); - run_collection::<DepositTest<MinimalConfig>>(coll); - } -} diff --git a/yamltests/transitiontests/src/main.rs b/yamltests/transitiontests/src/main.rs index feb11b2509afa24ffc90863477d2c55364823519..01a758b2c1380d47062c2f6629b15cea85cb9527 100644 --- a/yamltests/transitiontests/src/main.rs +++ b/yamltests/transitiontests/src/main.rs @@ -63,7 +63,7 @@ fn run<T: Test + DeserializeOwned>(file: File) { run_collection(coll); } -#[cfg(all(test, feature = "spectests"))] +#[cfg(test)] mod spectests { use super::*; use std::path::PathBuf;