Move library formulas from test to main package.

66 files changed, 5 insertions, 5 deletions

diff --git a/test/data/formulas/add-bc-r1rv76-jac b/pyecsca/ec/data/formulas/add-bc-r1rv76-jac
index ad7844b..ad7844b 100644
--- a/test/data/formulas/add-bc-r1rv76-jac
+++ b/pyecsca/ec/data/formulas/add-bc-r1rv76-jac
diff --git a/test/data/formulas/add-bc-r1rv76-jac.op3 b/pyecsca/ec/data/formulas/add-bc-r1rv76-jac.op3
index 5e7f521..5e7f521 100644
--- a/test/data/formulas/add-bc-r1rv76-jac.op3
+++ b/pyecsca/ec/data/formulas/add-bc-r1rv76-jac.op3
diff --git a/test/data/formulas/add-bc-r1rv76-mod b/pyecsca/ec/data/formulas/add-bc-r1rv76-mod
index 87158b5..87158b5 100644
--- a/test/data/formulas/add-bc-r1rv76-mod
+++ b/pyecsca/ec/data/formulas/add-bc-r1rv76-mod
diff --git a/test/data/formulas/add-bc-r1rv76-mod.op3 b/pyecsca/ec/data/formulas/add-bc-r1rv76-mod.op3
index 7adff36..7adff36 100644
--- a/test/data/formulas/add-bc-r1rv76-mod.op3
+++ b/pyecsca/ec/data/formulas/add-bc-r1rv76-mod.op3
diff --git a/test/data/formulas/add-bearssl-v06 b/pyecsca/ec/data/formulas/add-bearssl-v06
index b7ac8cd..b7ac8cd 100644
--- a/test/data/formulas/add-bearssl-v06
+++ b/pyecsca/ec/data/formulas/add-bearssl-v06
diff --git a/test/data/formulas/add-bearssl-v06.op3 b/pyecsca/ec/data/formulas/add-bearssl-v06.op3
index 9b3d3a9..9b3d3a9 100644
--- a/test/data/formulas/add-bearssl-v06.op3
+++ b/pyecsca/ec/data/formulas/add-bearssl-v06.op3
diff --git a/test/data/formulas/add-boringssl-p224 b/pyecsca/ec/data/formulas/add-boringssl-p224
index f3b8097..f3b8097 100644
--- a/test/data/formulas/add-boringssl-p224
+++ b/pyecsca/ec/data/formulas/add-boringssl-p224
diff --git a/test/data/formulas/add-boringssl-p224.op3 b/pyecsca/ec/data/formulas/add-boringssl-p224.op3
index bd0f88e..bd0f88e 100644
--- a/test/data/formulas/add-boringssl-p224.op3
+++ b/pyecsca/ec/data/formulas/add-boringssl-p224.op3
diff --git a/test/data/formulas/add-gecc-322 b/pyecsca/ec/data/formulas/add-gecc-322
index e174e1c..e174e1c 100644
--- a/test/data/formulas/add-gecc-322
+++ b/pyecsca/ec/data/formulas/add-gecc-322
diff --git a/test/data/formulas/add-gecc-322.op3 b/pyecsca/ec/data/formulas/add-gecc-322.op3
index 731bcda..731bcda 100644
--- a/test/data/formulas/add-gecc-322.op3
+++ b/pyecsca/ec/data/formulas/add-gecc-322.op3
diff --git a/test/data/formulas/add-libgcrypt-v1102 b/pyecsca/ec/data/formulas/add-libgcrypt-v1102
index 3d542ed..3d542ed 100644
--- a/test/data/formulas/add-libgcrypt-v1102
+++ b/pyecsca/ec/data/formulas/add-libgcrypt-v1102
diff --git a/test/data/formulas/add-libgcrypt-v1102.op3 b/pyecsca/ec/data/formulas/add-libgcrypt-v1102.op3
index d41d7b8..d41d7b8 100644
--- a/test/data/formulas/add-libgcrypt-v1102.op3
+++ b/pyecsca/ec/data/formulas/add-libgcrypt-v1102.op3
diff --git a/test/data/formulas/add-libressl-v382 b/pyecsca/ec/data/formulas/add-libressl-v382
index b40a190..b40a190 100644
--- a/test/data/formulas/add-libressl-v382
+++ b/pyecsca/ec/data/formulas/add-libressl-v382
diff --git a/test/data/formulas/add-libressl-v382.op3 b/pyecsca/ec/data/formulas/add-libressl-v382.op3
index 0a8aa33..0a8aa33 100644
--- a/test/data/formulas/add-libressl-v382.op3
+++ b/pyecsca/ec/data/formulas/add-libressl-v382.op3
diff --git a/test/data/formulas/add-openssl-z256 b/pyecsca/ec/data/formulas/add-openssl-z256
index 84efc9d..84efc9d 100644
--- a/test/data/formulas/add-openssl-z256
+++ b/pyecsca/ec/data/formulas/add-openssl-z256
diff --git a/test/data/formulas/add-openssl-z256.op3 b/pyecsca/ec/data/formulas/add-openssl-z256.op3
index 3819546..3819546 100644
--- a/test/data/formulas/add-openssl-z256.op3
+++ b/pyecsca/ec/data/formulas/add-openssl-z256.op3
diff --git a/test/data/formulas/add-openssl-z256a b/pyecsca/ec/data/formulas/add-openssl-z256a
index 71de9d0..71de9d0 100644
--- a/test/data/formulas/add-openssl-z256a
+++ b/pyecsca/ec/data/formulas/add-openssl-z256a
diff --git a/test/data/formulas/add-openssl-z256a.op3 b/pyecsca/ec/data/formulas/add-openssl-z256a.op3
index 23f90e6..23f90e6 100644
--- a/test/data/formulas/add-openssl-z256a.op3
+++ b/pyecsca/ec/data/formulas/add-openssl-z256a.op3
diff --git a/test/data/formulas/add-sunec-v21 b/pyecsca/ec/data/formulas/add-sunec-v21
index 2d6f395..2d6f395 100644
--- a/test/data/formulas/add-sunec-v21
+++ b/pyecsca/ec/data/formulas/add-sunec-v21
diff --git a/test/data/formulas/add-sunec-v21-ed25519 b/pyecsca/ec/data/formulas/add-sunec-v21-ed25519
index 5814455..5814455 100644
--- a/test/data/formulas/add-sunec-v21-ed25519
+++ b/pyecsca/ec/data/formulas/add-sunec-v21-ed25519
diff --git a/test/data/formulas/add-sunec-v21-ed25519.op3 b/pyecsca/ec/data/formulas/add-sunec-v21-ed25519.op3
index 2498a1f..2498a1f 100644
--- a/test/data/formulas/add-sunec-v21-ed25519.op3
+++ b/pyecsca/ec/data/formulas/add-sunec-v21-ed25519.op3
diff --git a/test/data/formulas/add-sunec-v21.op3 b/pyecsca/ec/data/formulas/add-sunec-v21.op3
index d682b16..d682b16 100644
--- a/test/data/formulas/add-sunec-v21.op3
+++ b/pyecsca/ec/data/formulas/add-sunec-v21.op3
diff --git a/test/data/formulas/dbl-bc-r1rv76-jac b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-jac
index 8fca349..8fca349 100644
--- a/test/data/formulas/dbl-bc-r1rv76-jac
+++ b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-jac
diff --git a/test/data/formulas/dbl-bc-r1rv76-jac.op3 b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-jac.op3
index c4ebef2..c4ebef2 100644
--- a/test/data/formulas/dbl-bc-r1rv76-jac.op3
+++ b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-jac.op3
diff --git a/test/data/formulas/dbl-bc-r1rv76-mod b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-mod
index f9b9843..f9b9843 100644
--- a/test/data/formulas/dbl-bc-r1rv76-mod
+++ b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-mod
diff --git a/test/data/formulas/dbl-bc-r1rv76-mod.op3 b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-mod.op3
index 201408e..201408e 100644
--- a/test/data/formulas/dbl-bc-r1rv76-mod.op3
+++ b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-mod.op3
diff --git a/test/data/formulas/dbl-bc-r1rv76-x25519 b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-x25519
index d5d73fb..d5d73fb 100644
--- a/test/data/formulas/dbl-bc-r1rv76-x25519
+++ b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-x25519
diff --git a/test/data/formulas/dbl-bc-r1rv76-x25519.op3 b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-x25519.op3
index 86f2e50..86f2e50 100644
--- a/test/data/formulas/dbl-bc-r1rv76-x25519.op3
+++ b/pyecsca/ec/data/formulas/dbl-bc-r1rv76-x25519.op3
diff --git a/test/data/formulas/dbl-bearssl-v06 b/pyecsca/ec/data/formulas/dbl-bearssl-v06
index 9479888..9479888 100644
--- a/test/data/formulas/dbl-bearssl-v06
+++ b/pyecsca/ec/data/formulas/dbl-bearssl-v06
diff --git a/test/data/formulas/dbl-bearssl-v06.op3 b/pyecsca/ec/data/formulas/dbl-bearssl-v06.op3
index c89c340..c89c340 100644
--- a/test/data/formulas/dbl-bearssl-v06.op3
+++ b/pyecsca/ec/data/formulas/dbl-bearssl-v06.op3
diff --git a/test/data/formulas/dbl-boringssl-p224 b/pyecsca/ec/data/formulas/dbl-boringssl-p224
index db28389..db28389 100644
--- a/test/data/formulas/dbl-boringssl-p224
+++ b/pyecsca/ec/data/formulas/dbl-boringssl-p224
diff --git a/test/data/formulas/dbl-boringssl-p224.op3 b/pyecsca/ec/data/formulas/dbl-boringssl-p224.op3
index a0d6fe8..a0d6fe8 100644
--- a/test/data/formulas/dbl-boringssl-p224.op3
+++ b/pyecsca/ec/data/formulas/dbl-boringssl-p224.op3
diff --git a/test/data/formulas/dbl-gecc-321 b/pyecsca/ec/data/formulas/dbl-gecc-321
index 33c3b85..33c3b85 100644
--- a/test/data/formulas/dbl-gecc-321
+++ b/pyecsca/ec/data/formulas/dbl-gecc-321
diff --git a/test/data/formulas/dbl-gecc-321.op3 b/pyecsca/ec/data/formulas/dbl-gecc-321.op3
index b9e7697..b9e7697 100644
--- a/test/data/formulas/dbl-gecc-321.op3
+++ b/pyecsca/ec/data/formulas/dbl-gecc-321.op3
diff --git a/test/data/formulas/dbl-hacl-x25519 b/pyecsca/ec/data/formulas/dbl-hacl-x25519
index b2a1d00..b2a1d00 100644
--- a/test/data/formulas/dbl-hacl-x25519
+++ b/pyecsca/ec/data/formulas/dbl-hacl-x25519
diff --git a/test/data/formulas/dbl-hacl-x25519.op3 b/pyecsca/ec/data/formulas/dbl-hacl-x25519.op3
index 8b315db..8b315db 100644
--- a/test/data/formulas/dbl-hacl-x25519.op3
+++ b/pyecsca/ec/data/formulas/dbl-hacl-x25519.op3
diff --git a/test/data/formulas/dbl-ipp-x25519 b/pyecsca/ec/data/formulas/dbl-ipp-x25519
index 9010ee9..9010ee9 100644
--- a/test/data/formulas/dbl-ipp-x25519
+++ b/pyecsca/ec/data/formulas/dbl-ipp-x25519
diff --git a/test/data/formulas/dbl-ipp-x25519.op3 b/pyecsca/ec/data/formulas/dbl-ipp-x25519.op3
index baaeb54..baaeb54 100644
--- a/test/data/formulas/dbl-ipp-x25519.op3
+++ b/pyecsca/ec/data/formulas/dbl-ipp-x25519.op3
diff --git a/test/data/formulas/dbl-libgcrypt-v1102 b/pyecsca/ec/data/formulas/dbl-libgcrypt-v1102
index fdb3878..fdb3878 100644
--- a/test/data/formulas/dbl-libgcrypt-v1102
+++ b/pyecsca/ec/data/formulas/dbl-libgcrypt-v1102
diff --git a/test/data/formulas/dbl-libgcrypt-v1102.op3 b/pyecsca/ec/data/formulas/dbl-libgcrypt-v1102.op3
index 3ae81dd..3ae81dd 100644
--- a/test/data/formulas/dbl-libgcrypt-v1102.op3
+++ b/pyecsca/ec/data/formulas/dbl-libgcrypt-v1102.op3
diff --git a/test/data/formulas/dbl-libressl-v382 b/pyecsca/ec/data/formulas/dbl-libressl-v382
index 1f0c618..1f0c618 100644
--- a/test/data/formulas/dbl-libressl-v382
+++ b/pyecsca/ec/data/formulas/dbl-libressl-v382
diff --git a/test/data/formulas/dbl-libressl-v382.op3 b/pyecsca/ec/data/formulas/dbl-libressl-v382.op3
index 2bb4541..2bb4541 100644
--- a/test/data/formulas/dbl-libressl-v382.op3
+++ b/pyecsca/ec/data/formulas/dbl-libressl-v382.op3
diff --git a/test/data/formulas/dbl-secp256k1-v040 b/pyecsca/ec/data/formulas/dbl-secp256k1-v040
index 1ed844d..1ed844d 100644
--- a/test/data/formulas/dbl-secp256k1-v040
+++ b/pyecsca/ec/data/formulas/dbl-secp256k1-v040
diff --git a/test/data/formulas/dbl-secp256k1-v040.op3 b/pyecsca/ec/data/formulas/dbl-secp256k1-v040.op3
index 18d0c06..18d0c06 100644
--- a/test/data/formulas/dbl-secp256k1-v040.op3
+++ b/pyecsca/ec/data/formulas/dbl-secp256k1-v040.op3
diff --git a/test/data/formulas/dbl-sunec-v21 b/pyecsca/ec/data/formulas/dbl-sunec-v21
index 663793a..663793a 100644
--- a/test/data/formulas/dbl-sunec-v21
+++ b/pyecsca/ec/data/formulas/dbl-sunec-v21
diff --git a/test/data/formulas/dbl-sunec-v21-ed25519 b/pyecsca/ec/data/formulas/dbl-sunec-v21-ed25519
index f20095f..f20095f 100644
--- a/test/data/formulas/dbl-sunec-v21-ed25519
+++ b/pyecsca/ec/data/formulas/dbl-sunec-v21-ed25519
diff --git a/test/data/formulas/dbl-sunec-v21-ed25519.op3 b/pyecsca/ec/data/formulas/dbl-sunec-v21-ed25519.op3
index 9f25c7e..9f25c7e 100644
--- a/test/data/formulas/dbl-sunec-v21-ed25519.op3
+++ b/pyecsca/ec/data/formulas/dbl-sunec-v21-ed25519.op3
diff --git a/test/data/formulas/dbl-sunec-v21.op3 b/pyecsca/ec/data/formulas/dbl-sunec-v21.op3
index 7480ec6..7480ec6 100644
--- a/test/data/formulas/dbl-sunec-v21.op3
+++ b/pyecsca/ec/data/formulas/dbl-sunec-v21.op3
diff --git a/test/data/formulas/ladd-bc-r1rv76-x25519 b/pyecsca/ec/data/formulas/ladd-bc-r1rv76-x25519
index 01cc06d..01cc06d 100644
--- a/test/data/formulas/ladd-bc-r1rv76-x25519
+++ b/pyecsca/ec/data/formulas/ladd-bc-r1rv76-x25519
diff --git a/test/data/formulas/ladd-bc-r1rv76-x25519.op3 b/pyecsca/ec/data/formulas/ladd-bc-r1rv76-x25519.op3
index 2859b26..2859b26 100644
--- a/test/data/formulas/ladd-bc-r1rv76-x25519.op3
+++ b/pyecsca/ec/data/formulas/ladd-bc-r1rv76-x25519.op3
diff --git a/test/data/formulas/ladd-boringssl-x25519 b/pyecsca/ec/data/formulas/ladd-boringssl-x25519
index a1ed9a9..a1ed9a9 100644
--- a/test/data/formulas/ladd-boringssl-x25519
+++ b/pyecsca/ec/data/formulas/ladd-boringssl-x25519
diff --git a/test/data/formulas/ladd-boringssl-x25519.op3 b/pyecsca/ec/data/formulas/ladd-boringssl-x25519.op3
index 738d213..738d213 100644
--- a/test/data/formulas/ladd-boringssl-x25519.op3
+++ b/pyecsca/ec/data/formulas/ladd-boringssl-x25519.op3
diff --git a/test/data/formulas/ladd-botan-x25519 b/pyecsca/ec/data/formulas/ladd-botan-x25519
index ae1571d..ae1571d 100644
--- a/test/data/formulas/ladd-botan-x25519
+++ b/pyecsca/ec/data/formulas/ladd-botan-x25519
diff --git a/test/data/formulas/ladd-botan-x25519.op3 b/pyecsca/ec/data/formulas/ladd-botan-x25519.op3
index b375514..b375514 100644
--- a/test/data/formulas/ladd-botan-x25519.op3
+++ b/pyecsca/ec/data/formulas/ladd-botan-x25519.op3
diff --git a/test/data/formulas/ladd-go-1214 b/pyecsca/ec/data/formulas/ladd-go-1214
index c6ca9da..c6ca9da 100644
--- a/test/data/formulas/ladd-go-1214
+++ b/pyecsca/ec/data/formulas/ladd-go-1214
diff --git a/test/data/formulas/ladd-go-1214.op3 b/pyecsca/ec/data/formulas/ladd-go-1214.op3
index 3bf8e7d..3bf8e7d 100644
--- a/test/data/formulas/ladd-go-1214.op3
+++ b/pyecsca/ec/data/formulas/ladd-go-1214.op3
diff --git a/test/data/formulas/ladd-hacl-x25519 b/pyecsca/ec/data/formulas/ladd-hacl-x25519
index ece09fc..ece09fc 100644
--- a/test/data/formulas/ladd-hacl-x25519
+++ b/pyecsca/ec/data/formulas/ladd-hacl-x25519
diff --git a/test/data/formulas/ladd-hacl-x25519.op3 b/pyecsca/ec/data/formulas/ladd-hacl-x25519.op3
index 7893eb9..7893eb9 100644
--- a/test/data/formulas/ladd-hacl-x25519.op3
+++ b/pyecsca/ec/data/formulas/ladd-hacl-x25519.op3
diff --git a/test/data/formulas/ladd-openssl-x25519 b/pyecsca/ec/data/formulas/ladd-openssl-x25519
index 5f94535..5f94535 100644
--- a/test/data/formulas/ladd-openssl-x25519
+++ b/pyecsca/ec/data/formulas/ladd-openssl-x25519
diff --git a/test/data/formulas/ladd-openssl-x25519.op3 b/pyecsca/ec/data/formulas/ladd-openssl-x25519.op3
index f781529..f781529 100644
--- a/test/data/formulas/ladd-openssl-x25519.op3
+++ b/pyecsca/ec/data/formulas/ladd-openssl-x25519.op3
diff --git a/test/data/formulas/ladd-rfc7748 b/pyecsca/ec/data/formulas/ladd-rfc7748
index 18fd36c..18fd36c 100644
--- a/test/data/formulas/ladd-rfc7748
+++ b/pyecsca/ec/data/formulas/ladd-rfc7748
diff --git a/test/data/formulas/ladd-rfc7748.op3 b/pyecsca/ec/data/formulas/ladd-rfc7748.op3
index 8ea3d94..8ea3d94 100644
--- a/test/data/formulas/ladd-rfc7748.op3
+++ b/pyecsca/ec/data/formulas/ladd-rfc7748.op3
diff --git a/test/data/formulas/madd-secp256k1-v040 b/pyecsca/ec/data/formulas/madd-secp256k1-v040
index 54341ee..54341ee 100644
--- a/test/data/formulas/madd-secp256k1-v040
+++ b/pyecsca/ec/data/formulas/madd-secp256k1-v040
diff --git a/test/data/formulas/madd-secp256k1-v040.op3 b/pyecsca/ec/data/formulas/madd-secp256k1-v040.op3
index 716a51f..5b062cd 100644
--- a/test/data/formulas/madd-secp256k1-v040.op3
+++ b/pyecsca/ec/data/formulas/madd-secp256k1-v040.op3
@@ -2,7 +2,7 @@ zz = Z1^2
 u1 = X1
 u2 = X2*zz
 s1 = Y1
