diff --git a/src/sgx/deploy.rs b/src/sgx/deploy.rs index 27175c4..df47f35 100644 --- a/src/sgx/deploy.rs +++ b/src/sgx/deploy.rs @@ -1,25 +1,20 @@ -use crate::{ - config::Config, - name_generator::random_app_name, - sgx::{ - append_uuid_list, - grpc_brain::{get_app_node_list, new_app}, - grpc_dtpm::{dtpm_client, set_config_pb, upload_files_pb}, - package_entry_from_name, - utils::{ - calculate_nanocredits_for_app, fetch_config, hratls_url_and_mr_enclave_from_app_id, - }, - AppDeployResponse, Error, PackageElement, - }, - snp, +use crate::config::Config; +use crate::name_generator::random_app_name; +use crate::sgx::grpc_brain::{get_app_node_list, new_app}; +use crate::sgx::grpc_dtpm::{dtpm_client, set_config_pb, upload_files_pb}; +use crate::sgx::utils::{ + calculate_nanocredits_for_app, fetch_config, hratls_url_and_mr_enclave_from_app_id, }; -use detee_shared::{ - app_proto::{AppNodeFilters, AppNodeListResp, AppResource, NewAppReq}, - sgx::pb::dtpm_proto::DtpmSetConfigReq, +use crate::sgx::{ + append_uuid_list, package_entry_from_name, AppDeployResponse, Error, PackageElement, }; +use crate::snp; +use detee_shared::app_proto::{AppNodeFilters, AppNodeListResp, AppResource, NewAppReq}; +use detee_shared::sgx::pb::dtpm_proto::DtpmSetConfigReq; use serde::{Deserialize, Serialize}; use serde_default_utils::*; -use tokio_retry::{strategy::FixedInterval, Retry}; +use tokio_retry::strategy::FixedInterval; +use tokio_retry::Retry; #[derive(Debug, Clone, Serialize, Deserialize, Default)] pub struct Reqwest { diff --git a/src/sgx/utils.rs b/src/sgx/utils.rs index 93e00db..36ad664 100644 --- a/src/sgx/utils.rs +++ b/src/sgx/utils.rs @@ -1,8 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::constants::HRATLS_APP_PORT; -use crate::sgx::get_one_contract; -use crate::sgx::Error; +use crate::sgx::{get_one_contract, Error}; use detee_shared::sgx::types::dtpm::{DtpmConfig, EnvironmentEntry}; pub async fn hratls_url_and_mr_enclave_from_app_id(