Skip to content
This repository has been archived by the owner on Aug 15, 2024. It is now read-only.

Commit

Permalink
quick update to expose affine X, Y
Browse files Browse the repository at this point in the history
  • Loading branch information
shamatar committed Apr 6, 2020
1 parent 04567a7 commit 11700d5
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
target
Cargo.lock
pkg
pkg
*.key
*.proof
*.data
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ homepage = "https://github.com/matter-labs/bellman"
license = "MIT/Apache-2.0"
name = "bellman_ce"
repository = "https://github.com/matter-labs/bellman"
version = "0.3.2"
version = "0.3.3"
edition = "2018"

[lib]
Expand All @@ -18,7 +18,7 @@ bit-vec = "0.6"
cfg-if = "0.1"

#pairing = {package = "pairing_ce", path = "../pairing" }
pairing = {package = "pairing_ce", version = "0.19" }
pairing = {package = "pairing_ce", version = "0.20" }
byteorder = "1"

futures= {package = "futures", version = "0.3", default_features = false, features = ["executor"]}
Expand Down
2 changes: 1 addition & 1 deletion src/cs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ impl fmt::Display for SynthesisError {
write!(f, "I/O error: ")?;
e.fmt(f)
} else {
write!(f, "{}", self.description())
write!(f, "{}", self.to_string())
}
}
}
Expand Down
16 changes: 16 additions & 0 deletions src/tests/dummy_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -485,4 +485,20 @@ impl CurveAffine for Fr {
fn into_projective(&self) -> Self::Projective {
*self
}

fn as_xy(&self) -> (&Self::Base, &Self::Base) {
(self, self)
}

fn into_xy_unchecked(&self) -> (Self::Base, Self::Base) {
(*self, *self)
}

fn from_xy_unchecked(_x: Self::Base, _y: Self::Base) -> Self {
_x
}

fn from_xy_checked(_x: Self::Base, _y: Self::Base) -> Result<Self, GroupDecodingError> {
Ok(_x)
}
}

0 comments on commit 11700d5

Please sign in to comment.