Remove Schnorr from stdlib

noir-lang · Dec 9, 2024 · e935934 · e935934
1 parent 909b22b
commit e935934
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 261 deletions.
diff --git a/compiler/noirc_frontend/src/hir/comptime/interpreter/foreign.rs b/compiler/noirc_frontend/src/hir/comptime/interpreter/foreign.rs
@@ -87,7 +87,6 @@ fn call_foreign(
         "sha256_compression" => sha256_compression(interner, args, location),
         _ => {
             let explanation = match name {
-                "schnorr_verify" => "Schnorr verification will be removed.".into(),
                 "and" | "xor" => "It should be turned into a binary operation.".into(),
                 "recursive_aggregation" => "A proof cannot be verified at comptime.".into(),
                 _ => {

diff --git a/docs/docs/noir/standard_library/black_box_fns.md b/docs/docs/noir/standard_library/black_box_fns.md
@@ -14,7 +14,6 @@ Here is a list of the current black box functions:
 
 - [AES128](./cryptographic_primitives/ciphers.mdx#aes128)
 - [SHA256](./cryptographic_primitives/hashes.mdx#sha256)
-- [Schnorr signature verification](./cryptographic_primitives/schnorr.mdx)
 - [Blake2s](./cryptographic_primitives/hashes.mdx#blake2s)
 - [Blake3](./cryptographic_primitives/hashes.mdx#blake3)
 - [Pedersen Hash](./cryptographic_primitives/hashes.mdx#pedersen_hash)

diff --git a/docs/docs/noir/standard_library/cryptographic_primitives/schnorr.mdx b/docs/docs/noir/standard_library/cryptographic_primitives/schnorr.mdx
diff --git a/noir_stdlib/src/lib.nr b/noir_stdlib/src/lib.nr
@@ -3,7 +3,6 @@ pub mod aes128;
 pub mod array;
 pub mod slice;
 pub mod merkle;
-pub mod schnorr;
 pub mod ecdsa_secp256k1;
 pub mod ecdsa_secp256r1;
 pub mod embedded_curve_ops;

diff --git a/noir_stdlib/src/schnorr.nr b/noir_stdlib/src/schnorr.nr
diff --git a/test_programs/compile_success_empty/schnorr_simplification/Nargo.toml b/test_programs/compile_success_empty/schnorr_simplification/Nargo.toml
diff --git a/test_programs/compile_success_empty/schnorr_simplification/src/main.nr b/test_programs/compile_success_empty/schnorr_simplification/src/main.nr
diff --git a/test_programs/execution_success/schnorr/Nargo.toml b/test_programs/execution_success/schnorr/Nargo.toml
diff --git a/test_programs/execution_success/schnorr/Prover.toml b/test_programs/execution_success/schnorr/Prover.toml
diff --git a/test_programs/execution_success/schnorr/src/main.nr b/test_programs/execution_success/schnorr/src/main.nr
diff --git a/tooling/nargo_cli/src/cli/test_cmd.rs b/tooling/nargo_cli/src/cli/test_cmd.rs
@@ -304,3 +304,31 @@ fn display_test_report(
 
     Ok(())
 }
+
+#[cfg(test)]
+mod tests {
+    use std::io::Write;
+    use std::{thread, time::Duration};
+    use termcolor::{ColorChoice, StandardStream};
+
+    #[test]
+    fn test_stderr_lock() {
+        for i in 0..4 {
+            thread::spawn(move || {
+                let mut writer = StandardStream::stderr(ColorChoice::Always);
+                //let mut writer = writer.lock();
+
+                let mut show = |msg| {
+                    thread::sleep(Duration::from_millis(10));
+                    //println!("{i} {msg}");
+                    writeln!(writer, "{i} {msg}").unwrap();
+                };
+
+                show("a");
+                show("b");
+                show("c");
+            });
+        }
+        thread::sleep(Duration::from_millis(100));
+    }
+}