[incubator-teaclave] branch develop updated: [services] Polish/simplify database codebase

[mssun]

This is an automated email from the ASF dual-hosted git repository.

mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git


The following commit(s) were added to refs/heads/develop by this push:
     new df81f5c  [services] Polish/simplify database codebase
df81f5c is described below

commit df81f5c3a2ed9f0c5b2dcc5445a719fdab056a1b
Author: Mingshen Sun <b...@mssun.me>
AuthorDate: Mon Jan 20 15:55:13 2020 -0800

    [services] Polish/simplify database codebase
---
 services/database/enclave/src/lib.rs     |  2 +-
 services/database/enclave/src/service.rs | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/services/database/enclave/src/lib.rs 
b/services/database/enclave/src/lib.rs
index 5b470ab..3c0da4f 100644
--- a/services/database/enclave/src/lib.rs
+++ b/services/database/enclave/src/lib.rs
@@ -73,7 +73,7 @@ fn handle_start_service(args: &StartServiceInput) -> 
Result<StartServiceOutput>
             database: RefCell::new(database),
             receiver,
         };
-        database_service.execution();
+        database_service.start();
     });
 
     let mut server = SgxTrustedTlsServer::<TeaclaveDatabaseResponse, 
TeaclaveDatabaseRequest>::new(
diff --git a/services/database/enclave/src/service.rs 
b/services/database/enclave/src/service.rs
index 471e988..eb067f2 100644
--- a/services/database/enclave/src/service.rs
+++ b/services/database/enclave/src/service.rs
@@ -134,7 +134,7 @@ impl<'a> DBQueue<'a> {
 }
 
 impl TeaclaveDatabaseService {
-    pub fn execution(&mut self) {
+    pub fn start(&mut self) {
         #[cfg(test_mode)]
         test_mode::repalce_with_mock_database(self);
 
@@ -182,19 +182,13 @@ impl TeaclaveDatabase for TeaclaveDatabaseService {
     fn enqueue(&self, request: EnqueueRequest) -> 
TeaclaveServiceResponseResult<EnqueueResponse> {
         let mut db = self.database.borrow_mut();
         let mut queue = DBQueue::open(&mut db, &request.key);
-        match queue.enqueue(&request.value) {
-            Ok(_) => Ok(EnqueueResponse {}),
-            Err(_) => Err(TeaclaveDatabaseError::LevelDbError.into()),
-        }
+        queue.enqueue(&request.value).map(|_| EnqueueResponse {})
     }
 
     fn dequeue(&self, request: DequeueRequest) -> 
TeaclaveServiceResponseResult<DequeueResponse> {
         let mut db = self.database.borrow_mut();
         let mut queue = DBQueue::open(&mut db, &request.key);
-        match queue.dequeue() {
-            Ok(value) => Ok(DequeueResponse { value }),
-            Err(e) => Err(e),
-        }
+        queue.dequeue().map(|value| DequeueResponse { value })
     }
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@teaclave.apache.org
For additional commands, e-mail: commits-h...@teaclave.apache.org