Revert "Merge pull request #2463 from AleoHQ/feat/testnetv1"

This reverts commit 0bd71b5, reversing changes made to f6ace91.
AleoNet · May 24, 2024 · a129de0 · a129de0
1 parent 54c17c0
commit a129de0
Show file tree

Hide file tree

Showing 48 changed files with 4 additions and 1,845 deletions.
diff --git a/circuit/environment/src/canary_circuit.rs b/circuit/environment/src/canary_circuit.rs
diff --git a/circuit/environment/src/helpers/converter.rs b/circuit/environment/src/helpers/converter.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use crate::{CanaryCircuit, Circuit, LinearCombination, TestnetCircuit, Variable, R1CS};
+use crate::{Circuit, LinearCombination, TestnetCircuit, Variable, R1CS};
 use snarkvm_curves::edwards_bls12::Fq;
 use snarkvm_fields::PrimeField;
 
@@ -44,16 +44,6 @@ impl snarkvm_algorithms::r1cs::ConstraintSynthesizer<Fq> for TestnetCircuit {
     }
 }
 
-impl snarkvm_algorithms::r1cs::ConstraintSynthesizer<Fq> for CanaryCircuit {
-    /// Synthesizes the constraints from the environment into a `snarkvm_algorithms::r1cs`-compliant constraint system.
-    fn generate_constraints<CS: snarkvm_algorithms::r1cs::ConstraintSystem<Fq>>(
-        &self,
-        cs: &mut CS,
-    ) -> Result<(), snarkvm_algorithms::r1cs::SynthesisError> {
-        crate::canary_circuit::CANARY_CIRCUIT.with(|circuit| circuit.borrow().generate_constraints(cs))
-    }
-}
-
 impl<F: PrimeField> R1CS<F> {
     /// Synthesizes the constraints from the environment into a `snarkvm_algorithms::r1cs`-compliant constraint system.
     fn generate_constraints<CS: snarkvm_algorithms::r1cs::ConstraintSystem<F>>(

diff --git a/circuit/environment/src/lib.rs b/circuit/environment/src/lib.rs
@@ -19,9 +19,6 @@ extern crate snarkvm_circuit_environment_witness;
 
 pub use snarkvm_circuit_environment_witness::rename_selfs;
 
-pub mod canary_circuit;
-pub use canary_circuit::*;
-
 pub mod circuit;
 pub use circuit::*;