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 6b62725 [services] Rename database/dbs service to storage service
6b62725 is described below
commit 6b6272590a574e526de8864721c6eee1ea7a83b4
Author: Mingshen Sun <[email protected]>
AuthorDate: Tue Feb 4 14:37:00 2020 -0800
[services] Rename database/dbs service to storage service
---
cmake/scripts/test.sh | 2 +-
cmake/tomls/Cargo.sgx_trusted_lib.toml | 2 +-
cmake/tomls/Cargo.sgx_untrusted_app.toml | 2 +-
config/runtime.config.toml | 2 +-
config/src/runtime.rs | 2 +-
services/proto/build.rs | 2 +-
services/proto/src/lib.rs | 6 ++--
...ervice.proto => teaclave_storage_service.proto} | 4 +--
...base_service.rs => teaclave_storage_service.rs} | 10 +++---
services/{database => storage}/app/Cargo.toml | 4 +--
services/{database => storage}/app/build.rs | 0
services/{database => storage}/app/src/main.rs | 0
services/{database => storage}/enclave/Cargo.toml | 6 ++--
.../enclave/Enclave.config.xml | 0
services/{database => storage}/enclave/src/lib.rs | 16 ++++-----
.../{database => storage}/enclave/src/proxy.rs | 20 +++++------
.../{database => storage}/enclave/src/service.rs | 42 +++++++++++-----------
tests/fixtures/runtime.config.toml | 2 +-
tests/functional_tests/enclave/src/lib.rs | 4 +--
...base_service.rs => teaclave_storage_service.rs} | 16 ++++-----
.../app/src/teaclave_config_tests.rs | 9 +++--
tests/unit_tests/enclave/Cargo.toml | 6 ++--
tests/unit_tests/enclave/src/lib.rs | 2 +-
23 files changed, 79 insertions(+), 80 deletions(-)
diff --git a/cmake/scripts/test.sh b/cmake/scripts/test.sh
index 01e9458..3303053 100755
--- a/cmake/scripts/test.sh
+++ b/cmake/scripts/test.sh
@@ -39,7 +39,7 @@ trap 'kill $(jobs -p)' EXIT
pushd ${MESATEE_SERVICE_INSTALL_DIR}
./teaclave_authentication_service &
sleep 3 # wait for authentication service
-./teaclave_database_service &
+./teaclave_storage_service &
./teaclave_execution_service &
./teaclave_frontend_service &
popd
diff --git a/cmake/tomls/Cargo.sgx_trusted_lib.toml
b/cmake/tomls/Cargo.sgx_trusted_lib.toml
index 01699f7..f8f805d 100644
--- a/cmake/tomls/Cargo.sgx_trusted_lib.toml
+++ b/cmake/tomls/Cargo.sgx_trusted_lib.toml
@@ -2,7 +2,7 @@
members = [
"services/authentication/enclave",
- "services/database/enclave",
+ "services/storage/enclave",
"services/execution/enclave",
"services/frontend/enclave",
"services/management/enclave",
diff --git a/cmake/tomls/Cargo.sgx_untrusted_app.toml
b/cmake/tomls/Cargo.sgx_untrusted_app.toml
index 04158fc..f7517a9 100644
--- a/cmake/tomls/Cargo.sgx_untrusted_app.toml
+++ b/cmake/tomls/Cargo.sgx_untrusted_app.toml
@@ -2,7 +2,7 @@
members = [
"services/authentication/app",
- "services/database/app",
+ "services/storage/app",
"services/execution/app",
"services/frontend/app",
"services/management/app",
diff --git a/config/runtime.config.toml b/config/runtime.config.toml
index 59776cb..3de5dda 100644
--- a/config/runtime.config.toml
+++ b/config/runtime.config.toml
@@ -11,7 +11,7 @@ frontend = { listen_address = "0.0.0.0:7777" }
[internal_endpoints]
authentication = { listen_address = "0.0.0.0:17776", advertised_address =
"localhost:17776", inbound_services = ["frontend"] }
management = { listen_address = "0.0.0.0:17777", advertised_address =
"localhost:17777" }
-dbs = { listen_address = "0.0.0.0:7778", advertised_address =
"127.0.0.1:7778", inbound_services = ["frontend"] }
+storage = { listen_address = "0.0.0.0:7778", advertised_address =
"127.0.0.1:7778", inbound_services = ["frontend"] }
execution = { listen_address = "0.0.0.0:7989", advertised_address =
"127.0.0.1:7989" }
[audit]
diff --git a/config/src/runtime.rs b/config/src/runtime.rs
index 092484c..04cf6b0 100644
--- a/config/src/runtime.rs
+++ b/config/src/runtime.rs
@@ -33,7 +33,7 @@ pub struct ApiEndpointsConfig {
pub struct InternalEndpointsConfig {
pub authentication: InternalEndpoint,
pub management: InternalEndpoint,
- pub dbs: InternalEndpoint,
+ pub storage: InternalEndpoint,
pub execution: InternalEndpoint,
}
diff --git a/services/proto/build.rs b/services/proto/build.rs
index 254c306..8f4b885 100644
--- a/services/proto/build.rs
+++ b/services/proto/build.rs
@@ -23,7 +23,7 @@ fn main() {
let proto_files = [
"src/proto/teaclave_authentication_service.proto",
"src/proto/teaclave_common.proto",
- "src/proto/teaclave_database_service.proto",
+ "src/proto/teaclave_storage_service.proto",
"src/proto/teaclave_execution_service.proto",
"src/proto/teaclave_frontend_service.proto",
"src/proto/teaclave_management_service.proto",
diff --git a/services/proto/src/lib.rs b/services/proto/src/lib.rs
index 2424937..c069174 100644
--- a/services/proto/src/lib.rs
+++ b/services/proto/src/lib.rs
@@ -21,10 +21,10 @@ extern crate sgx_tstd as std;
pub mod teaclave_authentication_service;
pub mod teaclave_common;
-pub mod teaclave_database_service;
pub mod teaclave_execution_service;
pub mod teaclave_frontend_service;
pub mod teaclave_management_service;
+pub mod teaclave_storage_service;
macro_rules! include_proto {
($package: tt) => {
@@ -40,8 +40,8 @@ pub mod teaclave_common_proto {
include_proto!("teaclave_common_proto");
}
-pub mod teaclave_database_service_proto {
- include_proto!("teaclave_database_service_proto");
+pub mod teaclave_storage_service_proto {
+ include_proto!("teaclave_storage_service_proto");
}
pub mod teaclave_execution_service_proto {
diff --git a/services/proto/src/proto/teaclave_database_service.proto
b/services/proto/src/proto/teaclave_storage_service.proto
similarity index 91%
rename from services/proto/src/proto/teaclave_database_service.proto
rename to services/proto/src/proto/teaclave_storage_service.proto
index e27d3d3..471ef5f 100644
--- a/services/proto/src/proto/teaclave_database_service.proto
+++ b/services/proto/src/proto/teaclave_storage_service.proto
@@ -1,5 +1,5 @@
syntax = "proto3";
-package teaclave_database_service_proto;
+package teaclave_storage_service_proto;
message GetRequest {
bytes key = 1;
@@ -37,7 +37,7 @@ message DequeueResponse {
bytes value = 1;
}
-service TeaclaveDatabase {
+service TeaclaveStorage {
rpc Get(GetRequest) returns (GetResponse);
rpc Put(PutRequest) returns (PutResponse);
rpc Delete(DeleteRequest) returns (DeleteResponse);
diff --git a/services/proto/src/teaclave_database_service.rs
b/services/proto/src/teaclave_storage_service.rs
similarity index 96%
rename from services/proto/src/teaclave_database_service.rs
rename to services/proto/src/teaclave_storage_service.rs
index 8bb9e89..71956f6 100644
--- a/services/proto/src/teaclave_database_service.rs
+++ b/services/proto/src/teaclave_storage_service.rs
@@ -1,11 +1,11 @@
use anyhow::{Error, Result};
use std::prelude::v1::*;
-use crate::teaclave_database_service_proto as proto;
-pub use proto::TeaclaveDatabase;
-pub use proto::TeaclaveDatabaseClient;
-pub use proto::TeaclaveDatabaseRequest;
-pub use proto::TeaclaveDatabaseResponse;
+use crate::teaclave_storage_service_proto as proto;
+pub use proto::TeaclaveStorage;
+pub use proto::TeaclaveStorageClient;
+pub use proto::TeaclaveStorageRequest;
+pub use proto::TeaclaveStorageResponse;
#[derive(Debug)]
pub struct GetRequest {
diff --git a/services/database/app/Cargo.toml b/services/storage/app/Cargo.toml
similarity index 86%
rename from services/database/app/Cargo.toml
rename to services/storage/app/Cargo.toml
index d016d69..8e529fd 100644
--- a/services/database/app/Cargo.toml
+++ b/services/storage/app/Cargo.toml
@@ -1,8 +1,8 @@
[package]
-name = "teaclave_database_service"
+name = "teaclave_storage_service"
version = "0.1.0"
authors = ["Teaclave Contributors <[email protected]>"]
-description = "Teaclave Database Service"
+description = "Teaclave Storage Service"
license = "Apache-2.0"
build = "build.rs"
edition = "2018"
diff --git a/services/database/app/build.rs b/services/storage/app/build.rs
similarity index 100%
rename from services/database/app/build.rs
rename to services/storage/app/build.rs
diff --git a/services/database/app/src/main.rs
b/services/storage/app/src/main.rs
similarity index 100%
rename from services/database/app/src/main.rs
rename to services/storage/app/src/main.rs
diff --git a/services/database/enclave/Cargo.toml
b/services/storage/enclave/Cargo.toml
similarity index 92%
rename from services/database/enclave/Cargo.toml
rename to services/storage/enclave/Cargo.toml
index b58158c..866c51c 100644
--- a/services/database/enclave/Cargo.toml
+++ b/services/storage/enclave/Cargo.toml
@@ -1,13 +1,13 @@
[package]
-name = "teaclave_database_service_enclave"
+name = "teaclave_storage_service_enclave"
version = "0.1.0"
authors = ["Teaclave Contributors <[email protected]>"]
-description = "Teaclave Database Service enclave"
+description = "Teaclave Storage Service enclave"
license = "Apache-2.0"
edition = "2018"
[lib]
-name = "teaclave_database_service_enclave"
+name = "teaclave_storage_service_enclave"
crate-type = ["staticlib", "rlib"]
[features]
diff --git a/services/database/enclave/Enclave.config.xml
b/services/storage/enclave/Enclave.config.xml
similarity index 100%
rename from services/database/enclave/Enclave.config.xml
rename to services/storage/enclave/Enclave.config.xml
diff --git a/services/database/enclave/src/lib.rs
b/services/storage/enclave/src/lib.rs
similarity index 87%
rename from services/database/enclave/src/lib.rs
rename to services/storage/enclave/src/lib.rs
index 5c4a98e..d7fa949 100644
--- a/services/database/enclave/src/lib.rs
+++ b/services/storage/enclave/src/lib.rs
@@ -37,9 +37,7 @@ use teaclave_service_enclave_utils::ServiceEnclave;
use rusty_leveldb::DB;
use teaclave_attestation::{AttestationConfig, RemoteAttestation};
-use teaclave_proto::teaclave_database_service::{
- TeaclaveDatabaseRequest, TeaclaveDatabaseResponse,
-};
+use teaclave_proto::teaclave_storage_service::{TeaclaveStorageRequest,
TeaclaveStorageResponse};
use teaclave_rpc::config::SgxTrustedTlsServerConfig;
use teaclave_rpc::server::SgxTrustedTlsServer;
@@ -53,7 +51,7 @@ use std::thread;
#[handle_ecall]
fn handle_start_service(args: &StartServiceInput) ->
Result<StartServiceOutput> {
debug!("handle_start_service");
- let listen_address = args.config.internal_endpoints.dbs.listen_address;
+ let listen_address = args.config.internal_endpoints.storage.listen_address;
let ias_config = args.config.ias.as_ref().unwrap();
let attestation =
RemoteAttestation::generate_and_endorse(&AttestationConfig::ias(
&ias_config.ias_key,
@@ -69,13 +67,13 @@ fn handle_start_service(args: &StartServiceInput) ->
Result<StartServiceOutput>
let (sender, receiver) = channel();
thread::spawn(move || {
let opt = rusty_leveldb::in_memory();
- let database = DB::open("teaclave_db", opt).unwrap();
- let mut database_service =
- service::TeaclaveDatabaseService::new(RefCell::new(database),
receiver);
- database_service.start();
+ let storage = DB::open("teaclave_db", opt).unwrap();
+ let mut storage_service =
+ service::TeaclaveStorageService::new(RefCell::new(storage),
receiver);
+ storage_service.start();
});
- let mut server = SgxTrustedTlsServer::<TeaclaveDatabaseResponse,
TeaclaveDatabaseRequest>::new(
+ let mut server = SgxTrustedTlsServer::<TeaclaveStorageResponse,
TeaclaveStorageRequest>::new(
listen_address,
&config,
);
diff --git a/services/database/enclave/src/proxy.rs
b/services/storage/enclave/src/proxy.rs
similarity index 50%
rename from services/database/enclave/src/proxy.rs
rename to services/storage/enclave/src/proxy.rs
index 27db81a..f710a5a 100644
--- a/services/database/enclave/src/proxy.rs
+++ b/services/storage/enclave/src/proxy.rs
@@ -1,9 +1,7 @@
-use crate::service::TeaclaveDatabaseError;
+use crate::service::TeaclaveStorageError;
use std::prelude::v1::*;
use std::sync::mpsc::{channel, Sender};
-use teaclave_proto::teaclave_database_service::{
- TeaclaveDatabaseRequest, TeaclaveDatabaseResponse,
-};
+use teaclave_proto::teaclave_storage_service::{TeaclaveStorageRequest,
TeaclaveStorageResponse};
use teaclave_rpc::Request;
use teaclave_types::TeaclaveServiceResponseResult;
@@ -18,25 +16,25 @@ impl ProxyService {
}
}
-impl teaclave_rpc::TeaclaveService<TeaclaveDatabaseRequest,
TeaclaveDatabaseResponse>
+impl teaclave_rpc::TeaclaveService<TeaclaveStorageRequest,
TeaclaveStorageResponse>
for ProxyService
{
fn handle_request(
&self,
- request: Request<TeaclaveDatabaseRequest>,
- ) -> TeaclaveServiceResponseResult<TeaclaveDatabaseResponse> {
+ request: Request<TeaclaveStorageRequest>,
+ ) -> TeaclaveServiceResponseResult<TeaclaveStorageResponse> {
let (sender, receiver) = channel();
self.sender
.send(ProxyRequest { sender, request })
- .map_err(|_| TeaclaveDatabaseError::MpscError)?;
+ .map_err(|_| TeaclaveStorageError::MpscError)?;
receiver
.recv()
- .map_err(|_| TeaclaveDatabaseError::MpscError)?
+ .map_err(|_| TeaclaveStorageError::MpscError)?
}
}
#[derive(Clone)]
pub(crate) struct ProxyRequest {
- pub sender:
Sender<TeaclaveServiceResponseResult<TeaclaveDatabaseResponse>>,
- pub request: Request<TeaclaveDatabaseRequest>,
+ pub sender: Sender<TeaclaveServiceResponseResult<TeaclaveStorageResponse>>,
+ pub request: Request<TeaclaveStorageRequest>,
}
diff --git a/services/database/enclave/src/service.rs
b/services/storage/enclave/src/service.rs
similarity index 89%
rename from services/database/enclave/src/service.rs
rename to services/storage/enclave/src/service.rs
index 3273933..1b056eb 100644
--- a/services/database/enclave/src/service.rs
+++ b/services/storage/enclave/src/service.rs
@@ -3,9 +3,9 @@ use rusty_leveldb::DB;
use std::cell::RefCell;
use std::prelude::v1::*;
use std::sync::mpsc::Receiver;
-use teaclave_proto::teaclave_database_service::{
+use teaclave_proto::teaclave_storage_service::{
DeleteRequest, DeleteResponse, DequeueRequest, DequeueResponse,
EnqueueRequest,
- EnqueueResponse, GetRequest, GetResponse, PutRequest, PutResponse,
TeaclaveDatabase,
+ EnqueueResponse, GetRequest, GetResponse, PutRequest, PutResponse,
TeaclaveStorage,
};
use teaclave_rpc::Request;
use teaclave_service_enclave_utils::teaclave_service;
@@ -13,7 +13,7 @@ use teaclave_types::{TeaclaveServiceResponseError,
TeaclaveServiceResponseResult
use thiserror::Error;
#[derive(Error, Debug)]
-pub(crate) enum TeaclaveDatabaseError {
+pub(crate) enum TeaclaveStorageError {
#[error("key not exist")]
KeyNotExist,
#[error("mpsc error")]
@@ -24,14 +24,14 @@ pub(crate) enum TeaclaveDatabaseError {
QueueEmpty,
}
-impl From<TeaclaveDatabaseError> for TeaclaveServiceResponseError {
- fn from(error: TeaclaveDatabaseError) -> Self {
+impl From<TeaclaveStorageError> for TeaclaveServiceResponseError {
+ fn from(error: TeaclaveStorageError) -> Self {
TeaclaveServiceResponseError::RequestError(error.to_string())
}
}
-#[teaclave_service(teaclave_database_service, TeaclaveDatabase,
TeaclaveDatabaseError)]
-pub(crate) struct TeaclaveDatabaseService {
+#[teaclave_service(teaclave_storage_service, TeaclaveStorage,
TeaclaveStorageError)]
+pub(crate) struct TeaclaveStorageService {
// Current LevelDB implementation is not concurrent, so we need to wrap the
// DB with RefCell. This service is running in a single thread, it's safe
to
// use RefCell.
@@ -39,7 +39,7 @@ pub(crate) struct TeaclaveDatabaseService {
receiver: Receiver<ProxyRequest>,
}
-impl TeaclaveDatabaseService {
+impl TeaclaveStorageService {
pub(crate) fn new(database: RefCell<DB>, receiver: Receiver<ProxyRequest>)
-> Self {
Self { database, receiver }
}
@@ -107,12 +107,12 @@ impl<'a> DBQueue<'a> {
// put element
self.database
.put(&self.get_element_key(tail_index), value)
- .map_err(|_| TeaclaveDatabaseError::LevelDbError)?;
+ .map_err(|_| TeaclaveStorageError::LevelDbError)?;
// tail + 1
tail_index += 1;
self.database
.put(&self.get_tail_key(), &tail_index.to_le_bytes())
- .map_err(|_| TeaclaveDatabaseError::LevelDbError)?;
+ .map_err(|_| TeaclaveStorageError::LevelDbError)?;
Ok(())
}
@@ -121,18 +121,18 @@ impl<'a> DBQueue<'a> {
let tail_index = self.get_tail();
// check whether the queue is empty
if head_index >= tail_index {
- Err(TeaclaveDatabaseError::QueueEmpty.into())
+ Err(TeaclaveStorageError::QueueEmpty.into())
} else {
let element_key = self.get_element_key(head_index);
let result = match self.database.get(&element_key) {
Some(value) => value,
- None => return Err(TeaclaveDatabaseError::LevelDbError.into()),
+ None => return Err(TeaclaveStorageError::LevelDbError.into()),
};
// update head
head_index += 1;
self.database
.put(&self.get_head_key(), &head_index.to_le_bytes())
- .map_err(|_| TeaclaveDatabaseError::LevelDbError)?;
+ .map_err(|_| TeaclaveStorageError::LevelDbError)?;
// delete element; it's ok to ignore the error
let _ = self.database.delete(&element_key);
Ok(result)
@@ -140,7 +140,7 @@ impl<'a> DBQueue<'a> {
}
}
-impl TeaclaveDatabaseService {
+impl TeaclaveStorageService {
pub(crate) fn start(&mut self) {
#[cfg(test_mode)]
test_mode::repalce_with_mock_database(self);
@@ -164,12 +164,12 @@ impl TeaclaveDatabaseService {
}
}
}
-impl TeaclaveDatabase for TeaclaveDatabaseService {
+impl TeaclaveStorage for TeaclaveStorageService {
fn get(&self, request: Request<GetRequest>) ->
TeaclaveServiceResponseResult<GetResponse> {
let request = request.message;
match self.database.borrow_mut().get(&request.key) {
Some(value) => Ok(GetResponse { value }),
- None => Err(TeaclaveDatabaseError::KeyNotExist.into()),
+ None => Err(TeaclaveStorageError::KeyNotExist.into()),
}
}
@@ -177,7 +177,7 @@ impl TeaclaveDatabase for TeaclaveDatabaseService {
let request = request.message;
match self.database.borrow_mut().put(&request.key, &request.value) {
Ok(_) => Ok(PutResponse),
- Err(_) => Err(TeaclaveDatabaseError::LevelDbError.into()),
+ Err(_) => Err(TeaclaveStorageError::LevelDbError.into()),
}
}
@@ -188,7 +188,7 @@ impl TeaclaveDatabase for TeaclaveDatabaseService {
let request = request.message;
match self.database.borrow_mut().delete(&request.key) {
Ok(_) => Ok(DeleteResponse),
- Err(_) => Err(TeaclaveDatabaseError::LevelDbError.into()),
+ Err(_) => Err(TeaclaveStorageError::LevelDbError.into()),
}
}
@@ -216,7 +216,7 @@ impl TeaclaveDatabase for TeaclaveDatabaseService {
#[cfg(test_mode)]
mod test_mode {
use super::*;
- pub(crate) fn repalce_with_mock_database(service: &mut
TeaclaveDatabaseService) {
+ pub(crate) fn repalce_with_mock_database(service: &mut
TeaclaveStorageService) {
let opt = rusty_leveldb::in_memory();
let mut database = DB::open("mock_db", opt).unwrap();
database.put(b"test_get_key", b"test_get_value").unwrap();
@@ -232,7 +232,7 @@ pub mod tests {
use super::*;
use std::sync::mpsc::channel;
- fn get_mock_service() -> TeaclaveDatabaseService {
+ fn get_mock_service() -> TeaclaveStorageService {
let (_sender, receiver) = channel();
let opt = rusty_leveldb::in_memory();
let mut database = DB::open("mock_db", opt).unwrap();
@@ -240,7 +240,7 @@ pub mod tests {
database
.put(b"test_delete_key", b"test_delete_value")
.unwrap();
- TeaclaveDatabaseService {
+ TeaclaveStorageService {
database: RefCell::new(database),
receiver,
}
diff --git a/tests/fixtures/runtime.config.toml
b/tests/fixtures/runtime.config.toml
index 7bf55f5..cd544c8 100644
--- a/tests/fixtures/runtime.config.toml
+++ b/tests/fixtures/runtime.config.toml
@@ -5,7 +5,7 @@ frontend = { listen_address = "0.0.0.0:7777" }
[internal_endpoints]
authentication = { listen_address = "0.0.0.0:17776", advertised_address =
"localhost:17776" }
management = { listen_address = "0.0.0.0:17777", advertised_address =
"localhost:17777" }
-dbs = { listen_address = "0.0.0.0:7778", advertised_address =
"127.0.0.1:7778", inbound_services = ["frontend"] }
+storage = { listen_address = "0.0.0.0:7778", advertised_address =
"127.0.0.1:7778", inbound_services = ["frontend"] }
execution = { listen_address = "0.0.0.0:7989", advertised_address =
"127.0.0.1:7989" }
[audit]
diff --git a/tests/functional_tests/enclave/src/lib.rs
b/tests/functional_tests/enclave/src/lib.rs
index f869a4e..9f3ad37 100644
--- a/tests/functional_tests/enclave/src/lib.rs
+++ b/tests/functional_tests/enclave/src/lib.rs
@@ -37,15 +37,15 @@ use teaclave_service_enclave_utils::ServiceEnclave;
use teaclave_test_utils::check_all_passed;
mod teaclave_authentication_service;
-mod teaclave_database_service;
mod teaclave_execution_service;
mod teaclave_frontend_service;
+mod teaclave_storage_service;
#[handle_ecall]
fn handle_run_test(_args: &RunTestInput) -> Result<RunTestOutput> {
let ret = check_all_passed!(
teaclave_authentication_service::run_tests(),
- teaclave_database_service::run_tests(),
+ teaclave_storage_service::run_tests(),
teaclave_execution_service::run_tests(),
teaclave_frontend_service::run_tests(),
);
diff --git a/tests/functional_tests/enclave/src/teaclave_database_service.rs
b/tests/functional_tests/enclave/src/teaclave_storage_service.rs
similarity index 87%
rename from tests/functional_tests/enclave/src/teaclave_database_service.rs
rename to tests/functional_tests/enclave/src/teaclave_storage_service.rs
index e57edeb..df37a84 100644
--- a/tests/functional_tests/enclave/src/teaclave_database_service.rs
+++ b/tests/functional_tests/enclave/src/teaclave_storage_service.rs
@@ -1,5 +1,5 @@
use std::prelude::v1::*;
-use teaclave_proto::teaclave_database_service::*;
+use teaclave_proto::teaclave_storage_service::*;
use teaclave_rpc::endpoint::Endpoint;
pub fn run_tests() -> bool {
@@ -18,7 +18,7 @@ pub fn run_tests() -> bool {
fn test_get_success() {
let channel = Endpoint::new("localhost:7778").connect().unwrap();
- let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
+ let mut client = TeaclaveStorageClient::new(channel).unwrap();
let request = GetRequest::new("test_get_key");
let response_result = client.get(request);
info!("{:?}", response_result);
@@ -27,7 +27,7 @@ fn test_get_success() {
fn test_get_fail() {
let channel = Endpoint::new("localhost:7778").connect().unwrap();
- let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
+ let mut client = TeaclaveStorageClient::new(channel).unwrap();
let request = GetRequest::new("test_key_not_exist");
let response_result = client.get(request);
assert!(response_result.is_err());
@@ -35,7 +35,7 @@ fn test_get_fail() {
fn test_put_success() {
let channel = Endpoint::new("localhost:7778").connect().unwrap();
- let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
+ let mut client = TeaclaveStorageClient::new(channel).unwrap();
let request = PutRequest::new("test_put_key", "test_put_value");
let response_result = client.put(request);
info!("{:?}", response_result);
@@ -50,7 +50,7 @@ fn test_put_success() {
fn test_delete_success() {
let channel = Endpoint::new("localhost:7778").connect().unwrap();
- let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
+ let mut client = TeaclaveStorageClient::new(channel).unwrap();
let request = DeleteRequest::new("test_delete_key");
let response_result = client.delete(request);
info!("{:?}", response_result);
@@ -63,7 +63,7 @@ fn test_delete_success() {
fn test_enqueue_success() {
let channel = Endpoint::new("localhost:7778").connect().unwrap();
- let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
+ let mut client = TeaclaveStorageClient::new(channel).unwrap();
let request = EnqueueRequest::new("test_enqueue_key",
"test_enqueue_value");
let response_result = client.enqueue(request);
info!("{:?}", response_result);
@@ -72,7 +72,7 @@ fn test_enqueue_success() {
fn test_dequeue_success() {
let channel = Endpoint::new("localhost:7778").connect().unwrap();
- let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
+ let mut client = TeaclaveStorageClient::new(channel).unwrap();
let request = DequeueRequest::new("test_dequeue_key");
let response_result = client.dequeue(request);
assert!(response_result.is_err());
@@ -94,7 +94,7 @@ fn test_dequeue_success() {
fn test_dequeue_fail() {
let channel = Endpoint::new("localhost:7778").connect().unwrap();
- let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
+ let mut client = TeaclaveStorageClient::new(channel).unwrap();
let request = DequeueRequest::new("test_dequeue_key");
let response_result = client.dequeue(request);
assert!(response_result.is_err());
diff --git a/tests/integration_tests/app/src/teaclave_config_tests.rs
b/tests/integration_tests/app/src/teaclave_config_tests.rs
index b209c55..40ebe32 100644
--- a/tests/integration_tests/app/src/teaclave_config_tests.rs
+++ b/tests/integration_tests/app/src/teaclave_config_tests.rs
@@ -15,10 +15,13 @@ fn test_runtime_config() {
authentication_config.listen_address,
"0.0.0.0:7776".parse().unwrap()
);
- let dbs_config = config.internal_endpoints.dbs;
- assert_eq!(dbs_config.listen_address, "0.0.0.0:7778".parse().unwrap());
+ let storage_config = config.internal_endpoints.storage;
assert_eq!(
- dbs_config.inbound_services,
+ storage_config.listen_address,
+ "0.0.0.0:7778".parse().unwrap()
+ );
+ assert_eq!(
+ storage_config.inbound_services,
Some(vec!["frontend".to_string()])
);
diff --git a/tests/unit_tests/enclave/Cargo.toml
b/tests/unit_tests/enclave/Cargo.toml
index e989348..1e30aab 100644
--- a/tests/unit_tests/enclave/Cargo.toml
+++ b/tests/unit_tests/enclave/Cargo.toml
@@ -23,8 +23,8 @@ mesalock_sgx = [
"teaclave_config/mesalock_sgx",
"teaclave_authentication_service_enclave/mesalock_sgx",
"teaclave_authentication_service_enclave/enclave_unit_test",
- "teaclave_database_service_enclave/mesalock_sgx",
- "teaclave_database_service_enclave/enclave_unit_test",
+ "teaclave_storage_service_enclave/mesalock_sgx",
+ "teaclave_storage_service_enclave/enclave_unit_test",
"teaclave_execution_service_enclave/mesalock_sgx",
"teaclave_execution_service_enclave/enclave_unit_test",
"teaclave_worker/mesalock_sgx",
@@ -39,7 +39,7 @@ serde = { version = "1.0.92" }
thiserror = { version = "1.0.9" }
teaclave_authentication_service_enclave = { path =
"../../../services/authentication/enclave" }
-teaclave_database_service_enclave = { path =
"../../../services/database/enclave" }
+teaclave_storage_service_enclave = { path =
"../../../services/storage/enclave" }
teaclave_execution_service_enclave = { path =
"../../../services/execution/enclave" }
teaclave_worker = { path = "../../../worker" }
diff --git a/tests/unit_tests/enclave/src/lib.rs
b/tests/unit_tests/enclave/src/lib.rs
index 4a99429..722bbcc 100644
--- a/tests/unit_tests/enclave/src/lib.rs
+++ b/tests/unit_tests/enclave/src/lib.rs
@@ -42,7 +42,7 @@ use teaclave_worker;
#[handle_ecall]
fn handle_run_test(_args: &RunTestInput) -> Result<RunTestOutput> {
let ret = check_all_passed!(
- teaclave_database_service_enclave::tests::run_tests(),
+ teaclave_storage_service_enclave::tests::run_tests(),
teaclave_execution_service_enclave::tests::run_tests(),
teaclave_authentication_service_enclave::tests::run_tests(),
teaclave_worker::tests::run_tests(),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
