diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index db0670f56..9e295f4e7 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -42,14 +42,14 @@ jobs: run: cargo check --all-targets - name: Run cargo check (all features) run: cargo check --all-targets --all-features - - name: Run cargo check (proofs) (no features) - run: cargo check -p proofs --no-default-features - - name: Run cargo check (proofs) (all features) - run: cargo check -p proofs --all-features - - name: Run cargo check (proofs) (just "test" feature) - run: cargo check -p proofs --no-default-features --features="test" - - name: Run cargo check (proofs) (just "blitzar" feature) - run: cargo check -p proofs --no-default-features --features="blitzar" + - name: Run cargo check (proof-of-sql) (no features) + run: cargo check -p proof-of-sql --no-default-features + - name: Run cargo check (proof-of-sql) (all features) + run: cargo check -p proof-of-sql --all-features + - name: Run cargo check (proof-of-sql) (just "test" feature) + run: cargo check -p proof-of-sql --no-default-features --features="test" + - name: Run cargo check (proof-of-sql) (just "blitzar" feature) + run: cargo check -p proof-of-sql --no-default-features --features="blitzar" test: name: Test Suite @@ -73,18 +73,18 @@ jobs: run: export DEBIAN_FRONTEND=non-interactive && sudo apt-get update && sudo apt-get install -y clang lld - name: Run cargo test run: cargo test --all-features - - name: Dry run cargo test (proofs) (test feature only) - run: cargo test -p proofs --no-run --no-default-features --features="test" - - name: Dry run cargo test (proofs) (blitzar feature only) - run: cargo test -p proofs --no-run --no-default-features --features="blitzar" - - name: Dry run cargo test (proofs) (no features) - run: cargo test -p proofs --no-run --no-default-features + - name: Dry run cargo test (proof-of-sql) (test feature only) + run: cargo test -p proof-of-sql --no-run --no-default-features --features="test" + - name: Dry run cargo test (proof-of-sql) (blitzar feature only) + run: cargo test -p proof-of-sql --no-run --no-default-features --features="blitzar" + - name: Dry run cargo test (proof-of-sql) (no features) + run: cargo test -p proof-of-sql --no-run --no-default-features - name: Run cargo test (proof primitives - Dory) (no features - i.e. not using blitzar) run: cargo test proof_primitive::dory::dory_compute_commitments_test --no-default-features - name: Run hello_world example run: cargo run --example hello_world --features="blitzar test" - name: Run posql_db example - run: bash crates/proofs/examples/posql_db/run_example.sh + run: bash crates/proof-of-sql/examples/posql_db/run_example.sh clippy: name: Clippy diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f5fe766f3..534ed9303 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -

Contributing to our Proofs Repository

+

Contributing to our Proof of SQL Repository

