diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 32ec162c8..2d825b1d8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -40,10 +40,6 @@ jobs: python-version: "3.10" - name: Build run: cargo build --verbose - - name: Test Encryption - run: | - cargo test --features encryption --color=always --test integration_tests query_processing::encryption - cargo test --features encryption --color=always --lib storage::encryption - name: Test Checksums run: | cargo test --features checksum --color=always --lib storage::checksum diff --git a/bindings/javascript/Cargo.toml b/bindings/javascript/Cargo.toml index dcd2ba441..1b1626804 100644 --- a/bindings/javascript/Cargo.toml +++ b/bindings/javascript/Cargo.toml @@ -19,7 +19,6 @@ tracing.workspace = true chrono = { workspace = true, default-features = false, features = ["clock"] } [features] -encryption = ["turso_core/encryption"] browser = [] tracing_release = ["turso_core/tracing_release"] [build-dependencies] diff --git a/bindings/rust/Cargo.toml b/bindings/rust/Cargo.toml index e50304f01..d799b5320 100644 --- a/bindings/rust/Cargo.toml +++ b/bindings/rust/Cargo.toml @@ -15,7 +15,6 @@ conn_raw_api = ["turso_core/conn_raw_api"] experimental_indexes = [] antithesis = ["turso_core/antithesis"] tracing_release = ["turso_core/tracing_release"] -encryption = ["turso_core/encryption"] [dependencies] turso_core = { workspace = true, features = ["io_uring"] } diff --git a/core/Cargo.toml b/core/Cargo.toml index d5850d7f0..1b06e8fcc 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -14,7 +14,7 @@ name = "turso_core" path = "lib.rs" [features] -default = ["fs", "uuid", "time", "json", "series"] +default = ["fs", "uuid", "time", "json", "series", "encryption"] antithesis = ["dep:antithesis_sdk"] tracing_release = ["tracing/release_max_level_info"] conn_raw_api = [] diff --git a/perf/encryption/Cargo.toml b/perf/encryption/Cargo.toml index e769c5b0b..a32697c49 100644 --- a/perf/encryption/Cargo.toml +++ b/perf/encryption/Cargo.toml @@ -8,7 +8,7 @@ name = "encryption-throughput" path = "src/main.rs" [dependencies] -turso = { workspace = true, features = ["encryption"] } +turso = { workspace = true } clap = { workspace = true, features = ["derive"] } tokio = { workspace = true, default-features = true, features = ["full"] } futures = { workspace = true } diff --git a/tests/Cargo.toml b/tests/Cargo.toml index a0cf560c4..207699faa 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -36,5 +36,4 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] } tracing = { workspace = true } [features] -encryption = ["turso_core/encryption"] checksum = ["turso_core/checksum"] diff --git a/tests/integration/query_processing/mod.rs b/tests/integration/query_processing/mod.rs index fd30cac1e..e24945f20 100644 --- a/tests/integration/query_processing/mod.rs +++ b/tests/integration/query_processing/mod.rs @@ -3,8 +3,6 @@ mod test_ddl; mod test_read_path; mod test_write_path; +mod encryption; mod test_multi_thread; mod test_transactions; - -#[cfg(feature = "encryption")] -mod encryption; diff --git a/whopper/Cargo.toml b/whopper/Cargo.toml index 8056fbc43..1f69a4820 100644 --- a/whopper/Cargo.toml +++ b/whopper/Cargo.toml @@ -29,4 +29,3 @@ hex = "0.4.3" [features] checksum = ["turso_core/checksum"] -encryption = ["turso_core/encryption"] \ No newline at end of file