keymanager: Move client crate to runtime crate

oasisprotocol · Sep 13, 2022 · 3ea0e38 · 3ea0e38
1 parent 7113bbf
commit 3ea0e38
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 52 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,6 @@
 members = [
     "runtime",
     "runtime-loader",
-    "client",
     "keymanager-client",
     "keymanager-api-common",
     "keymanager-lib",

diff --git a/client/Cargo.toml b/client/Cargo.toml
diff --git a/client/src/enclave_rpc/mod.rs b/client/src/enclave_rpc/mod.rs
diff --git a/client/src/lib.rs b/client/src/lib.rs
diff --git a/keymanager-client/Cargo.toml b/keymanager-client/Cargo.toml
@@ -5,7 +5,6 @@ authors = ["Oasis Protocol Foundation <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-oasis-core-client = { path = "../client" }
 oasis-core-runtime = { path = "../runtime" }
 oasis-core-keymanager-api-common = { path = "../keymanager-api-common" }
 cbor = { version = "0.5.0", package = "oasis-cbor" }

diff --git a/keymanager-client/src/client.rs b/keymanager-client/src/client.rs
@@ -9,12 +9,11 @@ use futures::future::{self, BoxFuture};
 use io_context::Context;
 use lru::LruCache;
 
-use oasis_core_client::RpcClient;
 use oasis_core_keymanager_api_common::*;
 use oasis_core_runtime::{
     common::{namespace::Namespace, sgx::EnclaveIdentity},
     consensus::{beacon::EpochTime, keymanager::SignedPolicySGX, verifier::Verifier},
-    enclave_rpc::session,
+    enclave_rpc::{client::RpcClient, session},
     protocol::Protocol,
     rak::RAK,
 };

diff --git a/client/src/enclave_rpc/client.rs → runtime/src/enclave_rpc/client.rs b/client/src/enclave_rpc/client.rs → runtime/src/enclave_rpc/client.rs
@@ -16,7 +16,7 @@ use io_context::Context;
 use thiserror::Error;
 use tokio;
 
-use oasis_core_runtime::{
+use crate::{
     cbor,
     common::sgx::EnclaveIdentity,
     enclave_rpc::{
@@ -377,7 +377,7 @@ mod test {
     use futures::future::{self, BoxFuture};
     use io_context::Context;
 
-    use oasis_core_runtime::{
+    use crate::{
         enclave_rpc::{demux::Demux, session, types},
         rak::RAK,
     };

diff --git a/runtime/src/enclave_rpc/mod.rs b/runtime/src/enclave_rpc/mod.rs
@@ -1,9 +1,11 @@
 //! Secure inter-enclave RPC.
 
+pub mod client;
 pub mod context;
 pub mod demux;
 pub mod dispatcher;
 pub mod session;
+mod transport;
 pub mod types;
 
 // Re-exports.

diff --git a/client/src/enclave_rpc/transport.rs → runtime/src/enclave_rpc/transport.rs b/client/src/enclave_rpc/transport.rs → runtime/src/enclave_rpc/transport.rs
@@ -4,7 +4,9 @@ use anyhow::{anyhow, Error as AnyError};
 use futures::future::{self, BoxFuture};
 use io_context::Context;
 
-use oasis_core_runtime::{enclave_rpc::types, protocol::Protocol, types::Body};
+use crate::{types::Body, Protocol};
+
+use super::types;
 
 /// An EnclaveRPC transport.
 pub trait Transport: Send + Sync {

diff --git a/tests/runtimes/simple-keyvalue/Cargo.toml b/tests/runtimes/simple-keyvalue/Cargo.toml
@@ -22,7 +22,6 @@ threads = 6
 [dependencies]
 cbor = { version = "0.5.0", package = "oasis-cbor" }
 oasis-core-runtime = { path = "../../../runtime" }
-oasis-core-client = { path = "../../../client" }
 oasis-core-keymanager-client = { path = "../../../keymanager-client" }
 oasis-core-keymanager-api-common = { path = "../../../keymanager-api-common" }
 simple-keymanager = { path = "../simple-keymanager" }