Merge pull request #495 from egrimley-arm/pr-test-warn

Reduce the number of warnings.

Author: ShaleXIONG

tests/tests/common/event.rs

@@ -8,10 +8,12 @@ use std::{
 #[derive(Debug, Clone)]
 pub(crate) enum TestEvent {
     // Check the policy and runtime hash
+    #[allow(dead_code)] // FIXME
     CheckHash,
     // Write a remote file
     WriteFile(String, PathBuf),
     // Append a remote file
+    #[allow(dead_code)] // FIXME
     AppendFile(String, PathBuf),
     // Execute a remote file
     Execute(String),
@@ -36,6 +38,7 @@ impl TestEvent {
 
     /// Create a list of events for provisioning data files in the `local_dir_path`. The
     /// `local_dir_path` will be replaced by `remote_dir_path`.
+    #[allow(dead_code)] // FIXME
     pub(crate) fn write_all<T: AsRef<Path>, K: AsRef<Path>>(
         dir_path: T,
         remote_dir_path: K,
@@ -60,6 +63,7 @@ impl TestEvent {
     /// Function produces a vec of input lists. Each list corresponds to a round
     /// and is a vec of pairs of remote (des) file and local (src) file path,
     /// which corresponds to provisioning/appending the content of the local file to the remote file.
+    #[allow(dead_code)] // FIXME
     pub(crate) fn batch_process_events<T: AsRef<Path>, K: AsRef<str>, Q: AsRef<str>>(
         local_dir_path: T,
         program_filename: K,
@@ -113,6 +117,7 @@ impl TestEvent {
     /// Read all files and diretory in the path of 'dir_path' in the local machine and replace the prefix with 'remote_dir_path'.
     /// E.g. if call the function with '/local/path/' and '/remote/path/',
     /// the result could be [(/remote/path/a.txt, /local/path/a.txt), (/remote/path/b/c.txt, /local/path/b/c.txt), ... ].
+    #[allow(dead_code)] // FIXME
     pub(crate) fn input_list<T: AsRef<Path>, K: AsRef<Path>>(
         dir_path: T,
         remote_dir_path: K,

tests/tests/common/util.rs

@@ -56,6 +56,7 @@ pub fn runtime_data_dir<T: AsRef<str>>(filename: T) -> String {
 ///
 /// Note this is overrideable with the VERACRUZ_TEST_TIMEOUT environment
 /// variable, which provides a timeout in seconds
+#[allow(dead_code)] // FIXME
 pub fn timeout<R: Send + 'static, F: (FnOnce() -> R) + Send + 'static>(
     timeout: Duration,
     f: F,

tests/tests/integration_test.rs

@@ -24,7 +24,6 @@ const LINEAR_REGRESSION_DUAL_POLICY: &'static str = "dual_policy.json";
 const LINEAR_REGRESSION_TRIPLE_POLICY: &'static str = "triple_policy_1.json";
 const LINEAR_REGRESSION_PARALLEL_POLICY: &'static str = "dual_parallel_policy.json";
 const INTERSECTION_SET_SUM_TRIPLE_POLICY: &'static str = "triple_policy_2.json";
-const PERMUTED_INTERSECTION_SET_SUM_TRIPLE_POLICY: &'static str = "triple_policy_3.json";
 const STRING_EDIT_DISTANCE_TRIPLE_POLICY: &'static str = "triple_policy_4.json";
 const STRING_EDIT_DISTANCE_QUADRUPLE_POLICY: &'static str = "quadruple_policy.json";
 
@@ -280,8 +279,7 @@ async fn veracruz_phase4_linear_regression_two_clients_parallel() {
             info!("### program provider read binary.");
             let program_data = read_local_file(prog_path).unwrap();
             info!("### program provider send binary.");
-            client
-                .write_file("/program/linear-regression.wasm", &program_data)?;
+            client.write_file("/program/linear-regression.wasm", &program_data)?;
             Result::<()>::Ok(())
         };
         let data_provider_handle = async {
@@ -297,11 +295,9 @@ async fn veracruz_phase4_linear_regression_two_clients_parallel() {
             info!("### data provider read input.");
             let data = read_local_file(&data_filename).unwrap();
             info!("### data provider send input.");
-            client
-                .write_file("/input/linear-regression.dat", &data)?;
+            client.write_file("/input/linear-regression.dat", &data)?;
             info!("### data provider read result.");
-            client
-                .request_compute("/program/linear-regression.wasm")?;
+            client.request_compute("/program/linear-regression.wasm")?;
             client.read_file("/output/linear-regression.dat")?;
             info!("### data provider request shutdown.");
             client.request_shutdown()?;
@@ -366,9 +362,7 @@ impl TestExecutor {
         // start the proxy attestation server
         proxy_attestation_setup(policy.proxy_attestation_server_url().clone());
 
-        Ok(TestExecutor {
-            policy_json,
-        })
+        Ok(TestExecutor { policy_json })
     }
 
     /// Execute this test. Clients collectively execute as a block, driven by the `events`, in
@@ -408,11 +402,10 @@ impl TestExecutor {
                     .ok_or(anyhow!("cannot find client of index {}", client_index))?;
                 info!("Process client{} event {:?}.", client_index, event);
                 let time_init = Instant::now();
-                Self::process_event(&mut client, &event)
-                    .map_err(|e| {
-                        error!("Client of index {}: {:?}", client_index, e);
-                        e
-                    })?;
+                Self::process_event(&mut client, &event).map_err(|e| {
+                    error!("Client of index {}: {:?}", client_index, e);
+                    e
+                })?;
                 info!(
                     "The event {:?} finished in {:?}.",
                     event,

tests/tests/server_test.rs

@@ -14,7 +14,6 @@
 
 mod common;
 
-use actix_rt::System;
 use anyhow::{anyhow, Result};
 use common::event::TestEvent;
 use common::proxy_attestation_server::*;
@@ -24,9 +23,7 @@ use log::{error, info};
 use mbedtls::{alloc::List, x509::Certificate};
 use policy_utils::{policy::Policy, Platform};
 use std::{
-    convert::TryFrom,
     error::Error,
-    fs::File,
     io::{Read, Write},
     path::Path,
     sync::{

workspaces/shared.mk

@@ -118,7 +118,6 @@ POLICY_FILES ?= \
 	dual_parallel_policy.json \
 	triple_policy_1.json \
 	triple_policy_2.json \
-	triple_policy_3.json \
 	triple_policy_4.json \
 	quadruple_policy.json