Merge branch 'novifinancial:main' into main

Al-Kindi-0 · Jun 29, 2022 · e7bd6f7 · e7bd6f7
2 parents ec8063f + cf3e557
commit e7bd6f7
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/air/src/air/context.rs b/air/src/air/context.rs
@@ -254,11 +254,11 @@ impl<B: StarkField> AirContext<B> {
             n > 0,
             "number of transition exemptions must be greater than zero"
         );
-        // exemptions which are for more than half the trace are probably a mistake
+        // exemptions which are for more than half the trace plus one are probably a mistake
         assert!(
-            n <= self.trace_len() / 2,
+            n <= self.trace_len() / 2 + 1,
             "number of transition exemptions cannot exceed {}, but was {}",
-            self.trace_len() / 2,
+            self.trace_len() / 2 + 1,
             n
         );
         // make sure the composition polynomial can be computed correctly with the specified

diff --git a/air/src/errors.rs b/air/src/errors.rs
@@ -8,7 +8,7 @@ use core::fmt;
 // ASSERTION ERROR
 // ================================================================================================
 /// Represents an error returned during assertion evaluation.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum AssertionError {
     /// This error occurs when an assertion is evaluated against an execution trace which does not
     /// contain a column specified by the assertion.

diff --git a/crypto/src/errors.rs b/crypto/src/errors.rs
@@ -9,7 +9,7 @@ use core::fmt;
 // ================================================================================================
 
 /// Defines errors which can occur when using Merkle trees.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum MerkleTreeError {
     /// Fewer than two leaves were used to construct a Merkle tree.
     TooFewLeaves(usize, usize),
@@ -75,7 +75,7 @@ impl fmt::Display for MerkleTreeError {
 // ================================================================================================
 
 /// Defines errors which can occur when drawing values from a random coin.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum RandomCoinError {
     /// A valid element could not be drawn from the field after the specified number of tries.
     FailedToDrawFieldElement(usize),

diff --git a/fri/src/errors.rs b/fri/src/errors.rs
@@ -12,7 +12,7 @@ use crypto::RandomCoinError;
 // ================================================================================================
 
 /// Defines errors which can occur during FRI proof verification.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum VerifierError {
     /// Attempt to draw a random value from a public coin failed.
     PublicCoinError(RandomCoinError),

diff --git a/prover/src/errors.rs b/prover/src/errors.rs
@@ -10,7 +10,7 @@ use core::fmt;
 // PROVER ERROR
 // ================================================================================================
 /// Represents an error returned by the prover during an execution of the protocol.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum ProverError {
     /// This error occurs when a transition constraint evaluated over a specific execution trace
     /// does not evaluate to zero at any of the steps.

diff --git a/utils/core/src/errors.rs b/utils/core/src/errors.rs
@@ -10,7 +10,7 @@ use core::fmt;
 // ================================================================================================
 
 /// Defines errors which can occur during deserialization.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum DeserializationError {
     /// Bytes in the input do not represent a valid value.
     InvalidValue(String),

diff --git a/verifier/src/errors.rs b/verifier/src/errors.rs
@@ -11,7 +11,7 @@ use utils::string::String;
 // VERIFIER ERROR
 // ================================================================================================
 /// Represents an error returned by the verifier during an execution of the protocol.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum VerifierError {
     /// This error occurs when base field read by a verifier from a proof does not match the
     /// base field of AIR with which the verifier was instantiated.