refactor: move ecdsa/eddsa to sub-directory

shuklaayush · Jul 11, 2023 · 4c36182 · 4c36182
1 parent 28d6314
commit 4c36182
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 12 deletions.
diff --git a/src/examples.nr b/src/examples.nr
@@ -0,0 +1,2 @@
+mod ecdsa_secp256k1;
+mod ed25519;
diff --git a/src/secp256k1.nr → src/examples/ecdsa_secp256k1.nr b/src/secp256k1.nr → src/examples/ecdsa_secp256k1.nr
@@ -233,12 +233,6 @@ fn test_secp256k1_mul5() {
 
 #[test]
 fn test_secp256k1_verification_preshashed() {
- let msghash = Fq::from_bytes([
- 0xe2, 0xc1, 0xc8, 0x3a, 0x63, 0xb4, 0x06, 0x68,
- 0xda, 0xc2, 0xd9, 0x35, 0xd0, 0x49, 0x69, 0x47,
- 0x35, 0x88, 0x35, 0x8d, 0x7e, 0xcd, 0x21, 0x1f,
- 0x12, 0xd2, 0x5c, 0x3a, 0x12, 0xf4, 0x73, 0x3a,
- ]);
  let pubkey = Point::from_affine(
  Fp::from_bytes([
  0xc7, 0x47, 0xe2, 0x47, 0x2a, 0x8e, 0xa6, 0x52,
@@ -265,6 +259,12 @@ fn test_secp256k1_verification_preshashed() {
  0x80, 0xf4, 0x61, 0x1d, 0x93, 0xcc, 0x70, 0x87,
  0xb7, 0x71, 0x4e, 0x34, 0x94, 0x98, 0x11, 0x28,
  ]);
+ let msghash = Fq::from_bytes([
+ 0xe2, 0xc1, 0xc8, 0x3a, 0x63, 0xb4, 0x06, 0x68,
+ 0xda, 0xc2, 0xd9, 0x35, 0xd0, 0x49, 0x69, 0x47,
+ 0x35, 0x88, 0x35, 0x8d, 0x7e, 0xcd, 0x21, 0x1f,
+ 0x12, 0xd2, 0x5c, 0x3a, 0x12, 0xf4, 0x73, 0x3a,
+ ]);
 
  assert(verify_signature(pubkey, r, s, msghash));
 }
diff --git a/src/secp256k1/fp.nr → src/examples/ecdsa_secp256k1/fp.nr b/src/secp256k1/fp.nr → src/examples/ecdsa_secp256k1/fp.nr
diff --git a/src/secp256k1/fq.nr → src/examples/ecdsa_secp256k1/fq.nr b/src/secp256k1/fq.nr → src/examples/ecdsa_secp256k1/fq.nr
diff --git a/src/secp256k1/swcurve.nr → src/examples/ecdsa_secp256k1/swcurve.nr b/src/secp256k1/swcurve.nr → src/examples/ecdsa_secp256k1/swcurve.nr
@@ -1,7 +1,7 @@
 use dep::std::println;
 
-use crate::secp256k1::fp::PrimeField as Fp;
-use crate::secp256k1::fq::PrimeField as Fq;
+use crate::examples::ecdsa_secp256k1::fp::PrimeField as Fp;
+use crate::examples::ecdsa_secp256k1::fq::PrimeField as Fq;
 
 // Point in three-dimensional Jacobian coordinates
 struct Point {

diff --git a/src/ed25519.nr → src/examples/ed25519.nr b/src/ed25519.nr → src/examples/ed25519.nr
diff --git a/src/ed25519/fp.nr → src/examples/ed25519/fp.nr b/src/ed25519/fp.nr → src/examples/ed25519/fp.nr
diff --git a/src/ed25519/fq.nr → src/examples/ed25519/fq.nr b/src/ed25519/fq.nr → src/examples/ed25519/fq.nr
diff --git a/src/ed25519/tecurve.nr → src/examples/ed25519/tecurve.nr b/src/ed25519/tecurve.nr → src/examples/ed25519/tecurve.nr
@@ -1,7 +1,7 @@
 use dep::std::println;
 
-use crate::ed25519::fp::PrimeField as Fp;
-use crate::ed25519::fq::PrimeField as Fq;
+use crate::examples::ed25519::fp::PrimeField as Fp;
+use crate::examples::ed25519::fq::PrimeField as Fq;
 
 // Point in extended twisted Edwards coordinates
 struct Point {

diff --git a/src/lib.nr b/src/lib.nr
@@ -2,8 +2,7 @@ use dep::std::println;
 
 mod utils;
 mod prime_field;
-mod ed25519;
-mod secp256k1;
+mod examples;
 
 // BUG: Noir doesn't automatically add `comptime` to all globals, hence strongly typed
 // Number of bits per limb.