From 3aea474bc8810ef45e5bc018e8376c26c93d9f16 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Wed, 11 Dec 2024 18:19:00 +0100 Subject: [PATCH] Arrabbiata: use arrabbiata instead of arrabiata --- Cargo.lock | 2 +- Cargo.toml | 4 ++-- {arrabiata => arrabbiata}/Cargo.toml | 4 ++-- {arrabiata => arrabbiata}/README.md | 2 +- {arrabiata => arrabbiata}/notes.md | 0 {arrabiata => arrabbiata}/src/column_env.rs | 0 {arrabiata => arrabbiata}/src/columns.rs | 0 {arrabiata => arrabbiata}/src/constraints.rs | 0 {arrabiata => arrabbiata}/src/interpreter.rs | 0 {arrabiata => arrabbiata}/src/lib.rs | 0 {arrabiata => arrabbiata}/src/logup.rs | 0 {arrabiata => arrabbiata}/src/main.rs | 2 +- {arrabiata => arrabbiata}/src/poseidon_3_60_0_5_5_fp.rs | 0 {arrabiata => arrabbiata}/src/poseidon_3_60_0_5_5_fq.rs | 0 {arrabiata => arrabbiata}/src/proof.rs | 0 {arrabiata => arrabbiata}/src/prover.rs | 0 {arrabiata => arrabbiata}/src/verifier.rs | 0 {arrabiata => arrabbiata}/src/witness.rs | 0 {arrabiata => arrabbiata}/tests/constraints.rs | 2 +- {arrabiata => arrabbiata}/tests/utils.rs | 0 {arrabiata => arrabbiata}/tests/witness.rs | 2 +- {arrabiata => arrabbiata}/tests/witness_utils.rs | 2 +- mvpoly/tests/monomials.rs | 2 +- mvpoly/tests/prime.rs | 2 +- 24 files changed, 12 insertions(+), 12 deletions(-) rename {arrabiata => arrabbiata}/Cargo.toml (95%) rename {arrabiata => arrabbiata}/README.md (97%) rename {arrabiata => arrabbiata}/notes.md (100%) rename {arrabiata => arrabbiata}/src/column_env.rs (100%) rename {arrabiata => arrabbiata}/src/columns.rs (100%) rename {arrabiata => arrabbiata}/src/constraints.rs (100%) rename {arrabiata => arrabbiata}/src/interpreter.rs (100%) rename {arrabiata => arrabbiata}/src/lib.rs (100%) rename {arrabiata => arrabbiata}/src/logup.rs (100%) rename {arrabiata => arrabbiata}/src/main.rs (99%) rename {arrabiata => arrabbiata}/src/poseidon_3_60_0_5_5_fp.rs (100%) rename {arrabiata => arrabbiata}/src/poseidon_3_60_0_5_5_fq.rs (100%) rename {arrabiata => arrabbiata}/src/proof.rs (100%) rename {arrabiata => arrabbiata}/src/prover.rs (100%) rename {arrabiata => arrabbiata}/src/verifier.rs (100%) rename {arrabiata => arrabbiata}/src/witness.rs (100%) rename {arrabiata => arrabbiata}/tests/constraints.rs (99%) rename {arrabiata => arrabbiata}/tests/utils.rs (100%) rename {arrabiata => arrabbiata}/tests/witness.rs (99%) rename {arrabiata => arrabbiata}/tests/witness_utils.rs (97%) diff --git a/Cargo.lock b/Cargo.lock index 8295764350..917bab5d39 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,7 +275,7 @@ dependencies = [ ] [[package]] -name = "arrabiata" +name = "arrabbiata" version = "0.1.0" dependencies = [ "ark-ec", diff --git a/Cargo.toml b/Cargo.toml index fb82149618..6e35076b45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "arrabiata", + "arrabbiata", "book", "turshi", "curves", @@ -81,7 +81,7 @@ tinytemplate = "1.1" wasm-bindgen = "=0.2.90" -arrabiata = { path = "./arrabiata", version = "0.1.0" } +arrabbiata = { path = "./arrabbiata", version = "0.1.0" } folding = { path = "./folding", version = "0.1.0" } groupmap = { path = "./groupmap", version = "0.1.0" } internal-tracing = { path = "./internal-tracing", version = "0.1.0" } diff --git a/arrabiata/Cargo.toml b/arrabbiata/Cargo.toml similarity index 95% rename from arrabiata/Cargo.toml rename to arrabbiata/Cargo.toml index 599b627ec9..6ed50d574e 100644 --- a/arrabiata/Cargo.toml +++ b/arrabbiata/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "arrabiata" +name = "arrabbiata" version = "0.1.0" repository = "https://github.com/o1-labs/proof-systems" homepage = "https://o1-labs.github.io/proof-systems/" @@ -8,7 +8,7 @@ edition = "2021" license = "Apache-2.0" [[bin]] -name = "arrabiata" +name = "arrabbiata" path = "src/main.rs" [dependencies] diff --git a/arrabiata/README.md b/arrabbiata/README.md similarity index 97% rename from arrabiata/README.md rename to arrabbiata/README.md index 81b68bd077..e92025b244 100644 --- a/arrabiata/README.md +++ b/arrabbiata/README.md @@ -1,4 +1,4 @@ -## Arrabiata - a generic recursive zero-knowledge argument implementation based on folding schemes +## Arrabbiata - a generic recursive zero-knowledge argument implementation based on folding schemes ### Motivation diff --git a/arrabiata/notes.md b/arrabbiata/notes.md similarity index 100% rename from arrabiata/notes.md rename to arrabbiata/notes.md diff --git a/arrabiata/src/column_env.rs b/arrabbiata/src/column_env.rs similarity index 100% rename from arrabiata/src/column_env.rs rename to arrabbiata/src/column_env.rs diff --git a/arrabiata/src/columns.rs b/arrabbiata/src/columns.rs similarity index 100% rename from arrabiata/src/columns.rs rename to arrabbiata/src/columns.rs diff --git a/arrabiata/src/constraints.rs b/arrabbiata/src/constraints.rs similarity index 100% rename from arrabiata/src/constraints.rs rename to arrabbiata/src/constraints.rs diff --git a/arrabiata/src/interpreter.rs b/arrabbiata/src/interpreter.rs similarity index 100% rename from arrabiata/src/interpreter.rs rename to arrabbiata/src/interpreter.rs diff --git a/arrabiata/src/lib.rs b/arrabbiata/src/lib.rs similarity index 100% rename from arrabiata/src/lib.rs rename to arrabbiata/src/lib.rs diff --git a/arrabiata/src/logup.rs b/arrabbiata/src/logup.rs similarity index 100% rename from arrabiata/src/logup.rs rename to arrabbiata/src/logup.rs diff --git a/arrabiata/src/main.rs b/arrabbiata/src/main.rs similarity index 99% rename from arrabiata/src/main.rs rename to arrabbiata/src/main.rs index 5d68a9ff6b..c242401495 100644 --- a/arrabiata/src/main.rs +++ b/arrabbiata/src/main.rs @@ -1,4 +1,4 @@ -use arrabiata::{ +use arrabbiata::{ interpreter::{self, InterpreterEnv}, witness::Env, IVC_CIRCUIT_SIZE, MIN_SRS_LOG2_SIZE, POSEIDON_STATE_SIZE, diff --git a/arrabiata/src/poseidon_3_60_0_5_5_fp.rs b/arrabbiata/src/poseidon_3_60_0_5_5_fp.rs similarity index 100% rename from arrabiata/src/poseidon_3_60_0_5_5_fp.rs rename to arrabbiata/src/poseidon_3_60_0_5_5_fp.rs diff --git a/arrabiata/src/poseidon_3_60_0_5_5_fq.rs b/arrabbiata/src/poseidon_3_60_0_5_5_fq.rs similarity index 100% rename from arrabiata/src/poseidon_3_60_0_5_5_fq.rs rename to arrabbiata/src/poseidon_3_60_0_5_5_fq.rs diff --git a/arrabiata/src/proof.rs b/arrabbiata/src/proof.rs similarity index 100% rename from arrabiata/src/proof.rs rename to arrabbiata/src/proof.rs diff --git a/arrabiata/src/prover.rs b/arrabbiata/src/prover.rs similarity index 100% rename from arrabiata/src/prover.rs rename to arrabbiata/src/prover.rs diff --git a/arrabiata/src/verifier.rs b/arrabbiata/src/verifier.rs similarity index 100% rename from arrabiata/src/verifier.rs rename to arrabbiata/src/verifier.rs diff --git a/arrabiata/src/witness.rs b/arrabbiata/src/witness.rs similarity index 100% rename from arrabiata/src/witness.rs rename to arrabbiata/src/witness.rs diff --git a/arrabiata/tests/constraints.rs b/arrabbiata/tests/constraints.rs similarity index 99% rename from arrabiata/tests/constraints.rs rename to arrabbiata/tests/constraints.rs index 8506e5a183..5ed9196b55 100644 --- a/arrabiata/tests/constraints.rs +++ b/arrabbiata/tests/constraints.rs @@ -1,7 +1,7 @@ use num_bigint::BigInt; use std::collections::HashMap; -use arrabiata::{ +use arrabbiata::{ columns::Gadget, constraints, interpreter::{self, Instruction}, diff --git a/arrabiata/tests/utils.rs b/arrabbiata/tests/utils.rs similarity index 100% rename from arrabiata/tests/utils.rs rename to arrabbiata/tests/utils.rs diff --git a/arrabiata/tests/witness.rs b/arrabbiata/tests/witness.rs similarity index 99% rename from arrabiata/tests/witness.rs rename to arrabbiata/tests/witness.rs index 5c8239d889..402cd9d9fa 100644 --- a/arrabiata/tests/witness.rs +++ b/arrabbiata/tests/witness.rs @@ -1,6 +1,6 @@ use ark_ec::{AffineRepr, Group}; use ark_ff::{PrimeField, UniformRand}; -use arrabiata::{ +use arrabbiata::{ interpreter::{self, Instruction, InterpreterEnv}, poseidon_3_60_0_5_5_fp, witness::Env, diff --git a/arrabiata/tests/witness_utils.rs b/arrabbiata/tests/witness_utils.rs similarity index 97% rename from arrabiata/tests/witness_utils.rs rename to arrabbiata/tests/witness_utils.rs index 7e6c78e876..7d71aba2f4 100644 --- a/arrabiata/tests/witness_utils.rs +++ b/arrabbiata/tests/witness_utils.rs @@ -3,7 +3,7 @@ //! A user is expected to use the gadget methods. //! The API of the utilities is more subject to changes. -use arrabiata::{interpreter::InterpreterEnv, witness::Env, POSEIDON_STATE_SIZE}; +use arrabbiata::{interpreter::InterpreterEnv, witness::Env, POSEIDON_STATE_SIZE}; use mina_curves::pasta::{Fp, Fq, Pallas, Vesta}; use num_bigint::BigInt; use o1_utils::FieldHelpers; diff --git a/mvpoly/tests/monomials.rs b/mvpoly/tests/monomials.rs index 902a3fcfbc..514ab7cc7b 100644 --- a/mvpoly/tests/monomials.rs +++ b/mvpoly/tests/monomials.rs @@ -575,7 +575,7 @@ fn test_build_from_variable_next_row_with_offset_given() { fn test_from_expr_ec_addition() { // Simulate a real usecase // The following lines/design look similar to the ones we use in - // o1vm/arrabiata + // o1vm/arrabbiata #[derive(Clone, Copy, PartialEq)] enum Column { X(usize), diff --git a/mvpoly/tests/prime.rs b/mvpoly/tests/prime.rs index 17cc6a3eb1..f86a2262cf 100644 --- a/mvpoly/tests/prime.rs +++ b/mvpoly/tests/prime.rs @@ -365,7 +365,7 @@ fn test_evaluation_predefined_polynomial() { fn test_from_expr_ec_addition() { // Simulate a real usecase // The following lines/design look similar to the ones we use in - // o1vm/arrabiata + // o1vm/arrabbiata #[derive(Clone, Copy, PartialEq)] enum Column { X(usize),