From 6c04340f77e674c441c5c912431546f6dd5ef078 Mon Sep 17 00:00:00 2001
From: Jakub Nowakowski <jakub.nowakowski@keep.network>
Date: Fri, 8 Oct 2021 17:41:07 +0200
Subject: [PATCH] Stop using errors

error is not yet supported by abigen: https://github.com/ethereum/go-ethereum/pull/23161
---
 solidity/random-beacon/contracts/RandomBeacon.sol  |  5 +----
 solidity/random-beacon/contracts/libraries/DKG.sol | 13 ++++---------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/solidity/random-beacon/contracts/RandomBeacon.sol b/solidity/random-beacon/contracts/RandomBeacon.sol
index cc01530e98..49daba4325 100644
--- a/solidity/random-beacon/contracts/RandomBeacon.sol
+++ b/solidity/random-beacon/contracts/RandomBeacon.sol
@@ -156,8 +156,6 @@ contract RandomBeacon is Ownable {
     // TODO: Can we really make it public along with the library functions?
     DKG.Data public dkg;
 
-    error NotAwaitingGenesis(uint256 groupCount);
-
     event RelayEntryParametersUpdated(
         uint256 relayRequestFee,
         uint256 relayEntrySubmissionEligibilityDelay,
@@ -328,8 +326,7 @@ contract RandomBeacon is Ownable {
     }
 
     function genesis() external {
-        // if (groups.groupCount > 0)
-        //     revert NotAwaitingGenesis(dkg.groupCount, dkg.currentState);
+        // require(groups.groupCount == 0, "not awaiting genesis");
 
         createGroup(GENESIS_SEED);
     }
diff --git a/solidity/random-beacon/contracts/libraries/DKG.sol b/solidity/random-beacon/contracts/libraries/DKG.sol
index fa303e9513..f36a54e451 100644
--- a/solidity/random-beacon/contracts/libraries/DKG.sol
+++ b/solidity/random-beacon/contracts/libraries/DKG.sol
@@ -31,16 +31,11 @@ library DKG {
         uint256 signatureThreshold;
     }
 
-    /// DKG is in an invalid state. Expected in progress: `expectedInProgress`,
-    /// but actual in progress: `actualInProgress`.
-    error InvalidInProgressState(
-        bool expectedInProgress,
-        bool actualInProgress
-    );
-
     modifier assertInProgress(Data storage self, bool expectedValue) {
-        if (isInProgress(self) != expectedValue)
-            revert InvalidInProgressState(expectedValue, isInProgress(self));
+        require(
+            isInProgress(self) == expectedValue,
+            "invalid in progress state"
+        );
         _;
     }