-s2 = Y2*zz 
+s2 = Y2*zz
 s2 = s2*Z1
 t = u1+u2
 m = s1+s2
@@ -27,4 +27,4 @@ t = t+q
 t = t*rralt
 t = t+n
 Y3 = -t
-Y3 = Y3/2
\ No newline at end of file
+Y3 = Y3/2
diff --git a/test/data/formulas/__init__.py b/test/data/formulas/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/test/data/formulas/__init__.py
+++ /dev/null
diff --git a/test/ec/test_formula.py b/test/ec/test_formula.py
index 4f64d36..e5fce6e 100644
--- a/test/ec/test_formula.py
+++ b/test/ec/test_formula.py
@@ -5,7 +5,7 @@ from typing import Tuple
 import pytest
 from sympy import FF, symbols
 from importlib_resources import files, as_file
-import test.data.formulas
+import pyecsca.ec
 from pyecsca.ec.formula.expand import expand_formula_set
 from pyecsca.ec.formula.fliparoo import generate_fliparood_formulas
 from pyecsca.ec.formula.graph import rename_ivs
@@ -418,8 +418,8 @@ def library_formula_params(request) -> Tuple[CodeFormula, DomainParameters]:
     name, model, coords_name, param_spec, formula_type = request.param
     model = model()
     coordinate_model = model.coordinates[coords_name]
-    with as_file(files(test.data.formulas).joinpath(name)) as meta_path, as_file(
-        files(test.data.formulas).joinpath(name + ".op3")
+    with as_file(files(pyecsca.ec).joinpath("data", "formulas", name)) as meta_path, as_file(
+        files(pyecsca.ec).joinpath("data", "formulas", name + ".op3")
     ) as op3_path:
         formula = formula_type(meta_path, op3_path, name, coordinate_model).to_code()
     params = get_params(*param_spec, coords_name)