rename modules for consistency

Author: martyall

Diff for: arithmetic-circuits.cabal

@@ -37,7 +37,7 @@ common extensions
     RecordWildCards
 
 common warnings
-  ghc-options: -Wall -Wredundant-constraints -Werror
+  ghc-options: -Wall -Wredundant-constraints
 
 
 common deps
@@ -104,17 +104,21 @@ library circom-compat
   import: deps, extensions, warnings
   visibility: public
   exposed-modules:
-    Circuit.Solver.Circom
     FNV
-    R1CS.Circom
+    Circom.CLI
+    Circom.Solver
+    Circom.R1CS
 
   other-modules:      Paths_arithmetic_circuits
   hs-source-dirs:     circom-compat/src
   build-depends:
-      arithmetic-circuits
+      aeson-pretty
+    , arithmetic-circuits
     , arithmetic-circuits:language
     , binary
     , bytestring
+    , directory
+    , optparse-applicative
     , vector
 
   ghc-options:        -freverse-errors -O2 -Wall
@@ -215,7 +219,7 @@ test-suite circom-compat-tests
 
   other-modules:
     Paths_arithmetic_circuits
-    Test.R1CS.Circom
+    Test.Circom.R1CS
 
   hs-source-dirs:     circom-compat/test
 

Diff for: circom-compat/src/R1CS/Circom.hs renamed to circom-compat/src/Circom/R1CS.hs

@@ -1,4 +1,4 @@
-module R1CS.Circom
+module Circom.R1CS
   ( CircomR1CS (..),
     r1csToCircomR1CS,
     r1csFromCircomR1CS,

Diff for: circom-compat/src/Circuit/Solver/Circom.hs renamed to circom-compat/src/Circom/Solver.hs

@@ -1,4 +1,4 @@
-module Circuit.Solver.Circom
+module Circom.Solver
   ( CircomProgram,
     cpVars,
     cpCircuit,
@@ -23,6 +23,7 @@ module Circuit.Solver.Circom
   )
 where
 
+import Circom.R1CS (CircomWitness, FieldSize (..), circomReindexMap, integerFromLittleEndian, integerToLittleEndian, n32, witnessToCircomWitness)
 import Circuit
 import Data.Binary (Binary)
 import Data.Field.Galois (GaloisField, PrimeField (fromP), char)
@@ -36,7 +37,6 @@ import Data.Vector.Mutable qualified as MV
 import FNV (FNVHash (..), hashText, mkFNV)
 import Protolude
 import R1CS (Inputs (..), Witness (..), oneVar)
-import R1CS.Circom (CircomWitness, FieldSize (..), circomReindexMap, integerFromLittleEndian, integerToLittleEndian, n32, witnessToCircomWitness)
 import Text.PrettyPrint.Leijen.Text (Pretty (pretty), (<+>))
 
 data CircomProgram f = CircomProgram

Diff for: circom-compat/test/Test/R1CS/Circom.hs renamed to circom-compat/test/Test/Circom/R1CS.hs

@@ -1,12 +1,12 @@
-module Test.R1CS.Circom where
+module Test.Circom.R1CS where
 
+import Circom.R1CS
 import Data.Binary (decode, decodeFileOrFail, encode)
 import Data.Binary.Get (ByteOffset)
 import Data.Field.Galois (Prime)
 import FNV
 import Protolude
 import R1CS (validateWitness)
-import R1CS.Circom
 import Test.Hspec
 import Test.QuickCheck
 import Prelude (String)