You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2021/02/12 23:17:56 UTC
[incubator-teaclave] branch master updated: Update serialized
requests in C builtin examples. (#484)
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
The following commit(s) were added to refs/heads/master by this push:
new 07b9961 Update serialized requests in C builtin examples. (#484)
07b9961 is described below
commit 07b9961fd9f87e6c9fa9fd4628474a9aafc5024f
Author: Mengyuan-L <77...@users.noreply.github.com>
AuthorDate: Fri Feb 12 18:17:47 2021 -0500
Update serialized requests in C builtin examples. (#484)
---
examples/c/builtin_echo.c | 48 ++++----
examples/c/builtin_ordered_set_intersect.c | 173 +++++++++++++++--------------
2 files changed, 111 insertions(+), 110 deletions(-)
diff --git a/examples/c/builtin_echo.c b/examples/c/builtin_echo.c
index acd6f1c..e8d2e35 100644
--- a/examples/c/builtin_echo.c
+++ b/examples/c/builtin_echo.c
@@ -24,6 +24,7 @@
#include <string.h>
#define BUFFER_SIZE 4086
+#define QUOTE(x...) #x
const char *authentication_service_address = "localhost:7776";
const char *frontend_service_address = "localhost:7777";
@@ -36,31 +37,28 @@ const char *as_root_ca_cert_path = "../../keys/ias_root_ca_cert.pem";
const char *user_id = "test_id";
const char *user_password = "test_password";
-const char *register_function_request_serialized =
- "{"
- " \"request\": \"register_function\","
- " \"name\": \"builtin-echo\","
- " \"description\": \"Native Echo Function\","
- " \"executor_type\": \"builtin\","
- " \"public\": true,"
- " \"payload\": [],"
- " \"arguments\": ["
- " \"message\""
- " ],"
- " \"inputs\": [],"
- " \"outputs\": []"
- "}";
-
-const char *create_task_request_serialized =
- "{"
- " \"request\": \"create_task\","
- " \"function_id\": \"%s\","
- " \"function_arguments\": \"{\\\"message\\\": \\\"Hello, "
- "Teaclave!\\\"}\","
- " \"executor\": \"builtin\","
- " \"inputs_ownership\": [],"
- " \"outputs_ownership\": []"
- "}";
+const char *register_function_request_serialized = QUOTE(
+{
+ "request": "register_function",
+ "name": "builtin-echo",
+ "description": "Native Echo Function",
+ "executor_type": "builtin",
+ "public": true,
+ "payload": [],
+ "arguments": ["message"],
+ "inputs": [],
+ "outputs": []
+});
+
+const char *create_task_request_serialized = QUOTE(
+{
+ "request": "create_task",
+ "function_id": "%s",
+ "function_arguments": "{\"message\": \"Hello, Teaclave!\"}",
+ "executor": "builtin",
+ "inputs_ownership": [],
+ "outputs_ownership": []
+});
int login(char *token, size_t *token_len) {
int ret = 0;
diff --git a/examples/c/builtin_ordered_set_intersect.c b/examples/c/builtin_ordered_set_intersect.c
index 66af481..285f000 100644
--- a/examples/c/builtin_ordered_set_intersect.c
+++ b/examples/c/builtin_ordered_set_intersect.c
@@ -23,6 +23,7 @@
#include <string.h>
#define BUFFER_SIZE 4086
+#define QUOTE(x...) #x
const char *authentication_service_address = "localhost:7776";
const char *frontend_service_address = "localhost:7777";
@@ -58,91 +59,93 @@ struct UserData user1_data = {
.input_cmac = "538dafbf7802d962bb01e2389b4e943a",
.key = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
-const char *register_function_request_serialized =
- "{"
- " \"request\": \"register_function\","
- " \"name\": \"builtin-ordered-set-intersect\","
- " \"description\": \"Native Private Set Intersection\","
- " \"executor_type\": \"builtin\","
- " \"public\": true,"
- " \"payload\": [],"
- " \"arguments\": ["
- " \"order\""
- " ],"
- " \"inputs\": ["
- " {\"name\": \"input_data1\", \"description\": \"Client 0 data.\"},"
- " {\"name\": \"input_data2\", \"description\": \"Client 1 data.\"}"
- " ],"
- " \"outputs\": ["
- " {\"name\": \"output_result1\", \"description\": \"Output data.\"},"
- " {\"name\": \"output_result2\", \"description\": \"Output data.\"}"
- " ]"
- "}";
-
-const char *create_task_request_serialized =
- "{"
- " \"request\": \"create_task\","
- " \"function_id\": \"%s\","
- " \"function_arguments\": \"{\\\"order\\\": \\\"ascending\\\"}\","
- " \"executor\": \"builtin\","
- " \"inputs_ownership\": ["
- " {\"data_name\": \"input_data1\", \"uids\": [\"user0\"]},"
- " {\"data_name\": \"input_data2\", \"uids\": [\"user1\"]}"
- " ],"
- " \"outputs_ownership\": ["
- " {\"data_name\": \"output_result1\", \"uids\": [\"user0\"]},"
- " {\"data_name\": \"output_result2\", \"uids\": [\"user1\"]}"
- " ]"
- "}";
-
-const char *register_input_serialized =
- "{"
- " \"request\": \"register_input_file\","
- " \"url\": \"%s\","
- " \"cmac\": \"%s\","
- " \"crypto_info\": {\"schema\": \"teaclave-file-128\","
- " \"key\": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],"
- " \"iv\": []}"
- "}";
-
-const char *register_output_serialized =
- "{"
- " \"request\": \"register_output_file\","
- " \"url\": \"%s\","
- " \"crypto_info\": {\"schema\": \"teaclave-file-128\","
- " \"key\": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],"
- " \"iv\": []}"
- "}";
-
-const char *user0_assign_serialized =
- "{"
- " \"request\": \"assign_data\","
- " \"task_id\": \"%s\","
- " \"inputs\": ["
- " {\"data_name\": \"input_data1\", \"data_id\": \"%s\"}"
- " ],"
- " \"outputs\": ["
- " {\"data_name\": \"output_result1\", \"data_id\": \"%s\"}"
- " ]"
- "}";
-
-const char *user1_assign_serialized =
- "{"
- " \"request\": \"assign_data\","
- " \"task_id\": \"%s\","
- " \"inputs\": ["
- " {\"data_name\": \"input_data2\", \"data_id\": \"%s\"}"
- " ],"
- " \"outputs\": ["
- " {\"data_name\": \"output_result2\", \"data_id\": \"%s\"}"
- " ]"
- "}";
-
-const char *approve_serialized =
- "{"
- " \"request\": \"approve_task\","
- " \"task_id\": \"%s\""
- "}";
+const char *register_function_request_serialized = QUOTE(
+{
+ "request": "register_function",
+ "name": "builtin-ordered-set-intersect",
+ "description": "Native Private Set Intersection",
+ "executor_type": "builtin",
+ "public": true,
+ "payload": [],
+ "arguments": ["order"],
+ "inputs": [
+ {"name": "input_data1", "description": "Client 0 data."},
+ {"name": "input_data2", "description": "Client 1 data."}
+ ],
+ "outputs": [
+ {"name": "output_result1", "description": "Output data."},
+ {"name": "output_result2", "description": "Output data."}
+ ]
+});
+
+const char *create_task_request_serialized = QUOTE(
+{
+ "request": "create_task",
+ "function_id": "%s",
+ "function_arguments": "{\"order\": \"ascending\"}",
+ "executor": "builtin",
+ "inputs_ownership": [
+ {"data_name": "input_data1", "uids": ["user0"]},
+ {"data_name": "input_data2", "uids": ["user1"]}
+ ],
+ "outputs_ownership": [
+ {"data_name": "output_result1", "uids": ["user0"]},
+ {"data_name": "output_result2", "uids": ["user1"]}
+ ]
+});
+
+const char *register_input_serialized= QUOTE(
+{
+ "request": "register_input_file",
+ "url": "%s",
+ "cmac": "%s",
+ "crypto_info": {
+ "schema": "teaclave-file-128",
+ "key": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ "iv": []
+ }
+});
+
+const char *register_output_serialized= QUOTE(
+{
+ "request": "register_output_file",
+ "url": "%s",
+ "crypto_info": {
+ "schema": "teaclave-file-128",
+ "key": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ "iv": []
+ }
+});
+
+const char *user0_assign_serialized= QUOTE(
+{
+ "request": "assign_data",
+ "task_id": "%s",
+ "inputs": [
+ {"data_name": "input_data1", "data_id": "%s"}
+ ],
+ "outputs": [
+ {"data_name": "output_result1", "data_id": "%s"}
+ ]
+});
+
+const char *user1_assign_serialized= QUOTE(
+{
+ "request": "assign_data",
+ "task_id": "%s",
+ "inputs": [
+ {"data_name": "input_data2", "data_id": "%s"}
+ ],
+ "outputs": [
+ {"data_name": "output_result2", "data_id": "%s"}
+ ]
+});
+
+const char *approve_serialized = QUOTE(
+{
+ "request": "approve_task",
+ "task_id": "%s"
+});
int login(char *user_id, char *password, char *token, size_t *token_len)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org