semantic-release: conventional-commits @@ -103,9 +103,9 @@ Before you submit your Pull Request (PR) consider the following guidelines: git push origin my-feature-branch ``` -7. In GitHub, send a pull request to `proofs:main`. +7. In GitHub, send a pull request to `sxt-proof-of-sql:main`. -Our proofs repository triggers automatically a workflow to test the code whenever a Pull Request is submitted or a commit is pushed to an existing PR. Before closing the PR, always verify that those tests are indeed passing. +Our proof of SQL repository triggers automatically a workflow to test the code whenever a Pull Request is submitted or a commit is pushed to an existing PR. Before closing the PR, always verify that those tests are indeed passing. Also, to ease this process of using git, you can try to use [vscode](https://code.visualstudio.com/). Vscode has some nice extensions to manage your git workflow. diff --git a/Cargo.toml b/Cargo.toml index f35ad8cec..1ff5748bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [workspace] resolver = "2" -members = ["crates/proofs", "crates/proofs-sql"] +members = ["crates/proof-of-sql", "crates/proof-of-sql-parser"] [workspace.package] edition = "2021" exclude = ["**/.gitignore", ".gitignore"] -repository = "https://github.com/spaceandtimelabs/proofs" +repository = "https://github.com/spaceandtimelabs/sxt-proof-of-sql" version = "0.0.0" # DO NOT CHANGE THIS LINE! This will be automatically updated [workspace.dependencies] @@ -44,8 +44,8 @@ opentelemetry = { version = "0.23.0" } opentelemetry-jaeger = { version = "0.20.0" } polars = { version = "0.33.1", default-features = false, features = ["dtype-i16"] } postcard = { version = "1.0" } -proofs = { path = "crates/proofs" } # We automatically update this line during release. So do not modify it! -proofs-sql = { path = "crates/proofs-sql" } # We automatically update this line during release. So do not modify it! +proof-of-sql = { path = "crates/proof-of-sql" } # We automatically update this line during release. So do not modify it! +proof-of-sql-parser = { path = "crates/proof-of-sql-parser" } # We automatically update this line during release. So do not modify it! rand = { version = "0.8" } rand_core = { version = "0.6" } rayon = { version = "1.5" } diff --git a/README.md b/README.md index e9c1fee37..a29491e2b 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ fn main() { ## Examples -Proof of SQL comes with example code demonstrating its usage. You can find the examples in the `crates/proofs/examples` folder. Below are explainations of how to run some of these examples: +Proof of SQL comes with example code demonstrating its usage. You can find the examples in the `crates/proof-of-sql/examples` folder. Below are explainations of how to run some of these examples: ### "Hello World" Example @@ -92,7 +92,7 @@ Valid proof! Query result: OwnedTable { table: {Identifier { name: "b" }: VarChar(["hello", "world"])} } ``` -For a detailed explanation of the example and its implementation, refer to the [README](crates/proofs/examples/hello_world/README.md) and source code in [hello_world/main.rs](crates/proofs/examples/hello_world/main.rs). +For a detailed explanation of the example and its implementation, refer to the [README](crates/proof-of-sql/examples/hello_world/README.md) and source code in [hello_world/main.rs](crates/proof-of-sql/examples/hello_world/main.rs). ### CSV Database Example @@ -101,10 +101,10 @@ The CSV Database example demonstrates an implementation of a simple CSV-backed d To install the example: ```bash -cargo install --example posql_db --path crates/proofs #TODO: update once this is published to crates.io +cargo install --example posql_db --path crates/proof-of-sql #TODO: update once this is published to crates.io ``` -For detailed usage instructions and examples of how to create, append to, prove, and verify queries in the CSV-backed database, refer to the [README](crates/proofs/examples/posql_db/README.md) and source code in [posql_db/main.rs](crates/proofs/examples/posql_db/main.rs). +For detailed usage instructions and examples of how to create, append to, prove, and verify queries in the CSV-backed database, refer to the [README](crates/proof-of-sql/examples/posql_db/README.md) and source code in [posql_db/main.rs](crates/proof-of-sql/examples/posql_db/main.rs). ## Benchmarks diff --git a/crates/proofs-sql/Cargo.toml b/crates/proof-of-sql-parser/Cargo.toml similarity index 96% rename from crates/proofs-sql/Cargo.toml rename to crates/proof-of-sql-parser/Cargo.toml index 8a6786267..a45c2efd3 100644 --- a/crates/proofs-sql/Cargo.toml +++ b/crates/proof-of-sql-parser/Cargo.toml @@ -1,6 +1,6 @@ [package] publish = true -name = "proofs-sql" +name = "proof-of-sql-parser" version = { workspace = true } edition = { workspace = true } repository = { workspace = true } diff --git a/crates/proofs-sql/build.rs b/crates/proof-of-sql-parser/build.rs similarity index 100% rename from crates/proofs-sql/build.rs rename to crates/proof-of-sql-parser/build.rs diff --git a/crates/proofs-sql/src/error.rs b/crates/proof-of-sql-parser/src/error.rs similarity index 100% rename from crates/proofs-sql/src/error.rs rename to crates/proof-of-sql-parser/src/error.rs diff --git a/crates/proofs-sql/src/identifier.rs b/crates/proof-of-sql-parser/src/identifier.rs similarity index 99% rename from crates/proofs-sql/src/identifier.rs rename to crates/proof-of-sql-parser/src/identifier.rs index c0eb8d366..1d85590ef 100644 --- a/crates/proofs-sql/src/identifier.rs +++ b/crates/proof-of-sql-parser/src/identifier.rs @@ -11,7 +11,7 @@ pub struct Identifier { impl Identifier { /// Constructor for [Identifier] /// - /// Note: this constructor should be private within the proofs_sql crate. + /// Note: this constructor should be private within the proof_of_sql_parser crate. /// This is necessary to guarantee that no one outside the crate /// can create Names, thus securing that ResourceIds and Identifiers /// are always valid postgresql identifiers. diff --git a/crates/proofs-sql/src/intermediate_ast.rs b/crates/proof-of-sql-parser/src/intermediate_ast.rs similarity index 100% rename from crates/proofs-sql/src/intermediate_ast.rs rename to crates/proof-of-sql-parser/src/intermediate_ast.rs diff --git a/crates/proofs-sql/src/intermediate_ast_tests.rs b/crates/proof-of-sql-parser/src/intermediate_ast_tests.rs similarity index 100% rename from crates/proofs-sql/src/intermediate_ast_tests.rs rename to crates/proof-of-sql-parser/src/intermediate_ast_tests.rs diff --git a/crates/proofs-sql/src/intermediate_decimal.rs b/crates/proof-of-sql-parser/src/intermediate_decimal.rs similarity index 98% rename from crates/proofs-sql/src/intermediate_decimal.rs rename to crates/proof-of-sql-parser/src/intermediate_decimal.rs index cf18e705a..850637e16 100644 --- a/crates/proofs-sql/src/intermediate_decimal.rs +++ b/crates/proof-of-sql-parser/src/intermediate_decimal.rs @@ -1,7 +1,7 @@ //! A parser conforming to standard postgreSQL to parse the precision and scale //! from a decimal token obtained from the lalrpop lexer. This module -//! exists to resolve a cyclic dependency between proofs -//! and proofs-sql. +//! exists to resolve a cyclic dependency between proof-of-sql +//! and proof-of-sql-parser. //! //! A decimal must have a decimal point. The lexer does not route //! whole integers to this contructor. diff --git a/crates/proofs-sql/src/lib.rs b/crates/proof-of-sql-parser/src/lib.rs similarity index 100% rename from crates/proofs-sql/src/lib.rs rename to crates/proof-of-sql-parser/src/lib.rs diff --git a/crates/proofs-sql/src/resource_id.rs b/crates/proof-of-sql-parser/src/resource_id.rs similarity index 100% rename from crates/proofs-sql/src/resource_id.rs rename to crates/proof-of-sql-parser/src/resource_id.rs diff --git a/crates/proofs-sql/src/select_statement.rs b/crates/proof-of-sql-parser/src/select_statement.rs similarity index 100% rename from crates/proofs-sql/src/select_statement.rs rename to crates/proof-of-sql-parser/src/select_statement.rs diff --git a/crates/proofs-sql/src/sql.lalrpop b/crates/proof-of-sql-parser/src/sql.lalrpop similarity index 100% rename from crates/proofs-sql/src/sql.lalrpop rename to crates/proof-of-sql-parser/src/sql.lalrpop diff --git a/crates/proofs-sql/src/test_utility.rs b/crates/proof-of-sql-parser/src/test_utility.rs similarity index 100% rename from crates/proofs-sql/src/test_utility.rs rename to crates/proof-of-sql-parser/src/test_utility.rs diff --git a/crates/proofs/Cargo.toml b/crates/proof-of-sql/Cargo.toml similarity index 97% rename from crates/proofs/Cargo.toml rename to crates/proof-of-sql/Cargo.toml index b329a4991..a0ee0cbc7 100644 --- a/crates/proofs/Cargo.toml +++ b/crates/proof-of-sql/Cargo.toml @@ -1,6 +1,6 @@ [package] publish = true -name = "proofs" +name = "proof-of-sql" version = { workspace = true } edition = { workspace = true } repository = { workspace = true } @@ -40,7 +40,7 @@ num-traits = { workspace = true } num-bigint = { workspace = true, default-features = false } polars = { workspace = true, features = ["lazy", "bigidx", "dtype-decimal", "serde-lazy"] } postcard = { workspace = true, features = ["alloc"] } -proofs-sql = { workspace = true } +proof-of-sql-parser = { workspace = true } rand = { workspace = true, optional = true } rayon = { workspace = true } serde = { workspace = true, features = ["serde_derive"] } diff --git a/crates/proofs/benches/README.md b/crates/proof-of-sql/benches/README.md similarity index 87% rename from crates/proofs/benches/README.md rename to crates/proof-of-sql/benches/README.md index 06755ee20..bda601fb8 100644 --- a/crates/proofs/benches/README.md +++ b/crates/proof-of-sql/benches/README.md @@ -10,7 +10,7 @@ To run benchmarks with Jaeger, you need to do the following ``` 2. Run the benchmark. ```bash - cargo bench -p proofs --bench jaeger_benches + cargo bench -p proof-of-sql --bench jaeger_benches ``` 3. Navigate to http://localhost:16686/ to see the results. 4. To end the Jaeger service, run @@ -24,6 +24,6 @@ To run benchmarks with Criterion, you need to do the following 1. Run the benchmarks. (Warning: this takes a very long time.) ```bash - cargo bench -p proofs --bench criterion_benches + cargo bench -p proof-of-sql --bench criterion_benches ``` 2. Navigate to `target/criterion/report/index.html` to see the results. \ No newline at end of file diff --git a/crates/proofs/benches/criterion_benches.rs b/crates/proof-of-sql/benches/criterion_benches.rs similarity index 93% rename from crates/proofs/benches/criterion_benches.rs rename to crates/proof-of-sql/benches/criterion_benches.rs index 983abadb5..c4466a0db 100644 --- a/crates/proofs/benches/criterion_benches.rs +++ b/crates/proof-of-sql/benches/criterion_benches.rs @@ -1,7 +1,7 @@ //! Benchmarking using the `criterion` crate. //! To run, execute the following command: //! ```bash -//! cargo bench -p proofs --bench criterion_benches +//! cargo bench -p proof-of-sql --bench criterion_benches //! ``` #![allow(missing_docs)] use blitzar::proof::InnerProductProof; diff --git a/crates/proofs/benches/jaeger_benches.rs b/crates/proof-of-sql/benches/jaeger_benches.rs similarity index 95% rename from crates/proofs/benches/jaeger_benches.rs rename to crates/proof-of-sql/benches/jaeger_benches.rs index 9a6d9fca4..992bc998e 100644 --- a/crates/proofs/benches/jaeger_benches.rs +++ b/crates/proof-of-sql/benches/jaeger_benches.rs @@ -2,7 +2,7 @@ //! To run, execute the following commands: //! ```bash //! docker run --rm -d --name jaeger -p 6831:6831/udp -p 16686:16686 jaegertracing/all-in-one:latest -//! cargo bench -p proofs --bench jaeger_benches +//! cargo bench -p proof-of-sql --bench jaeger_benches //! ``` //! Then, navigate to http://localhost:16686 to view the traces. diff --git a/crates/proofs/benches/scaffold/benchmark_accessor.rs b/crates/proof-of-sql/benches/scaffold/benchmark_accessor.rs similarity index 97% rename from crates/proofs/benches/scaffold/benchmark_accessor.rs rename to crates/proof-of-sql/benches/scaffold/benchmark_accessor.rs index 53257932b..29bafe3ff 100644 --- a/crates/proofs/benches/scaffold/benchmark_accessor.rs +++ b/crates/proof-of-sql/benches/scaffold/benchmark_accessor.rs @@ -1,11 +1,11 @@ -use proofs::base::{ +use proof_of_sql::base::{ commitment::Commitment, database::{ Column, ColumnRef, ColumnType, CommitmentAccessor, DataAccessor, MetadataAccessor, SchemaAccessor, TableRef, }, }; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use std::collections::HashMap; #[derive(Default)] diff --git a/crates/proofs/benches/scaffold/mod.rs b/crates/proof-of-sql/benches/scaffold/mod.rs similarity index 99% rename from crates/proofs/benches/scaffold/mod.rs rename to crates/proof-of-sql/benches/scaffold/mod.rs index 24359c9c7..dc011affe 100644 --- a/crates/proofs/benches/scaffold/mod.rs +++ b/crates/proof-of-sql/benches/scaffold/mod.rs @@ -1,7 +1,7 @@ use blitzar::compute::init_backend; use bumpalo::Bump; use criterion::{AxisScale, Criterion, PlotConfiguration}; -use proofs::{ +use proof_of_sql::{ base::{commitment::CommitmentEvaluationProof, database::ColumnType}, sql::{parse::QueryExpr, proof::VerifiableQueryResult}, }; diff --git a/crates/proofs/benches/scaffold/querys.rs b/crates/proof-of-sql/benches/scaffold/querys.rs similarity index 96% rename from crates/proofs/benches/scaffold/querys.rs rename to crates/proof-of-sql/benches/scaffold/querys.rs index 36f8a43af..79815ea42 100644 --- a/crates/proofs/benches/scaffold/querys.rs +++ b/crates/proof-of-sql/benches/scaffold/querys.rs @@ -1,5 +1,5 @@ use super::OptionalRandBound; -use proofs::base::database::ColumnType; +use proof_of_sql::base::database::ColumnType; const SINGLE_COLUMN_FILTER_TITLE: &str = "Single Column Filter"; const SINGLE_COLUMN_FILTER_SQL: &str = "SELECT b FROM table WHERE a = 0"; diff --git a/crates/proofs/benches/scaffold/random_util.rs b/crates/proof-of-sql/benches/scaffold/random_util.rs similarity index 97% rename from crates/proofs/benches/scaffold/random_util.rs rename to crates/proof-of-sql/benches/scaffold/random_util.rs index b4e374e70..b58eebb02 100644 --- a/crates/proofs/benches/scaffold/random_util.rs +++ b/crates/proof-of-sql/benches/scaffold/random_util.rs @@ -1,9 +1,9 @@ use bumpalo::Bump; -use proofs::base::{ +use proof_of_sql::base::{ database::{Column, ColumnType}, scalar::Scalar, }; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use rand::Rng; pub type OptionalRandBound = Option i64>; diff --git a/crates/proofs/examples/hello_world/README.md b/crates/proof-of-sql/examples/hello_world/README.md similarity index 100% rename from crates/proofs/examples/hello_world/README.md rename to crates/proof-of-sql/examples/hello_world/README.md diff --git a/crates/proofs/examples/hello_world/main.rs b/crates/proof-of-sql/examples/hello_world/main.rs similarity index 98% rename from crates/proofs/examples/hello_world/main.rs rename to crates/proof-of-sql/examples/hello_world/main.rs index eadc02562..699a932cb 100644 --- a/crates/proofs/examples/hello_world/main.rs +++ b/crates/proof-of-sql/examples/hello_world/main.rs @@ -1,7 +1,7 @@ #![doc = include_str!("README.md")] use blitzar::{compute::init_backend, proof::InnerProductProof}; -use proofs::{ +use proof_of_sql::{ base::database::{owned_table_utility::*, OwnedTableTestAccessor, TestAccessor}, sql::{parse::QueryExpr, proof::QueryProof}, }; diff --git a/crates/proofs/examples/posql_db/README.md b/crates/proof-of-sql/examples/posql_db/README.md similarity index 82% rename from crates/proofs/examples/posql_db/README.md rename to crates/proof-of-sql/examples/posql_db/README.md index 88df7e891..fc8d858b5 100644 --- a/crates/proofs/examples/posql_db/README.md +++ b/crates/proof-of-sql/examples/posql_db/README.md @@ -3,7 +3,7 @@ Example demonstrating an implementation of a simple csv-backed database with Proof of SQL capabilities. ## Install -Run `cargo install --example posql_db --path crates/proofs` to install the example. +Run `cargo install --example posql_db --path crates/proof-of-sql` to install the example. ## Quick Start Exmaple Run the following diff --git a/crates/proofs/examples/posql_db/commit_accessor.rs b/crates/proof-of-sql/examples/posql_db/commit_accessor.rs similarity index 73% rename from crates/proofs/examples/posql_db/commit_accessor.rs rename to crates/proof-of-sql/examples/posql_db/commit_accessor.rs index 2bf7e7cca..c9e61e519 100644 --- a/crates/proofs/examples/posql_db/commit_accessor.rs +++ b/crates/proof-of-sql/examples/posql_db/commit_accessor.rs @@ -1,4 +1,4 @@ -use proofs::base::{ +use proof_of_sql::base::{ commitment::{Commitment, QueryCommitments, TableCommitment}, database::{CommitmentAccessor, MetadataAccessor, SchemaAccessor, TableRef}, }; @@ -36,32 +36,35 @@ impl Deserialize<'a>> CommitAccessor { } impl CommitmentAccessor for CommitAccessor { - fn get_commitment(&self, column: proofs::base::database::ColumnRef) -> C { + fn get_commitment(&self, column: proof_of_sql::base::database::ColumnRef) -> C { self.inner.get_commitment(column) } } impl MetadataAccessor for CommitAccessor { - fn get_length(&self, table_ref: proofs::base::database::TableRef) -> usize { + fn get_length(&self, table_ref: proof_of_sql::base::database::TableRef) -> usize { self.inner.get_length(table_ref) } - fn get_offset(&self, table_ref: proofs::base::database::TableRef) -> usize { + fn get_offset(&self, table_ref: proof_of_sql::base::database::TableRef) -> usize { self.inner.get_offset(table_ref) } } impl SchemaAccessor for CommitAccessor { fn lookup_column( &self, - table_ref: proofs::base::database::TableRef, - column_id: proofs_sql::Identifier, - ) -> Option { + table_ref: proof_of_sql::base::database::TableRef, + column_id: proof_of_sql_parser::Identifier, + ) -> Option { self.inner.lookup_column(table_ref, column_id) } fn lookup_schema( &self, - table_ref: proofs::base::database::TableRef, - ) -> Vec<(proofs_sql::Identifier, proofs::base::database::ColumnType)> { + table_ref: proof_of_sql::base::database::TableRef, + ) -> Vec<( + proof_of_sql_parser::Identifier, + proof_of_sql::base::database::ColumnType, + )> { self.inner.lookup_schema(table_ref) } } diff --git a/crates/proofs/examples/posql_db/csv_accessor.rs b/crates/proof-of-sql/examples/posql_db/csv_accessor.rs similarity index 92% rename from crates/proofs/examples/posql_db/csv_accessor.rs rename to crates/proof-of-sql/examples/posql_db/csv_accessor.rs index 17f704bc7..fc86e6289 100644 --- a/crates/proofs/examples/posql_db/csv_accessor.rs +++ b/crates/proof-of-sql/examples/posql_db/csv_accessor.rs @@ -1,7 +1,7 @@ use super::record_batch_accessor::RecordBatchAccessor; use arrow::{datatypes::Schema, record_batch::RecordBatch}; use arrow_csv::{ReaderBuilder, WriterBuilder}; -use proofs::base::{ +use proof_of_sql::base::{ database::{Column, ColumnRef, DataAccessor, MetadataAccessor, SchemaAccessor, TableRef}, scalar::Scalar, }; @@ -96,14 +96,17 @@ impl SchemaAccessor for CsvDataAccessor { fn lookup_column( &self, table_ref: TableRef, - column_id: proofs_sql::Identifier, - ) -> Option { + column_id: proof_of_sql_parser::Identifier, + ) -> Option { self.inner.lookup_column(table_ref, column_id) } fn lookup_schema( &self, table_ref: TableRef, - ) -> Vec<(proofs_sql::Identifier, proofs::base::database::ColumnType)> { + ) -> Vec<( + proof_of_sql_parser::Identifier, + proof_of_sql::base::database::ColumnType, + )> { self.inner.lookup_schema(table_ref) } } diff --git a/crates/proofs/examples/posql_db/hello_world.csv b/crates/proof-of-sql/examples/posql_db/hello_world.csv similarity index 100% rename from crates/proofs/examples/posql_db/hello_world.csv rename to crates/proof-of-sql/examples/posql_db/hello_world.csv diff --git a/crates/proofs/examples/posql_db/main.rs b/crates/proof-of-sql/examples/posql_db/main.rs similarity index 99% rename from crates/proofs/examples/posql_db/main.rs rename to crates/proof-of-sql/examples/posql_db/main.rs index 8a22bb975..be28167bd 100644 --- a/crates/proofs/examples/posql_db/main.rs +++ b/crates/proof-of-sql/examples/posql_db/main.rs @@ -12,14 +12,14 @@ use commit_accessor::CommitAccessor; use csv_accessor::{read_record_batch_from_csv, CsvDataAccessor}; use curve25519_dalek::RistrettoPoint; use itertools::Itertools; -use proofs::{ +use proof_of_sql::{ base::{ commitment::TableCommitment, database::{SchemaAccessor, TableRef}, }, sql::{parse::QueryExpr, proof::VerifiableQueryResult}, }; -use proofs_sql::{Identifier, SelectStatement}; +use proof_of_sql_parser::{Identifier, SelectStatement}; use std::{ fs, io::{prelude::Write, stdout}, diff --git a/crates/proofs/examples/posql_db/record_batch_accessor.rs b/crates/proof-of-sql/examples/posql_db/record_batch_accessor.rs similarity index 97% rename from crates/proofs/examples/posql_db/record_batch_accessor.rs rename to crates/proof-of-sql/examples/posql_db/record_batch_accessor.rs index 26cf62434..88ff33c2c 100644 --- a/crates/proofs/examples/posql_db/record_batch_accessor.rs +++ b/crates/proof-of-sql/examples/posql_db/record_batch_accessor.rs @@ -1,13 +1,13 @@ use arrow::record_batch::RecordBatch; use bumpalo::Bump; -use proofs::base::{ +use proof_of_sql::base::{ database::{ ArrayRefExt, Column, ColumnRef, ColumnType, DataAccessor, MetadataAccessor, SchemaAccessor, TableRef, }, scalar::Scalar, }; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use std::collections::HashMap; #[derive(Default)] diff --git a/crates/proofs/examples/posql_db/run_example.sh b/crates/proof-of-sql/examples/posql_db/run_example.sh similarity index 88% rename from crates/proofs/examples/posql_db/run_example.sh rename to crates/proof-of-sql/examples/posql_db/run_example.sh index 6d11ee7e9..ab259fc8e 100644 --- a/crates/proofs/examples/posql_db/run_example.sh +++ b/crates/proof-of-sql/examples/posql_db/run_example.sh @@ -1,4 +1,4 @@ -cd crates/proofs/examples/posql_db +cd crates/proof-of-sql/examples/posql_db cargo run --example posql_db create -t sxt.table -c a,b -d BIGINT,VARCHAR cargo run --example posql_db append -t sxt.table -f hello_world.csv cargo run --example posql_db prove -q "SELECT b FROM sxt.table WHERE a = 2" -f hello.proof diff --git a/crates/proofs/src/base/bit/abs_bit_mask.rs b/crates/proof-of-sql/src/base/bit/abs_bit_mask.rs similarity index 100% rename from crates/proofs/src/base/bit/abs_bit_mask.rs rename to crates/proof-of-sql/src/base/bit/abs_bit_mask.rs diff --git a/crates/proofs/src/base/bit/bit_distribution.rs b/crates/proof-of-sql/src/base/bit/bit_distribution.rs similarity index 100% rename from crates/proofs/src/base/bit/bit_distribution.rs rename to crates/proof-of-sql/src/base/bit/bit_distribution.rs diff --git a/crates/proofs/src/base/bit/bit_distribution_test.rs b/crates/proof-of-sql/src/base/bit/bit_distribution_test.rs similarity index 100% rename from crates/proofs/src/base/bit/bit_distribution_test.rs rename to crates/proof-of-sql/src/base/bit/bit_distribution_test.rs diff --git a/crates/proofs/src/base/bit/bit_matrix.rs b/crates/proof-of-sql/src/base/bit/bit_matrix.rs similarity index 100% rename from crates/proofs/src/base/bit/bit_matrix.rs rename to crates/proof-of-sql/src/base/bit/bit_matrix.rs diff --git a/crates/proofs/src/base/bit/bit_matrix_test.rs b/crates/proof-of-sql/src/base/bit/bit_matrix_test.rs similarity index 100% rename from crates/proofs/src/base/bit/bit_matrix_test.rs rename to crates/proof-of-sql/src/base/bit/bit_matrix_test.rs diff --git a/crates/proofs/src/base/bit/mod.rs b/crates/proof-of-sql/src/base/bit/mod.rs similarity index 100% rename from crates/proofs/src/base/bit/mod.rs rename to crates/proof-of-sql/src/base/bit/mod.rs diff --git a/crates/proofs/src/base/commitment/column_bounds.rs b/crates/proof-of-sql/src/base/commitment/column_bounds.rs similarity index 100% rename from crates/proofs/src/base/commitment/column_bounds.rs rename to crates/proof-of-sql/src/base/commitment/column_bounds.rs diff --git a/crates/proofs/src/base/commitment/column_commitment_metadata.rs b/crates/proof-of-sql/src/base/commitment/column_commitment_metadata.rs similarity index 100% rename from crates/proofs/src/base/commitment/column_commitment_metadata.rs rename to crates/proof-of-sql/src/base/commitment/column_commitment_metadata.rs diff --git a/crates/proofs/src/base/commitment/column_commitment_metadata_map.rs b/crates/proof-of-sql/src/base/commitment/column_commitment_metadata_map.rs similarity index 99% rename from crates/proofs/src/base/commitment/column_commitment_metadata_map.rs rename to crates/proof-of-sql/src/base/commitment/column_commitment_metadata_map.rs index e03df669a..fc41f8d98 100644 --- a/crates/proofs/src/base/commitment/column_commitment_metadata_map.rs +++ b/crates/proof-of-sql/src/base/commitment/column_commitment_metadata_map.rs @@ -4,7 +4,7 @@ use super::{ }; use crate::base::database::ColumnField; use indexmap::IndexMap; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use thiserror::Error; /// Mapping of column identifiers to column metadata used to associate metadata with commitments. diff --git a/crates/proofs/src/base/commitment/column_commitments.rs b/crates/proof-of-sql/src/base/commitment/column_commitments.rs similarity index 99% rename from crates/proofs/src/base/commitment/column_commitments.rs rename to crates/proof-of-sql/src/base/commitment/column_commitments.rs index 8e3f37d46..43be62fb7 100644 --- a/crates/proofs/src/base/commitment/column_commitments.rs +++ b/crates/proof-of-sql/src/base/commitment/column_commitments.rs @@ -3,7 +3,7 @@ use super::{ ColumnCommitmentMetadataMapExt, ColumnCommitmentsMismatch, VecCommitmentExt, }; use crate::base::database::{ColumnField, ColumnRef, CommitmentAccessor, TableRef}; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use serde::{Deserialize, Serialize}; use std::collections::HashSet; use thiserror::Error; diff --git a/crates/proofs/src/base/commitment/commitment_evaluation_proof.rs b/crates/proof-of-sql/src/base/commitment/commitment_evaluation_proof.rs similarity index 100% rename from crates/proofs/src/base/commitment/commitment_evaluation_proof.rs rename to crates/proof-of-sql/src/base/commitment/commitment_evaluation_proof.rs diff --git a/crates/proofs/src/base/commitment/commitment_evaluation_proof_test.rs b/crates/proof-of-sql/src/base/commitment/commitment_evaluation_proof_test.rs similarity index 100% rename from crates/proofs/src/base/commitment/commitment_evaluation_proof_test.rs rename to crates/proof-of-sql/src/base/commitment/commitment_evaluation_proof_test.rs diff --git a/crates/proofs/src/base/commitment/committable_column.rs b/crates/proof-of-sql/src/base/commitment/committable_column.rs similarity index 100% rename from crates/proofs/src/base/commitment/committable_column.rs rename to crates/proof-of-sql/src/base/commitment/committable_column.rs diff --git a/crates/proofs/src/base/commitment/mod.rs b/crates/proof-of-sql/src/base/commitment/mod.rs similarity index 100% rename from crates/proofs/src/base/commitment/mod.rs rename to crates/proof-of-sql/src/base/commitment/mod.rs diff --git a/crates/proofs/src/base/commitment/query_commitments.rs b/crates/proof-of-sql/src/base/commitment/query_commitments.rs similarity index 99% rename from crates/proofs/src/base/commitment/query_commitments.rs rename to crates/proof-of-sql/src/base/commitment/query_commitments.rs index ccda1b000..06f2bc0b4 100644 --- a/crates/proofs/src/base/commitment/query_commitments.rs +++ b/crates/proof-of-sql/src/base/commitment/query_commitments.rs @@ -3,7 +3,7 @@ use crate::base::database::{ ColumnField, ColumnRef, ColumnType, CommitmentAccessor, MetadataAccessor, SchemaAccessor, TableRef, }; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use std::collections::HashMap; /// The commitments for all of the tables in a query. diff --git a/crates/proofs/src/base/commitment/table_commitment.rs b/crates/proof-of-sql/src/base/commitment/table_commitment.rs similarity index 99% rename from crates/proofs/src/base/commitment/table_commitment.rs rename to crates/proof-of-sql/src/base/commitment/table_commitment.rs index e2d98758c..26aff0f4e 100644 --- a/crates/proofs/src/base/commitment/table_commitment.rs +++ b/crates/proof-of-sql/src/base/commitment/table_commitment.rs @@ -11,7 +11,7 @@ use crate::base::{ }; use arrow::record_batch::RecordBatch; use bumpalo::Bump; -use proofs_sql::{Identifier, ParseError}; +use proof_of_sql_parser::{Identifier, ParseError}; use serde::{Deserialize, Serialize}; use std::ops::Range; use thiserror::Error; diff --git a/crates/proofs/src/base/commitment/vec_commitment_ext.rs b/crates/proof-of-sql/src/base/commitment/vec_commitment_ext.rs similarity index 100% rename from crates/proofs/src/base/commitment/vec_commitment_ext.rs rename to crates/proof-of-sql/src/base/commitment/vec_commitment_ext.rs diff --git a/crates/proofs/src/base/database/accessor.rs b/crates/proof-of-sql/src/base/database/accessor.rs similarity index 97% rename from crates/proofs/src/base/database/accessor.rs rename to crates/proof-of-sql/src/base/database/accessor.rs index 185eba137..cd3dbeca9 100644 --- a/crates/proofs/src/base/database/accessor.rs +++ b/crates/proof-of-sql/src/base/database/accessor.rs @@ -3,7 +3,7 @@ use crate::base::{ database::{Column, ColumnRef, ColumnType, TableRef}, scalar::Scalar, }; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; /// Access metadata of a table span in a database. /// @@ -89,7 +89,7 @@ pub trait DataAccessor: MetadataAccessor { /// Access tables and their schemas in a database. /// /// This accessor should be implemented by both the prover and verifier -/// and then used by the proofs code to convert an IntermediateAst +/// and then used by the Proof of SQL code to convert an IntermediateAst /// into a ProofExpr. pub trait SchemaAccessor { /// Lookup the column's data type in the specified table diff --git a/crates/proofs/src/base/database/arrow_array_to_column_conversion.rs b/crates/proof-of-sql/src/base/database/arrow_array_to_column_conversion.rs similarity index 99% rename from crates/proofs/src/base/database/arrow_array_to_column_conversion.rs rename to crates/proof-of-sql/src/base/database/arrow_array_to_column_conversion.rs index 5f9fc3971..2c339d8fe 100644 --- a/crates/proofs/src/base/database/arrow_array_to_column_conversion.rs +++ b/crates/proof-of-sql/src/base/database/arrow_array_to_column_conversion.rs @@ -40,7 +40,7 @@ pub enum ArrowArrayToColumnConversionError { /// This trait is used to provide utility functions to convert ArrayRefs into proof types (Column, Scalars, etc.) pub trait ArrayRefExt { - /// Convert an ArrayRef into a proofs Vec + /// Convert an ArrayRef into a Proof of SQL Vec /// /// Note: this function must not be called from unsupported arrays or arrays with nulls. /// It should only be used during testing. @@ -50,7 +50,7 @@ pub trait ArrayRefExt { &self, ) -> Result, ArrowArrayToColumnConversionError>; - /// Convert an ArrayRef into a proofs Column type + /// Convert an ArrayRef into a Proof of SQL Column type /// /// Parameters: /// - `alloc`: used to allocate a slice of data when necessary diff --git a/crates/proofs/src/base/database/column.rs b/crates/proof-of-sql/src/base/database/column.rs similarity index 99% rename from crates/proofs/src/base/database/column.rs rename to crates/proof-of-sql/src/base/database/column.rs index 6cd727690..b78ec8873 100644 --- a/crates/proofs/src/base/database/column.rs +++ b/crates/proof-of-sql/src/base/database/column.rs @@ -5,7 +5,7 @@ use crate::base::{ }; use arrow::datatypes::{DataType, Field}; use bumpalo::Bump; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use rayon::iter::{IntoParallelRefIterator, ParallelIterator}; use serde::{Deserialize, Serialize}; diff --git a/crates/proofs/src/base/database/literal_value.rs b/crates/proof-of-sql/src/base/database/literal_value.rs similarity index 100% rename from crates/proofs/src/base/database/literal_value.rs rename to crates/proof-of-sql/src/base/database/literal_value.rs diff --git a/crates/proofs/src/base/database/mod.rs b/crates/proof-of-sql/src/base/database/mod.rs similarity index 100% rename from crates/proofs/src/base/database/mod.rs rename to crates/proof-of-sql/src/base/database/mod.rs diff --git a/crates/proofs/src/base/database/owned_and_arrow_conversions.rs b/crates/proof-of-sql/src/base/database/owned_and_arrow_conversions.rs similarity index 99% rename from crates/proofs/src/base/database/owned_and_arrow_conversions.rs rename to crates/proof-of-sql/src/base/database/owned_and_arrow_conversions.rs index 2eed8aa9b..e9f522a2b 100644 --- a/crates/proofs/src/base/database/owned_and_arrow_conversions.rs +++ b/crates/proof-of-sql/src/base/database/owned_and_arrow_conversions.rs @@ -31,7 +31,7 @@ use arrow::{ record_batch::RecordBatch, }; use indexmap::IndexMap; -use proofs_sql::{Identifier, ParseError}; +use proof_of_sql_parser::{Identifier, ParseError}; use std::sync::Arc; use thiserror::Error; diff --git a/crates/proofs/src/base/database/owned_and_arrow_conversions_test.rs b/crates/proof-of-sql/src/base/database/owned_and_arrow_conversions_test.rs similarity index 100% rename from crates/proofs/src/base/database/owned_and_arrow_conversions_test.rs rename to crates/proof-of-sql/src/base/database/owned_and_arrow_conversions_test.rs diff --git a/crates/proofs/src/base/database/owned_column.rs b/crates/proof-of-sql/src/base/database/owned_column.rs similarity index 100% rename from crates/proofs/src/base/database/owned_column.rs rename to crates/proof-of-sql/src/base/database/owned_column.rs diff --git a/crates/proofs/src/base/database/owned_table.rs b/crates/proof-of-sql/src/base/database/owned_table.rs similarity index 99% rename from crates/proofs/src/base/database/owned_table.rs rename to crates/proof-of-sql/src/base/database/owned_table.rs index e7ec3e312..a26817394 100644 --- a/crates/proofs/src/base/database/owned_table.rs +++ b/crates/proof-of-sql/src/base/database/owned_table.rs @@ -1,7 +1,7 @@ use super::OwnedColumn; use crate::base::scalar::Scalar; use indexmap::IndexMap; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use thiserror::Error; /// An error that occurs when working with tables. diff --git a/crates/proofs/src/base/database/owned_table_test.rs b/crates/proof-of-sql/src/base/database/owned_table_test.rs similarity index 99% rename from crates/proofs/src/base/database/owned_table_test.rs rename to crates/proof-of-sql/src/base/database/owned_table_test.rs index e5536bf31..3a9e3c297 100644 --- a/crates/proofs/src/base/database/owned_table_test.rs +++ b/crates/proof-of-sql/src/base/database/owned_table_test.rs @@ -6,7 +6,7 @@ use crate::{ proof_primitive::dory::DoryScalar, }; use indexmap::IndexMap; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; #[test] fn we_can_create_an_owned_table_with_no_columns() { diff --git a/crates/proofs/src/base/database/owned_table_test_accessor.rs b/crates/proof-of-sql/src/base/database/owned_table_test_accessor.rs similarity index 99% rename from crates/proofs/src/base/database/owned_table_test_accessor.rs rename to crates/proof-of-sql/src/base/database/owned_table_test_accessor.rs index 24ca4683b..dd790aa25 100644 --- a/crates/proofs/src/base/database/owned_table_test_accessor.rs +++ b/crates/proof-of-sql/src/base/database/owned_table_test_accessor.rs @@ -5,7 +5,7 @@ use super::{ use crate::base::commitment::{CommitmentEvaluationProof, VecCommitmentExt}; use bumpalo::Bump; use indexmap::IndexMap; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; /// A test accessor that uses OwnedTable as the underlying table type. /// Note: this is not optimized for performance, so should not be used for benchmarks. diff --git a/crates/proofs/src/base/database/owned_table_test_accessor_test.rs b/crates/proof-of-sql/src/base/database/owned_table_test_accessor_test.rs similarity index 100% rename from crates/proofs/src/base/database/owned_table_test_accessor_test.rs rename to crates/proof-of-sql/src/base/database/owned_table_test_accessor_test.rs diff --git a/crates/proofs/src/base/database/owned_table_utility.rs b/crates/proof-of-sql/src/base/database/owned_table_utility.rs similarity index 86% rename from crates/proofs/src/base/database/owned_table_utility.rs rename to crates/proof-of-sql/src/base/database/owned_table_utility.rs index 31e29990f..bf36acbbf 100644 --- a/crates/proofs/src/base/database/owned_table_utility.rs +++ b/crates/proof-of-sql/src/base/database/owned_table_utility.rs @@ -3,7 +3,7 @@ //! //! # Example //! ``` -//! use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +//! use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; //! let result = owned_table::([ //! bigint("a", [1, 2, 3]), //! boolean("b", [true, false, true]), @@ -16,7 +16,7 @@ use super::{OwnedColumn, OwnedTable}; use crate::base::scalar::Scalar; use core::ops::Deref; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; /// Creates an OwnedTable from a list of (Identifier, OwnedColumn) pairs. /// This is a convenience wrapper around OwnedTable::try_from_iter primarily for use in tests and @@ -25,7 +25,7 @@ use proofs_sql::Identifier; /// /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// bigint("a", [1, 2, 3]), /// boolean("b", [true, false, true]), @@ -45,7 +45,7 @@ pub fn owned_table( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// smallint("a", [1_i16, 2, 3]), /// ]); @@ -63,7 +63,7 @@ pub fn smallint( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// int("a", [1, 2, 3]), /// ]); @@ -81,7 +81,7 @@ pub fn int( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// bigint("a", [1, 2, 3]), /// ]); @@ -99,7 +99,7 @@ pub fn bigint( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// boolean("a", [true, false, true]), /// ]); @@ -118,7 +118,7 @@ pub fn boolean( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// int128("a", [1, 2, 3]), /// ]); @@ -137,7 +137,7 @@ pub fn int128( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// scalar("a", [1, 2, 3]), /// ]); @@ -156,7 +156,7 @@ pub fn scalar( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// varchar("a", ["a", "b", "c"]), /// ]); @@ -175,7 +175,7 @@ pub fn varchar( /// This is primarily intended for use in conjunction with [owned_table]. /// # Example /// ``` -/// use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; +/// use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar}; /// let result = owned_table::([ /// decimal75("a", 12, 1, [1, 2, 3]), /// ]); diff --git a/crates/proofs/src/base/database/record_batch_dataframe_conversion.rs b/crates/proof-of-sql/src/base/database/record_batch_dataframe_conversion.rs similarity index 100% rename from crates/proofs/src/base/database/record_batch_dataframe_conversion.rs rename to crates/proof-of-sql/src/base/database/record_batch_dataframe_conversion.rs diff --git a/crates/proofs/src/base/database/record_batch_test_accessor.rs b/crates/proof-of-sql/src/base/database/record_batch_test_accessor.rs similarity index 99% rename from crates/proofs/src/base/database/record_batch_test_accessor.rs rename to crates/proof-of-sql/src/base/database/record_batch_test_accessor.rs index 20b9d9b35..a67766ae4 100644 --- a/crates/proofs/src/base/database/record_batch_test_accessor.rs +++ b/crates/proof-of-sql/src/base/database/record_batch_test_accessor.rs @@ -9,7 +9,7 @@ use bumpalo::Bump; use curve25519_dalek::ristretto::RistrettoPoint; use indexmap::IndexMap; use polars::prelude::DataFrame; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use std::collections::HashMap; /// TestTable is used to simulate an in-memory table and commitment tracking table. diff --git a/crates/proofs/src/base/database/record_batch_test_accessor_test.rs b/crates/proof-of-sql/src/base/database/record_batch_test_accessor_test.rs similarity index 100% rename from crates/proofs/src/base/database/record_batch_test_accessor_test.rs rename to crates/proof-of-sql/src/base/database/record_batch_test_accessor_test.rs diff --git a/crates/proofs/src/base/database/record_batch_utility.rs b/crates/proof-of-sql/src/base/database/record_batch_utility.rs similarity index 100% rename from crates/proofs/src/base/database/record_batch_utility.rs rename to crates/proof-of-sql/src/base/database/record_batch_utility.rs diff --git a/crates/proofs/src/base/database/scalar_and_i256_conversions.rs b/crates/proof-of-sql/src/base/database/scalar_and_i256_conversions.rs similarity index 100% rename from crates/proofs/src/base/database/scalar_and_i256_conversions.rs rename to crates/proof-of-sql/src/base/database/scalar_and_i256_conversions.rs diff --git a/crates/proofs/src/base/database/table_ref.rs b/crates/proof-of-sql/src/base/database/table_ref.rs similarity index 89% rename from crates/proofs/src/base/database/table_ref.rs rename to crates/proof-of-sql/src/base/database/table_ref.rs index c959526b3..ae02ffaca 100644 --- a/crates/proofs/src/base/database/table_ref.rs +++ b/crates/proof-of-sql/src/base/database/table_ref.rs @@ -1,4 +1,4 @@ -use proofs_sql::{impl_serde_from_str, Identifier, ResourceId}; +use proof_of_sql_parser::{impl_serde_from_str, Identifier, ResourceId}; use std::str::FromStr; /// Expression for an SQL table @@ -30,7 +30,7 @@ impl TableRef { } impl FromStr for TableRef { - type Err = proofs_sql::ParseError; + type Err = proof_of_sql_parser::ParseError; fn from_str(s: &str) -> Result { Ok(Self::new(s.parse()?)) diff --git a/crates/proofs/src/base/database/test_accessor.rs b/crates/proof-of-sql/src/base/database/test_accessor.rs similarity index 98% rename from crates/proofs/src/base/database/test_accessor.rs rename to crates/proof-of-sql/src/base/database/test_accessor.rs index c018bd17c..f76dd8989 100644 --- a/crates/proofs/src/base/database/test_accessor.rs +++ b/crates/proof-of-sql/src/base/database/test_accessor.rs @@ -4,7 +4,7 @@ use super::{ }; use crate::base::{commitment::Commitment, scalar::Curve25519Scalar}; use curve25519_dalek::ristretto::RistrettoPoint; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; /// A trait that defines the interface for a combined metadata, schema, commitment, and data accessor for unit testing purposes. pub trait TestAccessor: diff --git a/crates/proofs/src/base/database/test_accessor_utility.rs b/crates/proof-of-sql/src/base/database/test_accessor_utility.rs similarity index 100% rename from crates/proofs/src/base/database/test_accessor_utility.rs rename to crates/proof-of-sql/src/base/database/test_accessor_utility.rs diff --git a/crates/proofs/src/base/encode/mod.rs b/crates/proof-of-sql/src/base/encode/mod.rs similarity index 100% rename from crates/proofs/src/base/encode/mod.rs rename to crates/proof-of-sql/src/base/encode/mod.rs diff --git a/crates/proofs/src/base/encode/scalar_varint.rs b/crates/proof-of-sql/src/base/encode/scalar_varint.rs similarity index 100% rename from crates/proofs/src/base/encode/scalar_varint.rs rename to crates/proof-of-sql/src/base/encode/scalar_varint.rs diff --git a/crates/proofs/src/base/encode/scalar_varint_test.rs b/crates/proof-of-sql/src/base/encode/scalar_varint_test.rs similarity index 100% rename from crates/proofs/src/base/encode/scalar_varint_test.rs rename to crates/proof-of-sql/src/base/encode/scalar_varint_test.rs diff --git a/crates/proofs/src/base/encode/u256.rs b/crates/proof-of-sql/src/base/encode/u256.rs similarity index 100% rename from crates/proofs/src/base/encode/u256.rs rename to crates/proof-of-sql/src/base/encode/u256.rs diff --git a/crates/proofs/src/base/encode/varint_trait.rs b/crates/proof-of-sql/src/base/encode/varint_trait.rs similarity index 100% rename from crates/proofs/src/base/encode/varint_trait.rs rename to crates/proof-of-sql/src/base/encode/varint_trait.rs diff --git a/crates/proofs/src/base/encode/varint_trait_test.rs b/crates/proof-of-sql/src/base/encode/varint_trait_test.rs similarity index 100% rename from crates/proofs/src/base/encode/varint_trait_test.rs rename to crates/proof-of-sql/src/base/encode/varint_trait_test.rs diff --git a/crates/proofs/src/base/encode/zigzag.rs b/crates/proof-of-sql/src/base/encode/zigzag.rs similarity index 100% rename from crates/proofs/src/base/encode/zigzag.rs rename to crates/proof-of-sql/src/base/encode/zigzag.rs diff --git a/crates/proofs/src/base/encode/zigzag_test.rs b/crates/proof-of-sql/src/base/encode/zigzag_test.rs similarity index 100% rename from crates/proofs/src/base/encode/zigzag_test.rs rename to crates/proof-of-sql/src/base/encode/zigzag_test.rs diff --git a/crates/proofs/src/base/math/decimal.rs b/crates/proof-of-sql/src/base/math/decimal.rs similarity index 99% rename from crates/proofs/src/base/math/decimal.rs rename to crates/proof-of-sql/src/base/math/decimal.rs index d82f5ef76..38f19013b 100644 --- a/crates/proofs/src/base/math/decimal.rs +++ b/crates/proof-of-sql/src/base/math/decimal.rs @@ -3,7 +3,7 @@ use crate::{ base::scalar::Scalar, sql::parse::{ConversionError, ConversionResult}, }; -use proofs_sql::intermediate_decimal::IntermediateDecimal; +use proof_of_sql_parser::intermediate_decimal::IntermediateDecimal; use serde::{Deserialize, Deserializer, Serialize}; #[derive(Eq, PartialEq, Debug, Clone, Hash, Serialize, Copy)] diff --git a/crates/proofs/src/base/math/decimal_tests.rs b/crates/proof-of-sql/src/base/math/decimal_tests.rs similarity index 100% rename from crates/proofs/src/base/math/decimal_tests.rs rename to crates/proof-of-sql/src/base/math/decimal_tests.rs diff --git a/crates/proofs/src/base/math/log.rs b/crates/proof-of-sql/src/base/math/log.rs similarity index 100% rename from crates/proofs/src/base/math/log.rs rename to crates/proof-of-sql/src/base/math/log.rs diff --git a/crates/proofs/src/base/math/mod.rs b/crates/proof-of-sql/src/base/math/mod.rs similarity index 76% rename from crates/proofs/src/base/math/mod.rs rename to crates/proof-of-sql/src/base/math/mod.rs index a84aedab5..d53282077 100644 --- a/crates/proofs/src/base/math/mod.rs +++ b/crates/proof-of-sql/src/base/math/mod.rs @@ -1,4 +1,4 @@ -//! Handles parsing between decimal tokens received from the lexer into native `Decimal75` proofs type. +//! Handles parsing between decimal tokens received from the lexer into native `Decimal75` Proof of SQL type. pub mod decimal; #[cfg(test)] mod decimal_tests; diff --git a/crates/proofs/src/base/mod.rs b/crates/proof-of-sql/src/base/mod.rs similarity index 100% rename from crates/proofs/src/base/mod.rs rename to crates/proof-of-sql/src/base/mod.rs diff --git a/crates/proofs/src/base/polynomial/composite_polynomial.rs b/crates/proof-of-sql/src/base/polynomial/composite_polynomial.rs similarity index 100% rename from crates/proofs/src/base/polynomial/composite_polynomial.rs rename to crates/proof-of-sql/src/base/polynomial/composite_polynomial.rs diff --git a/crates/proofs/src/base/polynomial/composite_polynomial_test.rs b/crates/proof-of-sql/src/base/polynomial/composite_polynomial_test.rs similarity index 100% rename from crates/proofs/src/base/polynomial/composite_polynomial_test.rs rename to crates/proof-of-sql/src/base/polynomial/composite_polynomial_test.rs diff --git a/crates/proofs/src/base/polynomial/evaluation_vector.rs b/crates/proof-of-sql/src/base/polynomial/evaluation_vector.rs similarity index 100% rename from crates/proofs/src/base/polynomial/evaluation_vector.rs rename to crates/proof-of-sql/src/base/polynomial/evaluation_vector.rs diff --git a/crates/proofs/src/base/polynomial/evaluation_vector_test.rs b/crates/proof-of-sql/src/base/polynomial/evaluation_vector_test.rs similarity index 100% rename from crates/proofs/src/base/polynomial/evaluation_vector_test.rs rename to crates/proof-of-sql/src/base/polynomial/evaluation_vector_test.rs diff --git a/crates/proofs/src/base/polynomial/interpolate.rs b/crates/proof-of-sql/src/base/polynomial/interpolate.rs similarity index 100% rename from crates/proofs/src/base/polynomial/interpolate.rs rename to crates/proof-of-sql/src/base/polynomial/interpolate.rs diff --git a/crates/proofs/src/base/polynomial/interpolate_test.rs b/crates/proof-of-sql/src/base/polynomial/interpolate_test.rs similarity index 100% rename from crates/proofs/src/base/polynomial/interpolate_test.rs rename to crates/proof-of-sql/src/base/polynomial/interpolate_test.rs diff --git a/crates/proofs/src/base/polynomial/lagrange_basis_evaluation.rs b/crates/proof-of-sql/src/base/polynomial/lagrange_basis_evaluation.rs similarity index 100% rename from crates/proofs/src/base/polynomial/lagrange_basis_evaluation.rs rename to crates/proof-of-sql/src/base/polynomial/lagrange_basis_evaluation.rs diff --git a/crates/proofs/src/base/polynomial/lagrange_basis_evaluation_test.rs b/crates/proof-of-sql/src/base/polynomial/lagrange_basis_evaluation_test.rs similarity index 100% rename from crates/proofs/src/base/polynomial/lagrange_basis_evaluation_test.rs rename to crates/proof-of-sql/src/base/polynomial/lagrange_basis_evaluation_test.rs diff --git a/crates/proofs/src/base/polynomial/mod.rs b/crates/proof-of-sql/src/base/polynomial/mod.rs similarity index 100% rename from crates/proofs/src/base/polynomial/mod.rs rename to crates/proof-of-sql/src/base/polynomial/mod.rs diff --git a/crates/proofs/src/base/polynomial/multilinear_extension.rs b/crates/proof-of-sql/src/base/polynomial/multilinear_extension.rs similarity index 100% rename from crates/proofs/src/base/polynomial/multilinear_extension.rs rename to crates/proof-of-sql/src/base/polynomial/multilinear_extension.rs diff --git a/crates/proofs/src/base/polynomial/multilinear_extension_test.rs b/crates/proof-of-sql/src/base/polynomial/multilinear_extension_test.rs similarity index 100% rename from crates/proofs/src/base/polynomial/multilinear_extension_test.rs rename to crates/proof-of-sql/src/base/polynomial/multilinear_extension_test.rs diff --git a/crates/proofs/src/base/proof/error.rs b/crates/proof-of-sql/src/base/proof/error.rs similarity index 100% rename from crates/proofs/src/base/proof/error.rs rename to crates/proof-of-sql/src/base/proof/error.rs diff --git a/crates/proofs/src/base/proof/mod.rs b/crates/proof-of-sql/src/base/proof/mod.rs similarity index 100% rename from crates/proofs/src/base/proof/mod.rs rename to crates/proof-of-sql/src/base/proof/mod.rs diff --git a/crates/proofs/src/base/proof/transcript_protocol.rs b/crates/proof-of-sql/src/base/proof/transcript_protocol.rs similarity index 98% rename from crates/proofs/src/base/proof/transcript_protocol.rs rename to crates/proof-of-sql/src/base/proof/transcript_protocol.rs index 2f4b23fa9..c4a444afe 100644 --- a/crates/proofs/src/base/proof/transcript_protocol.rs +++ b/crates/proof-of-sql/src/base/proof/transcript_protocol.rs @@ -9,7 +9,7 @@ use merlin::Transcript; /// /// In most cases it looks like this: /// ```ignore -/// use proofs::base::proof::{Commitment, MessageLabel, transcript::Transcript}; +/// use proof_of_sql::base::proof::{Commitment, MessageLabel, transcript::Transcript}; /// use crate::base::polynomial::Scalar; /// let mut transcript = Transcript::new(b"my-protocol-name"); /// diff --git a/crates/proofs/src/base/proof/transcript_protocol_test.rs b/crates/proof-of-sql/src/base/proof/transcript_protocol_test.rs similarity index 100% rename from crates/proofs/src/base/proof/transcript_protocol_test.rs rename to crates/proof-of-sql/src/base/proof/transcript_protocol_test.rs diff --git a/crates/proofs/src/base/ref_into.rs b/crates/proof-of-sql/src/base/ref_into.rs similarity index 100% rename from crates/proofs/src/base/ref_into.rs rename to crates/proof-of-sql/src/base/ref_into.rs diff --git a/crates/proofs/src/base/scalar/commitment_utility.rs b/crates/proof-of-sql/src/base/scalar/commitment_utility.rs similarity index 100% rename from crates/proofs/src/base/scalar/commitment_utility.rs rename to crates/proof-of-sql/src/base/scalar/commitment_utility.rs diff --git a/crates/proofs/src/base/scalar/error.rs b/crates/proof-of-sql/src/base/scalar/error.rs similarity index 100% rename from crates/proofs/src/base/scalar/error.rs rename to crates/proof-of-sql/src/base/scalar/error.rs diff --git a/crates/proofs/src/base/scalar/mod.rs b/crates/proof-of-sql/src/base/scalar/mod.rs similarity index 98% rename from crates/proofs/src/base/scalar/mod.rs rename to crates/proof-of-sql/src/base/scalar/mod.rs index eaeb8b160..9ff4f56b2 100644 --- a/crates/proofs/src/base/scalar/mod.rs +++ b/crates/proof-of-sql/src/base/scalar/mod.rs @@ -1,4 +1,4 @@ -//! This module contains the definition of the `Scalar` trait, which is used to represent the scalar field used in proofs. +//! This module contains the definition of the `Scalar` trait, which is used to represent the scalar field used in Proof of SQL. mod error; pub use error::ScalarConversionError; mod mont_scalar; @@ -20,7 +20,7 @@ mod commitment_utility; pub use commitment_utility::compute_commitment_for_testing; use num_bigint::BigInt; -/// A trait for the scalar field used in proofs. +/// A trait for the scalar field used in Proof of SQL. pub trait Scalar: Clone + core::fmt::Debug diff --git a/crates/proofs/src/base/scalar/mont_scalar.rs b/crates/proof-of-sql/src/base/scalar/mont_scalar.rs similarity index 100% rename from crates/proofs/src/base/scalar/mont_scalar.rs rename to crates/proof-of-sql/src/base/scalar/mont_scalar.rs diff --git a/crates/proofs/src/base/scalar/mont_scalar_from.rs b/crates/proof-of-sql/src/base/scalar/mont_scalar_from.rs similarity index 100% rename from crates/proofs/src/base/scalar/mont_scalar_from.rs rename to crates/proof-of-sql/src/base/scalar/mont_scalar_from.rs diff --git a/crates/proofs/src/base/scalar/mont_scalar_from_test.rs b/crates/proof-of-sql/src/base/scalar/mont_scalar_from_test.rs similarity index 100% rename from crates/proofs/src/base/scalar/mont_scalar_from_test.rs rename to crates/proof-of-sql/src/base/scalar/mont_scalar_from_test.rs diff --git a/crates/proofs/src/base/scalar/mont_scalar_test.rs b/crates/proof-of-sql/src/base/scalar/mont_scalar_test.rs similarity index 100% rename from crates/proofs/src/base/scalar/mont_scalar_test.rs rename to crates/proof-of-sql/src/base/scalar/mont_scalar_test.rs diff --git a/crates/proofs/src/base/serialize.rs b/crates/proof-of-sql/src/base/serialize.rs similarity index 100% rename from crates/proofs/src/base/serialize.rs rename to crates/proof-of-sql/src/base/serialize.rs diff --git a/crates/proofs/src/base/slice_ops/batch_inverse.rs b/crates/proof-of-sql/src/base/slice_ops/batch_inverse.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/batch_inverse.rs rename to crates/proof-of-sql/src/base/slice_ops/batch_inverse.rs diff --git a/crates/proofs/src/base/slice_ops/batch_inverse_test.rs b/crates/proof-of-sql/src/base/slice_ops/batch_inverse_test.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/batch_inverse_test.rs rename to crates/proof-of-sql/src/base/slice_ops/batch_inverse_test.rs diff --git a/crates/proofs/src/base/slice_ops/inner_product.rs b/crates/proof-of-sql/src/base/slice_ops/inner_product.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/inner_product.rs rename to crates/proof-of-sql/src/base/slice_ops/inner_product.rs diff --git a/crates/proofs/src/base/slice_ops/inner_product_test.rs b/crates/proof-of-sql/src/base/slice_ops/inner_product_test.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/inner_product_test.rs rename to crates/proof-of-sql/src/base/slice_ops/inner_product_test.rs diff --git a/crates/proofs/src/base/slice_ops/mod.rs b/crates/proof-of-sql/src/base/slice_ops/mod.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/mod.rs rename to crates/proof-of-sql/src/base/slice_ops/mod.rs diff --git a/crates/proofs/src/base/slice_ops/mul_add_assign.rs b/crates/proof-of-sql/src/base/slice_ops/mul_add_assign.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/mul_add_assign.rs rename to crates/proof-of-sql/src/base/slice_ops/mul_add_assign.rs diff --git a/crates/proofs/src/base/slice_ops/mul_add_assign_test.rs b/crates/proof-of-sql/src/base/slice_ops/mul_add_assign_test.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/mul_add_assign_test.rs rename to crates/proof-of-sql/src/base/slice_ops/mul_add_assign_test.rs diff --git a/crates/proofs/src/base/slice_ops/slice_cast.rs b/crates/proof-of-sql/src/base/slice_ops/slice_cast.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/slice_cast.rs rename to crates/proof-of-sql/src/base/slice_ops/slice_cast.rs diff --git a/crates/proofs/src/base/slice_ops/slice_cast_test.rs b/crates/proof-of-sql/src/base/slice_ops/slice_cast_test.rs similarity index 100% rename from crates/proofs/src/base/slice_ops/slice_cast_test.rs rename to crates/proof-of-sql/src/base/slice_ops/slice_cast_test.rs diff --git a/crates/proofs/src/lib.rs b/crates/proof-of-sql/src/lib.rs similarity index 100% rename from crates/proofs/src/lib.rs rename to crates/proof-of-sql/src/lib.rs diff --git a/crates/proofs/src/proof_primitive/dory/build_vmv_state.rs b/crates/proof-of-sql/src/proof_primitive/dory/build_vmv_state.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/build_vmv_state.rs rename to crates/proof-of-sql/src/proof_primitive/dory/build_vmv_state.rs diff --git a/crates/proofs/src/proof_primitive/dory/deferred_msm.rs b/crates/proof-of-sql/src/proof_primitive/dory/deferred_msm.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/deferred_msm.rs rename to crates/proof-of-sql/src/proof_primitive/dory/deferred_msm.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_commitment.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_commitment.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_commitment.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_commitment.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_commitment_evaluation_proof.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_evaluation_proof.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_commitment_evaluation_proof.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_evaluation_proof.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_commitment_evaluation_proof_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_evaluation_proof_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_commitment_evaluation_proof_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_evaluation_proof_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_commitment_helper_cpu.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_helper_cpu.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_commitment_helper_cpu.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_helper_cpu.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_commitment_helper_gpu.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_helper_gpu.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_commitment_helper_gpu.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_helper_gpu.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_commitment_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_commitment_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_commitment_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_compute_commitments_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_compute_commitments_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_compute_commitments_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_compute_commitments_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_inner_product.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_inner_product.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_inner_product.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_inner_product.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_inner_product_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_inner_product_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_inner_product_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_inner_product_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_messages.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_messages.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_messages.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_messages.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_messages_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_messages_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_messages_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_messages_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_public_setup.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_public_setup.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_public_setup.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_public_setup.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_reduce.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_reduce.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_reduce.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_reduce.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_reduce_helper.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_reduce_helper.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_reduce_helper.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_reduce_helper.rs diff --git a/crates/proofs/src/proof_primitive/dory/dory_vmv_helper.rs b/crates/proof-of-sql/src/proof_primitive/dory/dory_vmv_helper.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/dory_vmv_helper.rs rename to crates/proof-of-sql/src/proof_primitive/dory/dory_vmv_helper.rs diff --git a/crates/proofs/src/proof_primitive/dory/eval_vmv_re.rs b/crates/proof-of-sql/src/proof_primitive/dory/eval_vmv_re.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/eval_vmv_re.rs rename to crates/proof-of-sql/src/proof_primitive/dory/eval_vmv_re.rs diff --git a/crates/proofs/src/proof_primitive/dory/eval_vmv_re_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/eval_vmv_re_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/eval_vmv_re_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/eval_vmv_re_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/extended_dory_inner_product.rs b/crates/proof-of-sql/src/proof_primitive/dory/extended_dory_inner_product.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/extended_dory_inner_product.rs rename to crates/proof-of-sql/src/proof_primitive/dory/extended_dory_inner_product.rs diff --git a/crates/proofs/src/proof_primitive/dory/extended_dory_inner_product_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/extended_dory_inner_product_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/extended_dory_inner_product_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/extended_dory_inner_product_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/extended_dory_reduce.rs b/crates/proof-of-sql/src/proof_primitive/dory/extended_dory_reduce.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/extended_dory_reduce.rs rename to crates/proof-of-sql/src/proof_primitive/dory/extended_dory_reduce.rs diff --git a/crates/proofs/src/proof_primitive/dory/extended_dory_reduce_helper.rs b/crates/proof-of-sql/src/proof_primitive/dory/extended_dory_reduce_helper.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/extended_dory_reduce_helper.rs rename to crates/proof-of-sql/src/proof_primitive/dory/extended_dory_reduce_helper.rs diff --git a/crates/proofs/src/proof_primitive/dory/extended_state.rs b/crates/proof-of-sql/src/proof_primitive/dory/extended_state.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/extended_state.rs rename to crates/proof-of-sql/src/proof_primitive/dory/extended_state.rs diff --git a/crates/proofs/src/proof_primitive/dory/extended_state_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/extended_state_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/extended_state_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/extended_state_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/fold_scalars.rs b/crates/proof-of-sql/src/proof_primitive/dory/fold_scalars.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/fold_scalars.rs rename to crates/proof-of-sql/src/proof_primitive/dory/fold_scalars.rs diff --git a/crates/proofs/src/proof_primitive/dory/fold_scalars_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/fold_scalars_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/fold_scalars_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/fold_scalars_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/mod.rs b/crates/proof-of-sql/src/proof_primitive/dory/mod.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/mod.rs rename to crates/proof-of-sql/src/proof_primitive/dory/mod.rs diff --git a/crates/proofs/src/proof_primitive/dory/pairings.rs b/crates/proof-of-sql/src/proof_primitive/dory/pairings.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/pairings.rs rename to crates/proof-of-sql/src/proof_primitive/dory/pairings.rs diff --git a/crates/proofs/src/proof_primitive/dory/public_parameters.rs b/crates/proof-of-sql/src/proof_primitive/dory/public_parameters.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/public_parameters.rs rename to crates/proof-of-sql/src/proof_primitive/dory/public_parameters.rs diff --git a/crates/proofs/src/proof_primitive/dory/rand_util.rs b/crates/proof-of-sql/src/proof_primitive/dory/rand_util.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/rand_util.rs rename to crates/proof-of-sql/src/proof_primitive/dory/rand_util.rs diff --git a/crates/proofs/src/proof_primitive/dory/scalar_product.rs b/crates/proof-of-sql/src/proof_primitive/dory/scalar_product.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/scalar_product.rs rename to crates/proof-of-sql/src/proof_primitive/dory/scalar_product.rs diff --git a/crates/proofs/src/proof_primitive/dory/setup.rs b/crates/proof-of-sql/src/proof_primitive/dory/setup.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/setup.rs rename to crates/proof-of-sql/src/proof_primitive/dory/setup.rs diff --git a/crates/proofs/src/proof_primitive/dory/setup_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/setup_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/setup_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/setup_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/state.rs b/crates/proof-of-sql/src/proof_primitive/dory/state.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/state.rs rename to crates/proof-of-sql/src/proof_primitive/dory/state.rs diff --git a/crates/proofs/src/proof_primitive/dory/state_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/state_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/state_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/state_test.rs diff --git a/crates/proofs/src/proof_primitive/dory/vmv_state.rs b/crates/proof-of-sql/src/proof_primitive/dory/vmv_state.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/vmv_state.rs rename to crates/proof-of-sql/src/proof_primitive/dory/vmv_state.rs diff --git a/crates/proofs/src/proof_primitive/dory/vmv_state_test.rs b/crates/proof-of-sql/src/proof_primitive/dory/vmv_state_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/dory/vmv_state_test.rs rename to crates/proof-of-sql/src/proof_primitive/dory/vmv_state_test.rs diff --git a/crates/proofs/src/proof_primitive/mod.rs b/crates/proof-of-sql/src/proof_primitive/mod.rs similarity index 100% rename from crates/proofs/src/proof_primitive/mod.rs rename to crates/proof-of-sql/src/proof_primitive/mod.rs diff --git a/crates/proofs/src/proof_primitive/sumcheck/mod.rs b/crates/proof-of-sql/src/proof_primitive/sumcheck/mod.rs similarity index 100% rename from crates/proofs/src/proof_primitive/sumcheck/mod.rs rename to crates/proof-of-sql/src/proof_primitive/sumcheck/mod.rs diff --git a/crates/proofs/src/proof_primitive/sumcheck/proof.rs b/crates/proof-of-sql/src/proof_primitive/sumcheck/proof.rs similarity index 100% rename from crates/proofs/src/proof_primitive/sumcheck/proof.rs rename to crates/proof-of-sql/src/proof_primitive/sumcheck/proof.rs diff --git a/crates/proofs/src/proof_primitive/sumcheck/proof_test.rs b/crates/proof-of-sql/src/proof_primitive/sumcheck/proof_test.rs similarity index 100% rename from crates/proofs/src/proof_primitive/sumcheck/proof_test.rs rename to crates/proof-of-sql/src/proof_primitive/sumcheck/proof_test.rs diff --git a/crates/proofs/src/proof_primitive/sumcheck/prover_round.rs b/crates/proof-of-sql/src/proof_primitive/sumcheck/prover_round.rs similarity index 100% rename from crates/proofs/src/proof_primitive/sumcheck/prover_round.rs rename to crates/proof-of-sql/src/proof_primitive/sumcheck/prover_round.rs diff --git a/crates/proofs/src/proof_primitive/sumcheck/prover_state.rs b/crates/proof-of-sql/src/proof_primitive/sumcheck/prover_state.rs similarity index 100% rename from crates/proofs/src/proof_primitive/sumcheck/prover_state.rs rename to crates/proof-of-sql/src/proof_primitive/sumcheck/prover_state.rs diff --git a/crates/proofs/src/proof_primitive/sumcheck/subclaim.rs b/crates/proof-of-sql/src/proof_primitive/sumcheck/subclaim.rs similarity index 100% rename from crates/proofs/src/proof_primitive/sumcheck/subclaim.rs rename to crates/proof-of-sql/src/proof_primitive/sumcheck/subclaim.rs diff --git a/crates/proofs/src/sql/ast/and_expr.rs b/crates/proof-of-sql/src/sql/ast/and_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/and_expr.rs rename to crates/proof-of-sql/src/sql/ast/and_expr.rs diff --git a/crates/proofs/src/sql/ast/and_expr_test.rs b/crates/proof-of-sql/src/sql/ast/and_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/and_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/and_expr_test.rs diff --git a/crates/proofs/src/sql/ast/bitwise_verification.rs b/crates/proof-of-sql/src/sql/ast/bitwise_verification.rs similarity index 100% rename from crates/proofs/src/sql/ast/bitwise_verification.rs rename to crates/proof-of-sql/src/sql/ast/bitwise_verification.rs diff --git a/crates/proofs/src/sql/ast/bitwise_verification_test.rs b/crates/proof-of-sql/src/sql/ast/bitwise_verification_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/bitwise_verification_test.rs rename to crates/proof-of-sql/src/sql/ast/bitwise_verification_test.rs diff --git a/crates/proofs/src/sql/ast/column_expr.rs b/crates/proof-of-sql/src/sql/ast/column_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/column_expr.rs rename to crates/proof-of-sql/src/sql/ast/column_expr.rs diff --git a/crates/proofs/src/sql/ast/column_expr_test.rs b/crates/proof-of-sql/src/sql/ast/column_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/column_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/column_expr_test.rs diff --git a/crates/proofs/src/sql/ast/comparison_util.rs b/crates/proof-of-sql/src/sql/ast/comparison_util.rs similarity index 98% rename from crates/proofs/src/sql/ast/comparison_util.rs rename to crates/proof-of-sql/src/sql/ast/comparison_util.rs index 2215a6cc2..382bd2c70 100644 --- a/crates/proofs/src/sql/ast/comparison_util.rs +++ b/crates/proof-of-sql/src/sql/ast/comparison_util.rs @@ -7,7 +7,7 @@ use crate::{ sql::parse::{type_check_binary_operation, ConversionError, ConversionResult}, }; use bumpalo::Bump; -use proofs_sql::intermediate_ast::BinaryOperator; +use proof_of_sql_parser::intermediate_ast::BinaryOperator; use rayon::iter::{ IndexedParallelIterator, IntoParallelRefIterator, IntoParallelRefMutIterator, ParallelIterator, }; diff --git a/crates/proofs/src/sql/ast/dense_filter_expr.rs b/crates/proof-of-sql/src/sql/ast/dense_filter_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/dense_filter_expr.rs rename to crates/proof-of-sql/src/sql/ast/dense_filter_expr.rs diff --git a/crates/proofs/src/sql/ast/dense_filter_expr_test.rs b/crates/proof-of-sql/src/sql/ast/dense_filter_expr_test.rs similarity index 99% rename from crates/proofs/src/sql/ast/dense_filter_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/dense_filter_expr_test.rs index ad2049283..b0c75000c 100644 --- a/crates/proofs/src/sql/ast/dense_filter_expr_test.rs +++ b/crates/proof-of-sql/src/sql/ast/dense_filter_expr_test.rs @@ -34,7 +34,7 @@ use blitzar::proof::InnerProductProof; use bumpalo::Bump; use curve25519_dalek::RistrettoPoint; use indexmap::IndexMap; -use proofs_sql::{Identifier, ResourceId}; +use proof_of_sql_parser::{Identifier, ResourceId}; use std::{collections::HashSet, sync::Arc}; #[test] diff --git a/crates/proofs/src/sql/ast/dense_filter_expr_test_dishonest_prover.rs b/crates/proof-of-sql/src/sql/ast/dense_filter_expr_test_dishonest_prover.rs similarity index 100% rename from crates/proofs/src/sql/ast/dense_filter_expr_test_dishonest_prover.rs rename to crates/proof-of-sql/src/sql/ast/dense_filter_expr_test_dishonest_prover.rs diff --git a/crates/proofs/src/sql/ast/dense_filter_util.rs b/crates/proof-of-sql/src/sql/ast/dense_filter_util.rs similarity index 100% rename from crates/proofs/src/sql/ast/dense_filter_util.rs rename to crates/proof-of-sql/src/sql/ast/dense_filter_util.rs diff --git a/crates/proofs/src/sql/ast/dense_filter_util_test.rs b/crates/proof-of-sql/src/sql/ast/dense_filter_util_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/dense_filter_util_test.rs rename to crates/proof-of-sql/src/sql/ast/dense_filter_util_test.rs diff --git a/crates/proofs/src/sql/ast/equals_expr.rs b/crates/proof-of-sql/src/sql/ast/equals_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/equals_expr.rs rename to crates/proof-of-sql/src/sql/ast/equals_expr.rs diff --git a/crates/proofs/src/sql/ast/equals_expr_test.rs b/crates/proof-of-sql/src/sql/ast/equals_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/equals_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/equals_expr_test.rs diff --git a/crates/proofs/src/sql/ast/filter_expr.rs b/crates/proof-of-sql/src/sql/ast/filter_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/filter_expr.rs rename to crates/proof-of-sql/src/sql/ast/filter_expr.rs diff --git a/crates/proofs/src/sql/ast/filter_expr_test.rs b/crates/proof-of-sql/src/sql/ast/filter_expr_test.rs similarity index 99% rename from crates/proofs/src/sql/ast/filter_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/filter_expr_test.rs index ff83973c3..424354db8 100644 --- a/crates/proofs/src/sql/ast/filter_expr_test.rs +++ b/crates/proof-of-sql/src/sql/ast/filter_expr_test.rs @@ -22,7 +22,7 @@ use blitzar::proof::InnerProductProof; use bumpalo::Bump; use curve25519_dalek::RistrettoPoint; use indexmap::IndexMap; -use proofs_sql::{Identifier, ResourceId}; +use proof_of_sql_parser::{Identifier, ResourceId}; use std::{collections::HashSet, sync::Arc}; #[test] diff --git a/crates/proofs/src/sql/ast/filter_expr_test_dishonest_prover.rs b/crates/proof-of-sql/src/sql/ast/filter_expr_test_dishonest_prover.rs similarity index 100% rename from crates/proofs/src/sql/ast/filter_expr_test_dishonest_prover.rs rename to crates/proof-of-sql/src/sql/ast/filter_expr_test_dishonest_prover.rs diff --git a/crates/proofs/src/sql/ast/filter_result_expr.rs b/crates/proof-of-sql/src/sql/ast/filter_result_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/filter_result_expr.rs rename to crates/proof-of-sql/src/sql/ast/filter_result_expr.rs diff --git a/crates/proofs/src/sql/ast/group_by_expr.rs b/crates/proof-of-sql/src/sql/ast/group_by_expr.rs similarity index 99% rename from crates/proofs/src/sql/ast/group_by_expr.rs rename to crates/proof-of-sql/src/sql/ast/group_by_expr.rs index f38e5c184..1c37af4c9 100644 --- a/crates/proofs/src/sql/ast/group_by_expr.rs +++ b/crates/proof-of-sql/src/sql/ast/group_by_expr.rs @@ -21,7 +21,7 @@ use crate::{ use bumpalo::Bump; use core::iter::repeat_with; use num_traits::One; -use proofs_sql::Identifier; +use proof_of_sql_parser::Identifier; use serde::{Deserialize, Serialize}; use std::collections::HashSet; diff --git a/crates/proofs/src/sql/ast/group_by_expr_test.rs b/crates/proof-of-sql/src/sql/ast/group_by_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/group_by_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/group_by_expr_test.rs diff --git a/crates/proofs/src/sql/ast/group_by_util.rs b/crates/proof-of-sql/src/sql/ast/group_by_util.rs similarity index 100% rename from crates/proofs/src/sql/ast/group_by_util.rs rename to crates/proof-of-sql/src/sql/ast/group_by_util.rs diff --git a/crates/proofs/src/sql/ast/group_by_util_test.rs b/crates/proof-of-sql/src/sql/ast/group_by_util_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/group_by_util_test.rs rename to crates/proof-of-sql/src/sql/ast/group_by_util_test.rs diff --git a/crates/proofs/src/sql/ast/inequality_expr.rs b/crates/proof-of-sql/src/sql/ast/inequality_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/inequality_expr.rs rename to crates/proof-of-sql/src/sql/ast/inequality_expr.rs diff --git a/crates/proofs/src/sql/ast/inequality_expr_test.rs b/crates/proof-of-sql/src/sql/ast/inequality_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/inequality_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/inequality_expr_test.rs diff --git a/crates/proofs/src/sql/ast/literal_expr.rs b/crates/proof-of-sql/src/sql/ast/literal_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/literal_expr.rs rename to crates/proof-of-sql/src/sql/ast/literal_expr.rs diff --git a/crates/proofs/src/sql/ast/literal_expr_test.rs b/crates/proof-of-sql/src/sql/ast/literal_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/literal_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/literal_expr_test.rs diff --git a/crates/proofs/src/sql/ast/mod.rs b/crates/proof-of-sql/src/sql/ast/mod.rs similarity index 100% rename from crates/proofs/src/sql/ast/mod.rs rename to crates/proof-of-sql/src/sql/ast/mod.rs diff --git a/crates/proofs/src/sql/ast/not_expr.rs b/crates/proof-of-sql/src/sql/ast/not_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/not_expr.rs rename to crates/proof-of-sql/src/sql/ast/not_expr.rs diff --git a/crates/proofs/src/sql/ast/not_expr_test.rs b/crates/proof-of-sql/src/sql/ast/not_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/not_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/not_expr_test.rs diff --git a/crates/proofs/src/sql/ast/or_expr.rs b/crates/proof-of-sql/src/sql/ast/or_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/or_expr.rs rename to crates/proof-of-sql/src/sql/ast/or_expr.rs diff --git a/crates/proofs/src/sql/ast/or_expr_test.rs b/crates/proof-of-sql/src/sql/ast/or_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/or_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/or_expr_test.rs diff --git a/crates/proofs/src/sql/ast/proof_plan.rs b/crates/proof-of-sql/src/sql/ast/proof_plan.rs similarity index 100% rename from crates/proofs/src/sql/ast/proof_plan.rs rename to crates/proof-of-sql/src/sql/ast/proof_plan.rs diff --git a/crates/proofs/src/sql/ast/provable_expr.rs b/crates/proof-of-sql/src/sql/ast/provable_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/provable_expr.rs rename to crates/proof-of-sql/src/sql/ast/provable_expr.rs diff --git a/crates/proofs/src/sql/ast/provable_expr_plan.rs b/crates/proof-of-sql/src/sql/ast/provable_expr_plan.rs similarity index 99% rename from crates/proofs/src/sql/ast/provable_expr_plan.rs rename to crates/proof-of-sql/src/sql/ast/provable_expr_plan.rs index 23dbadeb3..73ffcef47 100644 --- a/crates/proofs/src/sql/ast/provable_expr_plan.rs +++ b/crates/proof-of-sql/src/sql/ast/provable_expr_plan.rs @@ -13,7 +13,7 @@ use crate::{ }, }; use bumpalo::Bump; -use proofs_sql::intermediate_ast::BinaryOperator; +use proof_of_sql_parser::intermediate_ast::BinaryOperator; use serde::{Deserialize, Serialize}; use std::{collections::HashSet, fmt::Debug}; diff --git a/crates/proofs/src/sql/ast/provable_expr_test.rs b/crates/proof-of-sql/src/sql/ast/provable_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/provable_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/provable_expr_test.rs diff --git a/crates/proofs/src/sql/ast/sign_expr.rs b/crates/proof-of-sql/src/sql/ast/sign_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/sign_expr.rs rename to crates/proof-of-sql/src/sql/ast/sign_expr.rs diff --git a/crates/proofs/src/sql/ast/sign_expr_test.rs b/crates/proof-of-sql/src/sql/ast/sign_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/ast/sign_expr_test.rs rename to crates/proof-of-sql/src/sql/ast/sign_expr_test.rs diff --git a/crates/proofs/src/sql/ast/table_expr.rs b/crates/proof-of-sql/src/sql/ast/table_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/table_expr.rs rename to crates/proof-of-sql/src/sql/ast/table_expr.rs diff --git a/crates/proofs/src/sql/ast/test_expr.rs b/crates/proof-of-sql/src/sql/ast/test_expr.rs similarity index 100% rename from crates/proofs/src/sql/ast/test_expr.rs rename to crates/proof-of-sql/src/sql/ast/test_expr.rs diff --git a/crates/proofs/src/sql/ast/test_utility.rs b/crates/proof-of-sql/src/sql/ast/test_utility.rs similarity index 100% rename from crates/proofs/src/sql/ast/test_utility.rs rename to crates/proof-of-sql/src/sql/ast/test_utility.rs diff --git a/crates/proofs/src/sql/mod.rs b/crates/proof-of-sql/src/sql/mod.rs similarity index 100% rename from crates/proofs/src/sql/mod.rs rename to crates/proof-of-sql/src/sql/mod.rs diff --git a/crates/proofs/src/sql/parse/error.rs b/crates/proof-of-sql/src/sql/parse/error.rs similarity index 97% rename from crates/proofs/src/sql/parse/error.rs rename to crates/proof-of-sql/src/sql/parse/error.rs index cc2e60fb3..1ffc98fbf 100644 --- a/crates/proofs/src/sql/parse/error.rs +++ b/crates/proof-of-sql/src/sql/parse/error.rs @@ -1,5 +1,5 @@ use crate::base::database::ColumnType; -use proofs_sql::{intermediate_decimal::DecimalError, Identifier, ResourceId}; +use proof_of_sql_parser::{intermediate_decimal::DecimalError, Identifier, ResourceId}; use thiserror::Error; /// Errors from converting an intermediate AST into a provable AST. diff --git a/crates/proofs/src/sql/parse/filter_expr_builder.rs b/crates/proof-of-sql/src/sql/parse/filter_expr_builder.rs similarity index 96% rename from crates/proofs/src/sql/parse/filter_expr_builder.rs rename to crates/proof-of-sql/src/sql/parse/filter_expr_builder.rs index 6e5ba543d..762ed8164 100644 --- a/crates/proofs/src/sql/parse/filter_expr_builder.rs +++ b/crates/proof-of-sql/src/sql/parse/filter_expr_builder.rs @@ -6,7 +6,7 @@ use crate::{ }, sql::ast::{ColumnExpr, DenseFilterExpr, ProvableExprPlan, TableExpr}, }; -use proofs_sql::{intermediate_ast::Expression, Identifier}; +use proof_of_sql_parser::{intermediate_ast::Expression, Identifier}; use std::collections::{HashMap, HashSet}; pub struct FilterExprBuilder { diff --git a/crates/proofs/src/sql/parse/mod.rs b/crates/proof-of-sql/src/sql/parse/mod.rs similarity index 100% rename from crates/proofs/src/sql/parse/mod.rs rename to crates/proof-of-sql/src/sql/parse/mod.rs diff --git a/crates/proofs/src/sql/parse/query_context.rs b/crates/proof-of-sql/src/sql/parse/query_context.rs similarity index 99% rename from crates/proofs/src/sql/parse/query_context.rs rename to crates/proof-of-sql/src/sql/parse/query_context.rs index 9397b7cc6..716c8c395 100644 --- a/crates/proofs/src/sql/parse/query_context.rs +++ b/crates/proof-of-sql/src/sql/parse/query_context.rs @@ -8,7 +8,7 @@ use crate::{ parse::{ConversionError, ConversionResult, WhereExprBuilder}, }, }; -use proofs_sql::{ +use proof_of_sql_parser::{ intermediate_ast::{AggregationOperator, AliasedResultExpr, Expression, OrderBy, Slice}, Identifier, }; diff --git a/crates/proofs/src/sql/parse/query_context_builder.rs b/crates/proof-of-sql/src/sql/parse/query_context_builder.rs similarity index 99% rename from crates/proofs/src/sql/parse/query_context_builder.rs rename to crates/proof-of-sql/src/sql/parse/query_context_builder.rs index 4d130682f..d8a0c01bd 100644 --- a/crates/proofs/src/sql/parse/query_context_builder.rs +++ b/crates/proof-of-sql/src/sql/parse/query_context_builder.rs @@ -6,7 +6,7 @@ use crate::{ }, sql::parse::{ConversionError, ConversionResult}, }; -use proofs_sql::{ +use proof_of_sql_parser::{ intermediate_ast::{ AggregationOperator, AliasedResultExpr, BinaryOperator, Expression, Literal, OrderBy, SelectResultExpr, Slice, TableExpression, UnaryOperator, diff --git a/crates/proofs/src/sql/parse/query_expr.rs b/crates/proof-of-sql/src/sql/parse/query_expr.rs similarity index 97% rename from crates/proofs/src/sql/parse/query_expr.rs rename to crates/proof-of-sql/src/sql/parse/query_expr.rs index 1cabc9d87..150c5cd3c 100644 --- a/crates/proofs/src/sql/parse/query_expr.rs +++ b/crates/proof-of-sql/src/sql/parse/query_expr.rs @@ -7,7 +7,7 @@ use crate::{ transform::ResultExpr, }, }; -use proofs_sql::{intermediate_ast::SetExpression, Identifier, SelectStatement}; +use proof_of_sql_parser::{intermediate_ast::SetExpression, Identifier, SelectStatement}; use serde::{Deserialize, Serialize}; use std::fmt; diff --git a/crates/proofs/src/sql/parse/query_expr_tests.rs b/crates/proof-of-sql/src/sql/parse/query_expr_tests.rs similarity index 99% rename from crates/proofs/src/sql/parse/query_expr_tests.rs rename to crates/proof-of-sql/src/sql/parse/query_expr_tests.rs index 820f5e64a..efd94e59b 100644 --- a/crates/proofs/src/sql/parse/query_expr_tests.rs +++ b/crates/proof-of-sql/src/sql/parse/query_expr_tests.rs @@ -11,7 +11,7 @@ use crate::{ use arrow::record_batch::RecordBatch; use curve25519_dalek::RistrettoPoint; use itertools::Itertools; -use proofs_sql::{intermediate_ast::OrderByDirection::*, sql::SelectStatementParser}; +use proof_of_sql_parser::{intermediate_ast::OrderByDirection::*, sql::SelectStatementParser}; fn query_to_provable_ast( table: TableRef, diff --git a/crates/proofs/src/sql/parse/result_expr_builder.rs b/crates/proof-of-sql/src/sql/parse/result_expr_builder.rs similarity index 99% rename from crates/proofs/src/sql/parse/result_expr_builder.rs rename to crates/proof-of-sql/src/sql/parse/result_expr_builder.rs index 92095a02f..0dda9bb26 100644 --- a/crates/proofs/src/sql/parse/result_expr_builder.rs +++ b/crates/proof-of-sql/src/sql/parse/result_expr_builder.rs @@ -1,5 +1,5 @@ use crate::sql::transform::{CompositionExpr, GroupByExpr, OrderByExprs, SelectExpr, SliceExpr}; -use proofs_sql::{ +use proof_of_sql_parser::{ intermediate_ast::{AliasedResultExpr, Expression, OrderBy, Slice}, Identifier, }; diff --git a/crates/proofs/src/sql/parse/where_expr_builder.rs b/crates/proof-of-sql/src/sql/parse/where_expr_builder.rs similarity index 93% rename from crates/proofs/src/sql/parse/where_expr_builder.rs rename to crates/proof-of-sql/src/sql/parse/where_expr_builder.rs index 7efb3080d..f40d88f4a 100644 --- a/crates/proofs/src/sql/parse/where_expr_builder.rs +++ b/crates/proof-of-sql/src/sql/parse/where_expr_builder.rs @@ -7,13 +7,13 @@ use crate::{ }, sql::ast::{ColumnExpr, ProvableExpr, ProvableExprPlan}, }; -use proofs_sql::{ +use proof_of_sql_parser::{ intermediate_ast::{BinaryOperator, Expression, Literal, UnaryOperator}, Identifier, }; use std::collections::HashMap; -/// Builder that enables building a `proofs::sql::ast::ProvableExprPlan` from a `proofs_sql::intermediate_ast::Expression` that is +/// Builder that enables building a `proof_of_sql::sql::ast::ProvableExprPlan` from a `proof_of_sql_parser::intermediate_ast::Expression` that is /// intended to be used as the where clause in a filter expression or group by expression. pub struct WhereExprBuilder<'a> { column_mapping: &'a HashMap, @@ -23,7 +23,7 @@ impl<'a> WhereExprBuilder<'a> { pub fn new(column_mapping: &'a HashMap) -> Self { Self { column_mapping } } - /// Builds a `proofs::sql::ast::ProvableExprPlan` from a `proofs_sql::intermediate_ast::Expression` that is + /// Builds a `proof_of_sql::sql::ast::ProvableExprPlan` from a `proof_of_sql_parser::intermediate_ast::Expression` that is /// intended to be used as the where clause in a filter expression or group by expression. pub fn build( self, @@ -48,7 +48,7 @@ impl<'a> WhereExprBuilder<'a> { impl WhereExprBuilder<'_> { fn visit_expr( &self, - expr: proofs_sql::intermediate_ast::Expression, + expr: proof_of_sql_parser::intermediate_ast::Expression, ) -> Result, ConversionError> { match expr { Expression::Column(identifier) => self.visit_column(identifier), diff --git a/crates/proofs/src/sql/parse/where_expr_builder_tests.rs b/crates/proof-of-sql/src/sql/parse/where_expr_builder_tests.rs similarity index 99% rename from crates/proofs/src/sql/parse/where_expr_builder_tests.rs rename to crates/proof-of-sql/src/sql/parse/where_expr_builder_tests.rs index c1aee485e..b230cfefb 100644 --- a/crates/proofs/src/sql/parse/where_expr_builder_tests.rs +++ b/crates/proof-of-sql/src/sql/parse/where_expr_builder_tests.rs @@ -15,7 +15,7 @@ mod tests { }, }; use curve25519_dalek::RistrettoPoint; - use proofs_sql::{ + use proof_of_sql_parser::{ intermediate_ast::{BinaryOperator, Expression, Literal}, intermediate_decimal::IntermediateDecimal, Identifier, SelectStatement, diff --git a/crates/proofs/src/sql/proof/composite_polynomial_builder.rs b/crates/proof-of-sql/src/sql/proof/composite_polynomial_builder.rs similarity index 100% rename from crates/proofs/src/sql/proof/composite_polynomial_builder.rs rename to crates/proof-of-sql/src/sql/proof/composite_polynomial_builder.rs diff --git a/crates/proofs/src/sql/proof/composite_polynomial_builder_test.rs b/crates/proof-of-sql/src/sql/proof/composite_polynomial_builder_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/composite_polynomial_builder_test.rs rename to crates/proof-of-sql/src/sql/proof/composite_polynomial_builder_test.rs diff --git a/crates/proofs/src/sql/proof/count_builder.rs b/crates/proof-of-sql/src/sql/proof/count_builder.rs similarity index 100% rename from crates/proofs/src/sql/proof/count_builder.rs rename to crates/proof-of-sql/src/sql/proof/count_builder.rs diff --git a/crates/proofs/src/sql/proof/indexes.rs b/crates/proof-of-sql/src/sql/proof/indexes.rs similarity index 100% rename from crates/proofs/src/sql/proof/indexes.rs rename to crates/proof-of-sql/src/sql/proof/indexes.rs diff --git a/crates/proofs/src/sql/proof/indexes_test.rs b/crates/proof-of-sql/src/sql/proof/indexes_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/indexes_test.rs rename to crates/proof-of-sql/src/sql/proof/indexes_test.rs diff --git a/crates/proofs/src/sql/proof/mod.rs b/crates/proof-of-sql/src/sql/proof/mod.rs similarity index 100% rename from crates/proofs/src/sql/proof/mod.rs rename to crates/proof-of-sql/src/sql/proof/mod.rs diff --git a/crates/proofs/src/sql/proof/proof_builder.rs b/crates/proof-of-sql/src/sql/proof/proof_builder.rs similarity index 100% rename from crates/proofs/src/sql/proof/proof_builder.rs rename to crates/proof-of-sql/src/sql/proof/proof_builder.rs diff --git a/crates/proofs/src/sql/proof/proof_builder_test.rs b/crates/proof-of-sql/src/sql/proof/proof_builder_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/proof_builder_test.rs rename to crates/proof-of-sql/src/sql/proof/proof_builder_test.rs diff --git a/crates/proofs/src/sql/proof/proof_counts.rs b/crates/proof-of-sql/src/sql/proof/proof_counts.rs similarity index 100% rename from crates/proofs/src/sql/proof/proof_counts.rs rename to crates/proof-of-sql/src/sql/proof/proof_counts.rs diff --git a/crates/proofs/src/sql/proof/proof_exprs.rs b/crates/proof-of-sql/src/sql/proof/proof_exprs.rs similarity index 100% rename from crates/proofs/src/sql/proof/proof_exprs.rs rename to crates/proof-of-sql/src/sql/proof/proof_exprs.rs diff --git a/crates/proofs/src/sql/proof/provable_query_result.rs b/crates/proof-of-sql/src/sql/proof/provable_query_result.rs similarity index 100% rename from crates/proofs/src/sql/proof/provable_query_result.rs rename to crates/proof-of-sql/src/sql/proof/provable_query_result.rs diff --git a/crates/proofs/src/sql/proof/provable_query_result_test.rs b/crates/proof-of-sql/src/sql/proof/provable_query_result_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/provable_query_result_test.rs rename to crates/proof-of-sql/src/sql/proof/provable_query_result_test.rs diff --git a/crates/proofs/src/sql/proof/provable_result_column.rs b/crates/proof-of-sql/src/sql/proof/provable_result_column.rs similarity index 100% rename from crates/proofs/src/sql/proof/provable_result_column.rs rename to crates/proof-of-sql/src/sql/proof/provable_result_column.rs diff --git a/crates/proofs/src/sql/proof/query_proof.rs b/crates/proof-of-sql/src/sql/proof/query_proof.rs similarity index 100% rename from crates/proofs/src/sql/proof/query_proof.rs rename to crates/proof-of-sql/src/sql/proof/query_proof.rs diff --git a/crates/proofs/src/sql/proof/query_proof_test.rs b/crates/proof-of-sql/src/sql/proof/query_proof_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/query_proof_test.rs rename to crates/proof-of-sql/src/sql/proof/query_proof_test.rs diff --git a/crates/proofs/src/sql/proof/query_result.rs b/crates/proof-of-sql/src/sql/proof/query_result.rs similarity index 100% rename from crates/proofs/src/sql/proof/query_result.rs rename to crates/proof-of-sql/src/sql/proof/query_result.rs diff --git a/crates/proofs/src/sql/proof/result_builder.rs b/crates/proof-of-sql/src/sql/proof/result_builder.rs similarity index 100% rename from crates/proofs/src/sql/proof/result_builder.rs rename to crates/proof-of-sql/src/sql/proof/result_builder.rs diff --git a/crates/proofs/src/sql/proof/result_element_serialization.rs b/crates/proof-of-sql/src/sql/proof/result_element_serialization.rs similarity index 100% rename from crates/proofs/src/sql/proof/result_element_serialization.rs rename to crates/proof-of-sql/src/sql/proof/result_element_serialization.rs diff --git a/crates/proofs/src/sql/proof/sumcheck_mle_evaluations.rs b/crates/proof-of-sql/src/sql/proof/sumcheck_mle_evaluations.rs similarity index 100% rename from crates/proofs/src/sql/proof/sumcheck_mle_evaluations.rs rename to crates/proof-of-sql/src/sql/proof/sumcheck_mle_evaluations.rs diff --git a/crates/proofs/src/sql/proof/sumcheck_mle_evaluations_test.rs b/crates/proof-of-sql/src/sql/proof/sumcheck_mle_evaluations_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/sumcheck_mle_evaluations_test.rs rename to crates/proof-of-sql/src/sql/proof/sumcheck_mle_evaluations_test.rs diff --git a/crates/proofs/src/sql/proof/sumcheck_random_scalars.rs b/crates/proof-of-sql/src/sql/proof/sumcheck_random_scalars.rs similarity index 100% rename from crates/proofs/src/sql/proof/sumcheck_random_scalars.rs rename to crates/proof-of-sql/src/sql/proof/sumcheck_random_scalars.rs diff --git a/crates/proofs/src/sql/proof/sumcheck_subpolynomial.rs b/crates/proof-of-sql/src/sql/proof/sumcheck_subpolynomial.rs similarity index 100% rename from crates/proofs/src/sql/proof/sumcheck_subpolynomial.rs rename to crates/proof-of-sql/src/sql/proof/sumcheck_subpolynomial.rs diff --git a/crates/proofs/src/sql/proof/test_query_expr.rs b/crates/proof-of-sql/src/sql/proof/test_query_expr.rs similarity index 100% rename from crates/proofs/src/sql/proof/test_query_expr.rs rename to crates/proof-of-sql/src/sql/proof/test_query_expr.rs diff --git a/crates/proofs/src/sql/proof/verifiable_query_result.rs b/crates/proof-of-sql/src/sql/proof/verifiable_query_result.rs similarity index 100% rename from crates/proofs/src/sql/proof/verifiable_query_result.rs rename to crates/proof-of-sql/src/sql/proof/verifiable_query_result.rs diff --git a/crates/proofs/src/sql/proof/verifiable_query_result_test.rs b/crates/proof-of-sql/src/sql/proof/verifiable_query_result_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/verifiable_query_result_test.rs rename to crates/proof-of-sql/src/sql/proof/verifiable_query_result_test.rs diff --git a/crates/proofs/src/sql/proof/verifiable_query_result_test_utility.rs b/crates/proof-of-sql/src/sql/proof/verifiable_query_result_test_utility.rs similarity index 100% rename from crates/proofs/src/sql/proof/verifiable_query_result_test_utility.rs rename to crates/proof-of-sql/src/sql/proof/verifiable_query_result_test_utility.rs diff --git a/crates/proofs/src/sql/proof/verification_builder.rs b/crates/proof-of-sql/src/sql/proof/verification_builder.rs similarity index 100% rename from crates/proofs/src/sql/proof/verification_builder.rs rename to crates/proof-of-sql/src/sql/proof/verification_builder.rs diff --git a/crates/proofs/src/sql/proof/verification_builder_test.rs b/crates/proof-of-sql/src/sql/proof/verification_builder_test.rs similarity index 100% rename from crates/proofs/src/sql/proof/verification_builder_test.rs rename to crates/proof-of-sql/src/sql/proof/verification_builder_test.rs diff --git a/crates/proofs/src/sql/transform/composition_expr.rs b/crates/proof-of-sql/src/sql/transform/composition_expr.rs similarity index 100% rename from crates/proofs/src/sql/transform/composition_expr.rs rename to crates/proof-of-sql/src/sql/transform/composition_expr.rs diff --git a/crates/proofs/src/sql/transform/composition_expr_test.rs b/crates/proof-of-sql/src/sql/transform/composition_expr_test.rs similarity index 96% rename from crates/proofs/src/sql/transform/composition_expr_test.rs rename to crates/proof-of-sql/src/sql/transform/composition_expr_test.rs index 8ac926248..c17fb0e35 100644 --- a/crates/proofs/src/sql/transform/composition_expr_test.rs +++ b/crates/proof-of-sql/src/sql/transform/composition_expr_test.rs @@ -5,7 +5,7 @@ use crate::{ CompositionExpr, }, }; -use proofs_sql::intermediate_ast::OrderByDirection::Desc; +use proof_of_sql_parser::intermediate_ast::OrderByDirection::Desc; #[test] fn we_can_chain_expressions() { diff --git a/crates/proofs/src/sql/transform/data_frame_expr.rs b/crates/proof-of-sql/src/sql/transform/data_frame_expr.rs similarity index 100% rename from crates/proofs/src/sql/transform/data_frame_expr.rs rename to crates/proof-of-sql/src/sql/transform/data_frame_expr.rs diff --git a/crates/proofs/src/sql/transform/group_by_expr.rs b/crates/proof-of-sql/src/sql/transform/group_by_expr.rs similarity index 98% rename from crates/proofs/src/sql/transform/group_by_expr.rs rename to crates/proof-of-sql/src/sql/transform/group_by_expr.rs index 601cc0a27..99ee5ad1a 100644 --- a/crates/proofs/src/sql/transform/group_by_expr.rs +++ b/crates/proof-of-sql/src/sql/transform/group_by_expr.rs @@ -4,7 +4,7 @@ use super::ToPolarsExpr; use crate::base::database::{INT128_PRECISION, INT128_SCALE}; use dyn_partial_eq::DynPartialEq; use polars::prelude::{col, DataType, Expr, GetOutput, LazyFrame, NamedFrom, Series}; -use proofs_sql::{intermediate_ast::AliasedResultExpr, Identifier}; +use proof_of_sql_parser::{intermediate_ast::AliasedResultExpr, Identifier}; use serde::{Deserialize, Serialize}; /// A group by expression diff --git a/crates/proofs/src/sql/transform/group_by_expr_test.rs b/crates/proof-of-sql/src/sql/transform/group_by_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/transform/group_by_expr_test.rs rename to crates/proof-of-sql/src/sql/transform/group_by_expr_test.rs diff --git a/crates/proofs/src/sql/transform/mod.rs b/crates/proof-of-sql/src/sql/transform/mod.rs similarity index 100% rename from crates/proofs/src/sql/transform/mod.rs rename to crates/proof-of-sql/src/sql/transform/mod.rs diff --git a/crates/proofs/src/sql/transform/order_by_exprs.rs b/crates/proof-of-sql/src/sql/transform/order_by_exprs.rs similarity index 98% rename from crates/proofs/src/sql/transform/order_by_exprs.rs rename to crates/proof-of-sql/src/sql/transform/order_by_exprs.rs index d3610a708..26dce954b 100644 --- a/crates/proofs/src/sql/transform/order_by_exprs.rs +++ b/crates/proof-of-sql/src/sql/transform/order_by_exprs.rs @@ -4,7 +4,7 @@ use crate::base::database::{INT128_PRECISION, INT128_SCALE}; use arrow::datatypes::ArrowNativeTypeOp; use dyn_partial_eq::DynPartialEq; use polars::prelude::{col, DataType, Expr, GetOutput, LazyFrame, NamedFrom, Series}; -use proofs_sql::intermediate_ast::{OrderBy, OrderByDirection}; +use proof_of_sql_parser::intermediate_ast::{OrderBy, OrderByDirection}; use serde::{Deserialize, Serialize}; /// A node representing a list of `OrderBy` expressions. diff --git a/crates/proofs/src/sql/transform/order_by_exprs_test.rs b/crates/proof-of-sql/src/sql/transform/order_by_exprs_test.rs similarity index 99% rename from crates/proofs/src/sql/transform/order_by_exprs_test.rs rename to crates/proof-of-sql/src/sql/transform/order_by_exprs_test.rs index 78dd8d28a..30186d08d 100644 --- a/crates/proofs/src/sql/transform/order_by_exprs_test.rs +++ b/crates/proof-of-sql/src/sql/transform/order_by_exprs_test.rs @@ -4,7 +4,7 @@ use crate::{ record_batch, sql::transform::test_utility::{composite_result, orders}, }; -use proofs_sql::intermediate_ast::OrderByDirection::{Asc, Desc}; +use proof_of_sql_parser::intermediate_ast::OrderByDirection::{Asc, Desc}; use rand::{distributions::uniform::SampleUniform, seq::SliceRandom, Rng}; #[test] diff --git a/crates/proofs/src/sql/transform/polars_arithmetic.rs b/crates/proof-of-sql/src/sql/transform/polars_arithmetic.rs similarity index 100% rename from crates/proofs/src/sql/transform/polars_arithmetic.rs rename to crates/proof-of-sql/src/sql/transform/polars_arithmetic.rs diff --git a/crates/proofs/src/sql/transform/polars_conversions.rs b/crates/proof-of-sql/src/sql/transform/polars_conversions.rs similarity index 100% rename from crates/proofs/src/sql/transform/polars_conversions.rs rename to crates/proof-of-sql/src/sql/transform/polars_conversions.rs diff --git a/crates/proofs/src/sql/transform/record_batch_expr.rs b/crates/proof-of-sql/src/sql/transform/record_batch_expr.rs similarity index 100% rename from crates/proofs/src/sql/transform/record_batch_expr.rs rename to crates/proof-of-sql/src/sql/transform/record_batch_expr.rs diff --git a/crates/proofs/src/sql/transform/result_expr.rs b/crates/proof-of-sql/src/sql/transform/result_expr.rs similarity index 100% rename from crates/proofs/src/sql/transform/result_expr.rs rename to crates/proof-of-sql/src/sql/transform/result_expr.rs diff --git a/crates/proofs/src/sql/transform/select_expr.rs b/crates/proof-of-sql/src/sql/transform/select_expr.rs similarity index 97% rename from crates/proofs/src/sql/transform/select_expr.rs rename to crates/proof-of-sql/src/sql/transform/select_expr.rs index b83fece90..3c407fd40 100644 --- a/crates/proofs/src/sql/transform/select_expr.rs +++ b/crates/proof-of-sql/src/sql/transform/select_expr.rs @@ -8,7 +8,7 @@ use super::{ use arrow::record_batch::RecordBatch; use dyn_partial_eq::DynPartialEq; use polars::prelude::{Expr, LazyFrame}; -use proofs_sql::intermediate_ast::{AliasedResultExpr, Expression}; +use proof_of_sql_parser::intermediate_ast::{AliasedResultExpr, Expression}; use serde::{Deserialize, Serialize}; /// The select expression used to select, reorder, and apply alias transformations diff --git a/crates/proofs/src/sql/transform/select_expr_test.rs b/crates/proof-of-sql/src/sql/transform/select_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/transform/select_expr_test.rs rename to crates/proof-of-sql/src/sql/transform/select_expr_test.rs diff --git a/crates/proofs/src/sql/transform/slice_expr.rs b/crates/proof-of-sql/src/sql/transform/slice_expr.rs similarity index 100% rename from crates/proofs/src/sql/transform/slice_expr.rs rename to crates/proof-of-sql/src/sql/transform/slice_expr.rs diff --git a/crates/proofs/src/sql/transform/slice_expr_test.rs b/crates/proof-of-sql/src/sql/transform/slice_expr_test.rs similarity index 100% rename from crates/proofs/src/sql/transform/slice_expr_test.rs rename to crates/proof-of-sql/src/sql/transform/slice_expr_test.rs diff --git a/crates/proofs/src/sql/transform/test_utility.rs b/crates/proof-of-sql/src/sql/transform/test_utility.rs similarity index 98% rename from crates/proofs/src/sql/transform/test_utility.rs rename to crates/proof-of-sql/src/sql/transform/test_utility.rs index faabc51f6..d5f1c5b30 100644 --- a/crates/proofs/src/sql/transform/test_utility.rs +++ b/crates/proof-of-sql/src/sql/transform/test_utility.rs @@ -1,5 +1,5 @@ use super::*; -use proofs_sql::intermediate_ast::*; +use proof_of_sql_parser::intermediate_ast::*; pub fn lit_i64(literal: i64) -> Box { Box::new(Expression::Literal(Literal::BigInt(literal))) diff --git a/crates/proofs/src/sql/transform/to_polars_expr.rs b/crates/proof-of-sql/src/sql/transform/to_polars_expr.rs similarity index 97% rename from crates/proofs/src/sql/transform/to_polars_expr.rs rename to crates/proof-of-sql/src/sql/transform/to_polars_expr.rs index a0d1bf0dd..3204a7417 100644 --- a/crates/proofs/src/sql/transform/to_polars_expr.rs +++ b/crates/proof-of-sql/src/sql/transform/to_polars_expr.rs @@ -1,6 +1,6 @@ use super::{polars_arithmetic::SafeDivision, polars_conversions::LiteralConversion}; use polars::prelude::{col, Expr}; -use proofs_sql::intermediate_ast::*; +use proof_of_sql_parser::intermediate_ast::*; pub(crate) trait ToPolarsExpr { fn to_polars_expr(&self) -> Expr; } diff --git a/crates/proofs/tests/decimal_integration_tests.rs b/crates/proof-of-sql/tests/decimal_integration_tests.rs similarity index 97% rename from crates/proofs/tests/decimal_integration_tests.rs rename to crates/proof-of-sql/tests/decimal_integration_tests.rs index 2a07432c3..b4d44e2d0 100644 --- a/crates/proofs/tests/decimal_integration_tests.rs +++ b/crates/proof-of-sql/tests/decimal_integration_tests.rs @@ -2,7 +2,7 @@ #[cfg(feature = "blitzar")] use blitzar::proof::InnerProductProof; #[cfg(feature = "blitzar")] -use proofs::base::{database::owned_table_utility::*, scalar::Curve25519Scalar as S}; +use proof_of_sql::base::{database::owned_table_utility::*, scalar::Curve25519Scalar as S}; #[cfg(feature = "blitzar")] fn run_query( @@ -12,7 +12,7 @@ fn run_query( test_decimal_values: Vec, expected_decimal_values: Vec, ) { - use proofs::{ + use proof_of_sql::{ base::database::{OwnedTable, OwnedTableTestAccessor, TestAccessor}, sql::{parse::QueryExpr, proof::VerifiableQueryResult}, }; @@ -63,7 +63,7 @@ fn run_query( #[cfg(feature = "blitzar")] mod decimal_query_tests { use crate::run_query; - use proofs::base::scalar::{Curve25519Scalar as S, Scalar}; + use proof_of_sql::base::scalar::{Curve25519Scalar as S, Scalar}; #[test] fn we_can_query_decimals_exactly_matching_db_data() { diff --git a/crates/proofs/tests/integration_tests.rs b/crates/proof-of-sql/tests/integration_tests.rs similarity index 98% rename from crates/proofs/tests/integration_tests.rs rename to crates/proof-of-sql/tests/integration_tests.rs index 26ba7945a..6c6f69261 100644 --- a/crates/proofs/tests/integration_tests.rs +++ b/crates/proof-of-sql/tests/integration_tests.rs @@ -3,8 +3,8 @@ use ark_std::test_rng; use arrow::record_batch::RecordBatch; use curve25519_dalek::RistrettoPoint; #[cfg(feature = "blitzar")] -use proofs::base::commitment::InnerProductProof; -use proofs::{ +use proof_of_sql::base::commitment::InnerProductProof; +use proof_of_sql::{ base::{ database::{owned_table_utility::*, OwnedTable, OwnedTableTestAccessor, TestAccessor}, scalar::Curve25519Scalar, @@ -358,7 +358,7 @@ fn we_can_prove_a_complex_query_with_dory() { assert_eq!(owned_table_result, expected_result); } -//TODO: This test uses postprocessing now. Check proofs results once PROOF-765 is done. +//TODO: This test uses postprocessing now. Check proof results once PROOF-765 is done. #[test] #[cfg(feature = "blitzar")] fn we_can_prove_a_minimal_group_by_query_with_curve25519() {