add an error type for enclave not initialized

cbeck88 · Feb 18, 2022 · aed2e61 · aed2e61
1 parent d2a58f6
commit aed2e61
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/consensus/enclave/api/src/error.rs b/consensus/enclave/api/src/error.rs
@@ -55,6 +55,9 @@ pub enum Error {
 
     /// Invalid fee configuration: {0}
     FeeMap(FeeMapError),
+
+    /// Enclave not initialized
+    NotInited,
 }
 
 impl From<MessageCipherError> for Error {

diff --git a/consensus/enclave/impl/src/lib.rs b/consensus/enclave/impl/src/lib.rs
@@ -219,7 +219,7 @@ impl ConsensusEnclave for SgxConsensusEnclave {
             .blockchain_config
             .lock()?
             .as_ref()
-            .expect("enclave was not initialized")
+            .ok_or(Error::NotInited)?
             .get_config()
             .fee_map
             .get_fee_for_token(token_id))
@@ -265,7 +265,7 @@ impl ConsensusEnclave for SgxConsensusEnclave {
             .blockchain_config
             .lock()?
             .as_ref()
-            .expect("enclave was not initialized")
+            .ok_or(Error::NotInited)?
             .responder_id(peer_id);
 
         Ok(self.ake.peer_init(&peer_id)?)
@@ -285,7 +285,7 @@ impl ConsensusEnclave for SgxConsensusEnclave {
             .blockchain_config
             .lock()?
             .as_ref()
-            .expect("enclave was not initialized")
+            .ok_or(Error::NotInited)?
             .responder_id(peer_id);
 
         Ok(self.ake.peer_connect(&peer_id, msg)?)
@@ -367,7 +367,7 @@ impl ConsensusEnclave for SgxConsensusEnclave {
         let blockchain_config = self.blockchain_config.lock()?;
         let config = blockchain_config
             .as_ref()
-            .expect("enclave was not initialized")
+            .ok_or(Error::NotInited)?
             .get_config();
 
         // Enforce that all membership proofs provided by the untrusted system for