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 679622f [proto] Improve client function types and request.into() is
no longer needed
679622f is described below
commit 679622fbf2e313a74372c5b5ab5183865d2ad719
Author: Mingshen Sun <[email protected]>
AuthorDate: Wed Jan 29 12:05:04 2020 -0800
[proto] Improve client function types and request.into() is no longer needed
---
services/proto/proto_gen/templates/proto.j2 | 6 +--
.../enclave/src/teaclave_authentication_service.rs | 37 ++++++-----------
.../enclave/src/teaclave_database_service.rs | 48 ++++++++--------------
.../enclave/src/teaclave_execution_service.rs | 2 +-
4 files changed, 33 insertions(+), 60 deletions(-)
diff --git a/services/proto/proto_gen/templates/proto.j2
b/services/proto/proto_gen/templates/proto.j2
index 00e9884..cf05650 100644
--- a/services/proto/proto_gen/templates/proto.j2
+++ b/services/proto/proto_gen/templates/proto.j2
@@ -50,8 +50,8 @@ impl {{ service.proto_name }}Client {
}
{% for m in service.methods %}
- pub fn {{ m.name }}(&mut self, request: {{ m.input_type }}) ->
teaclave_types::TeaclaveServiceResponseResult<{{ m.output_type }}> {
- let request = {{ service.proto_name }}Request::{{ m.proto_name
}}(request);
+ pub fn {{ m.name }}<T: Into<{{ m.input_type }}>>(&mut self, request: T) ->
teaclave_types::TeaclaveServiceResponseResult<{{ m.output_type }}> {
+ let request = {{ service.proto_name }}Request::{{ m.proto_name
}}(request.into());
let response = match self.channel.invoke(request) {
Ok(response_result) => {
response_result
@@ -68,4 +68,4 @@ impl {{ service.proto_name }}Client {
}
}
{% endfor %}
-}
\ No newline at end of file
+}
diff --git
a/tests/functional_tests/enclave/src/teaclave_authentication_service.rs
b/tests/functional_tests/enclave/src/teaclave_authentication_service.rs
index 51ae2c2..b9aece9 100644
--- a/tests/functional_tests/enclave/src/teaclave_authentication_service.rs
+++ b/tests/functional_tests/enclave/src/teaclave_authentication_service.rs
@@ -41,16 +41,14 @@ fn test_login_success() {
let request = UserRegisterRequest {
id: "test_login_id1".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_register(request);
assert!(response_result.is_ok());
let request = UserLoginRequest {
id: "test_login_id1".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_login(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
@@ -62,16 +60,14 @@ fn test_login_fail() {
let request = UserRegisterRequest {
id: "test_login_id2".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_register(request);
assert!(response_result.is_ok());
let request = UserLoginRequest {
id: "test_login_id2".to_string(),
password: "wrong_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_login(request);
info!("{:?}", response_result);
assert!(response_result.is_err());
@@ -83,23 +79,21 @@ fn test_authenticate_success() {
let request = UserRegisterRequest {
id: "test_authenticate_id1".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_register(request);
assert!(response_result.is_ok());
let request = UserLoginRequest {
id: "test_authenticate_id1".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_login(request);
assert!(response_result.is_ok());
let credential = UserCredential {
id: "test_authenticate_id1".to_string(),
token: response_result.unwrap().token,
};
- let request = UserAuthenticateRequest { credential }.into();
+ let request = UserAuthenticateRequest { credential };
let response_result = client.user_authenticate(request);
info!("{:?}", response_result);
assert!(response_result.unwrap().accept);
@@ -111,23 +105,21 @@ fn test_authenticate_fail() {
let request = UserRegisterRequest {
id: "test_authenticate_id2".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_register(request);
assert!(response_result.is_ok());
let request = UserLoginRequest {
id: "test_authenticate_id2".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_login(request);
assert!(response_result.is_ok());
let credential = UserCredential {
id: "test_authenticate_id2".to_string(),
token: "wrong_token".to_string(),
};
- let request = UserAuthenticateRequest { credential }.into();
+ let request = UserAuthenticateRequest { credential };
let response_result = client.user_authenticate(request);
info!("{:?}", response_result);
assert!(!response_result.unwrap().accept);
@@ -139,8 +131,7 @@ fn test_register_success() {
let request = UserRegisterRequest {
id: "test_register_id1".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_register(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
@@ -152,15 +143,13 @@ fn test_register_fail() {
let request = UserRegisterRequest {
id: "test_register_id2".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_register(request);
assert!(response_result.is_ok());
let request = UserRegisterRequest {
id: "test_register_id2".to_string(),
password: "test_password".to_string(),
- }
- .into();
+ };
let response_result = client.user_register(request);
info!("{:?}", response_result);
assert!(response_result.is_err());
diff --git a/tests/functional_tests/enclave/src/teaclave_database_service.rs
b/tests/functional_tests/enclave/src/teaclave_database_service.rs
index 14483f3..f490f7d 100644
--- a/tests/functional_tests/enclave/src/teaclave_database_service.rs
+++ b/tests/functional_tests/enclave/src/teaclave_database_service.rs
@@ -20,8 +20,7 @@ fn test_get_success() {
let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
let request = GetRequest {
key: b"test_get_key".to_vec(),
- }
- .into();
+ };
let response_result = client.get(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
@@ -32,8 +31,7 @@ fn test_get_fail() {
let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
let request = GetRequest {
key: b"test_key_not_exist".to_vec(),
- }
- .into();
+ };
let response_result = client.get(request);
assert!(response_result.is_err());
}
@@ -44,16 +42,14 @@ fn test_put_success() {
let request = PutRequest {
key: b"test_put_key".to_vec(),
value: b"test_put_value".to_vec(),
- }
- .into();
+ };
let response_result = client.put(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
let request = GetRequest {
key: b"test_put_key".to_vec(),
- }
- .into();
+ };
let response_result = client.get(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
@@ -65,16 +61,14 @@ fn test_delete_success() {
let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
let request = DeleteRequest {
key: b"test_delete_key".to_vec(),
- }
- .into();
+ };
let response_result = client.delete(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
let request = GetRequest {
key: b"test_delete_key".to_vec(),
- }
- .into();
+ };
let response_result = client.get(request);
assert!(response_result.is_err());
}
@@ -85,8 +79,7 @@ fn test_enqueue_success() {
let request = EnqueueRequest {
key: b"test_enqueue_key".to_vec(),
value: b"test_enqueue_value".to_vec(),
- }
- .into();
+ };
let response_result = client.enqueue(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
@@ -97,35 +90,30 @@ fn test_dequeue_success() {
let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
let request = DequeueRequest {
key: b"test_dequeue_key".to_vec(),
- }
- .into();
+ };
let response_result = client.dequeue(request);
assert!(response_result.is_err());
let request = EnqueueRequest {
key: b"test_dequeue_key".to_vec(),
value: b"1".to_vec(),
- }
- .into();
+ };
let response_result = client.enqueue(request);
assert!(response_result.is_ok());
let request = EnqueueRequest {
key: b"test_dequeue_key".to_vec(),
value: b"2".to_vec(),
- }
- .into();
+ };
let response_result = client.enqueue(request);
assert!(response_result.is_ok());
let request = DequeueRequest {
key: b"test_dequeue_key".to_vec(),
- }
- .into();
+ };
let response_result = client.dequeue(request);
assert!(response_result.is_ok());
assert_eq!(response_result.unwrap().value, b"1");
let request = DequeueRequest {
key: b"test_dequeue_key".to_vec(),
- }
- .into();
+ };
let response_result = client.dequeue(request);
assert!(response_result.is_ok());
assert_eq!(response_result.unwrap().value, b"2");
@@ -136,29 +124,25 @@ fn test_dequeue_fail() {
let mut client = TeaclaveDatabaseClient::new(channel).unwrap();
let request = DequeueRequest {
key: b"test_dequeue_key".to_vec(),
- }
- .into();
+ };
let response_result = client.dequeue(request);
assert!(response_result.is_err());
let request = EnqueueRequest {
key: b"test_dequeue_key".to_vec(),
value: b"1".to_vec(),
- }
- .into();
+ };
let response_result = client.enqueue(request);
assert!(response_result.is_ok());
let request = DequeueRequest {
key: b"test_dequeue_key".to_vec(),
- }
- .into();
+ };
let response_result = client.dequeue(request);
assert!(response_result.is_ok());
assert_eq!(response_result.unwrap().value, b"1");
let request = DequeueRequest {
key: b"test_dequeue_key".to_vec(),
- }
- .into();
+ };
let response_result = client.dequeue(request);
assert!(response_result.is_err());
}
diff --git a/tests/functional_tests/enclave/src/teaclave_execution_service.rs
b/tests/functional_tests/enclave/src/teaclave_execution_service.rs
index 3b43dc2..ddcdf8d 100644
--- a/tests/functional_tests/enclave/src/teaclave_execution_service.rs
+++ b/tests/functional_tests/enclave/src/teaclave_execution_service.rs
@@ -80,7 +80,7 @@ fn test_invoke_success() {
enc_input_file().unwrap();
let mut client = setup_client();
- let response_result = client.invoke_function(request.into());
+ let response_result = client.invoke_function(request);
info!("{:?}", response_result);
assert!(response_result.is_ok());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
