Skip to content

Commit 4fbc3d7

Browse files
committed
Import ceno-goldilocks main branch
1 parent d792b15 commit 4fbc3d7

File tree

5 files changed

+18
-23
lines changed

5 files changed

+18
-23
lines changed

circ_blocks/Cargo.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spartan_parallel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ zeroize = { version = "1", default-features = false, features = ["alloc"] }
2828
itertools = { version = "0.13", default-features = false }
2929
colored = { version = "2", default-features = false, optional = true }
3030
flate2 = { version = "1" }
31-
ceno-goldilocks = { git = "https://github.com/scroll-tech/ceno-Goldilocks.git", branch = "fix/crate-ready" }
31+
goldilocks = { git = "https://github.com/scroll-tech/ceno-Goldilocks" }
3232
ff = "0.13.0"
3333

3434
[dev-dependencies]

spartan_parallel/src/scalar/fp.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::SpartanExtensionField;
22
use crate::{ProofTranscript, Transcript};
3-
use ceno_goldilocks::Goldilocks;
3+
use goldilocks::{Goldilocks, MODULUS as P};
44
use core::borrow::Borrow;
55
use core::iter::{Product, Sum};
66
use core::ops::{Add, AddAssign, Mul, MulAssign, Sub, SubAssign};
@@ -11,11 +11,6 @@ use std::ops::Neg;
1111
use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
1212
use zeroize::Zeroize;
1313

14-
/// Constant representing the modulus
15-
/// q = 2^64 - 2^32 + 1
16-
/// 0xFFFFFFFF00000001
17-
const P: u64 = ceno_goldilocks::MODULUS;
18-
1914
/// Field wrapper around base Goldilocks
2015
#[derive(Clone, Copy, Eq, Serialize, Deserialize, Hash, Debug)]
2116
pub struct Scalar(Goldilocks);

spartan_parallel/src/scalar/fp2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::Scalar;
22
use super::SpartanExtensionField;
33
use crate::{AppendToTranscript, ProofTranscript, Transcript};
4-
use ceno_goldilocks::{ExtensionField, Goldilocks, GoldilocksExt2};
4+
use goldilocks::{ExtensionField, Goldilocks, GoldilocksExt2};
55
use core::borrow::Borrow;
66
use core::iter::{Product, Sum};
77
use core::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};

spartan_parallel/src/scalar/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mod fp;
22
mod fp2;
33

4-
use ceno_goldilocks::ExtensionField;
4+
use goldilocks::ExtensionField;
55
use ff::Field;
66
pub use fp::Scalar;
77
pub use fp2::ScalarExt2;

0 commit comments

Comments
 (0)