Merge branch 'main' into main

arkworks-rs · Feb 3, 2024 · 97e7d51 · 97e7d51
2 parents c4cd0af + 9f9324b
commit 97e7d51
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,6 @@
 name: CI
 on:
+  merge_group:
   pull_request:
   push:
     branches:

diff --git a/Cargo.toml b/Cargo.toml
@@ -121,8 +121,8 @@ ark-ec = { git = "https://github.com/arkworks-rs/algebra/" }
 ark-poly = { git = "https://github.com/arkworks-rs/algebra/" }
 ark-serialize = { git = "https://github.com/arkworks-rs/algebra/" }
 
-ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/curves/" }
-ark-ed-on-bls12-381 = { git = "https://github.com/arkworks-rs/curves/" }
-ark-bls12-377 = { git = "https://github.com/arkworks-rs/curves/" }
-ark-mnt4-298 = { git = "https://github.com/arkworks-rs/curves/" }
-ark-mnt6-298 = { git = "https://github.com/arkworks-rs/curves/" }
+ark-ed-on-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" }
+ark-ed-on-bls12-381 = { git = "https://github.com/arkworks-rs/algebra/" }
+ark-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" }
+ark-mnt4-298 = { git = "https://github.com/arkworks-rs/algebra/" }
+ark-mnt6-298 = { git = "https://github.com/arkworks-rs/algebra/" }
diff --git a/src/sponge/absorb.rs b/src/sponge/absorb.rs
@@ -154,7 +154,7 @@ impl<P: FpConfig<N>, const N: usize> Absorb for Fp<P, N> {
         self.serialize_compressed(dest).unwrap()
     }
     fn to_sponge_field_elements<F: PrimeField>(&self, dest: &mut Vec<F>) {
-        let _ = field_cast(&[*self], dest);
+        let _ = field_cast(&[*self], dest).unwrap();
     }
     fn batch_to_sponge_field_elements<F: PrimeField>(batch: &[Self], dest: &mut Vec<F>)
     where