address compiler warnings

princeton-sns · May 20, 2024 · d281c25 · d281c25
1 parent b301017
commit d281c25
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 93 deletions.
diff --git a/client/core/src/core.rs b/client/core/src/core.rs
@@ -203,10 +203,10 @@ impl<C: CoreClient> Core<C> {
                     .create(true)
                     .open(filename)
                     .unwrap();
-                write!(f, "--------------------------\n");
-                write!(f, "op: {}\n", payload);
-                write!(f, "sender: {}\n", self.idkey());
-                write!(f, "#recipients: {}\n", &dst_idkeys.len());
+                let _ = write!(f, "--------------------------\n");
+                let _ = write!(f, "op: {}\n", payload);
+                let _ = write!(f, "sender: {}\n", self.idkey());
+                let _ = write!(f, "#recipients: {}\n", &dst_idkeys.len());
                 let num_op_pt_bytes = bincode::serialize(&payload).unwrap().len() as f64;
                 let num_common_pt_bytes =
                     bincode::serialize(&common_payload).unwrap().len() as f64;
@@ -218,16 +218,16 @@ impl<C: CoreClient> Core<C> {
                     (num_common_ct_bytes / num_common_pt_bytes) * 100.0;
                 //let total_len_diff = num_common_ct_bytes - num_op_pt_bytes;
                 let both_perc: f64 = (num_common_ct_bytes / num_op_pt_bytes) * 100.0;
-                write!(f, "---common overhead\n");
-                write!(f, "#op_pt_bytes: {}\n", &num_op_pt_bytes);
-                write!(f, "#common_pt_bytes: {}\n", &num_common_pt_bytes);
-                write!(f, "#common_ct_bytes: {}\n", &num_common_ct_bytes);
+                let _ = write!(f, "---common overhead\n");
+                let _ = write!(f, "#op_pt_bytes: {}\n", &num_op_pt_bytes);
+                let _ = write!(f, "#common_pt_bytes: {}\n", &num_common_pt_bytes);
+                let _ = write!(f, "#common_ct_bytes: {}\n", &num_common_ct_bytes);
                 //write!(f, "rcpt_list_len_diff: {}\n", &rcpt_list_len_diff);
-                write!(f, "rcpt_list %: {}\n", &rcpt_list_perc);
+                let _ = write!(f, "rcpt_list %: {}\n", &rcpt_list_perc);
                 //write!(f, "symenc_len_diff: {}\n", &symenc_len_diff);
-                write!(f, "symenc %: {}\n", &symenc_perc);
+                let _ = write!(f, "symenc %: {}\n", &symenc_perc);
                 //write!(f, "total_len_diff: {}\n", &total_len_diff);
-                write!(f, "both %: {}\n", &both_perc);
+                let _ = write!(f, "both %: {}\n", &both_perc);
             }
 
             if bench && self.benchmark_send.read().await.is_some() {
@@ -263,14 +263,14 @@ impl<C: CoreClient> Core<C> {
                         .create(true)
                         .open(filename)
                         .unwrap();
-                    write!(f, "---per recipient overhead\n");
+                    let _ = write!(f, "---per recipient overhead\n");
                     if idkey.clone() == self.idkey() {
-                        write!(f, "RCPT == SELF: {}\n", &idkey);
+                        let _ = write!(f, "RCPT == SELF: {}\n", &idkey);
                     } else {
-                        write!(f, "RCPT == OTHER: {}\n", &idkey);
+                        let _ = write!(f, "RCPT == OTHER: {}\n", &idkey);
                     }
-                    write!(f, "val_pt: {:?}\n", &val_payload);
-                    write!(f, "perrcpt_pt: {:?}\n", &perrcpt_pt);
+                    let _ = write!(f, "val_pt: {:?}\n", &val_payload);
+                    let _ = write!(f, "perrcpt_pt: {:?}\n", &perrcpt_pt);
                     let num_val_pt_bytes =
                         bincode::serialize(&val_payload).unwrap().len() as f64;
                     let num_perrcpt_pt_bytes =
@@ -280,19 +280,19 @@ impl<C: CoreClient> Core<C> {
                     // num_perrcpt_pt_bytes;
                     let perrcpt_perc: f64 =
                         (num_perrcpt_ct_bytes / num_perrcpt_pt_bytes) * 100.0;
-                    write!(f, "#val_pt_bytes: {}\n", &num_val_pt_bytes);
-                    write!(f, "#perrcpt_pt_bytes: {}\n", &num_perrcpt_pt_bytes);
-                    write!(f, "#perrcpt_ct_bytes: {}\n", &num_perrcpt_ct_bytes);
+                    let _ = write!(f, "#val_pt_bytes: {}\n", &num_val_pt_bytes);
+                    let _ = write!(f, "#perrcpt_pt_bytes: {}\n", &num_perrcpt_pt_bytes);
+                    let _ = write!(f, "#perrcpt_ct_bytes: {}\n", &num_perrcpt_ct_bytes);
+                    let _ = write!(f, "perrcpt %: {}\n", &perrcpt_perc);
                     //write!(f, "num_perrcpt_len_diff: {}\n",
                     // &num_perrcpt_len_diff);
-                    write!(f, "perrcpt %: {}\n", &perrcpt_perc);
                     // storage measurements
                     let sessionlock = self.crypto.sessions.lock();
                     if let Some(val) = sessionlock.get(&idkey) {
                         let session = &val.1[0];
                         let pickled = session.pickle(olm_rs::PicklingMode::Unencrypted);
-                        write!(f, "--storage overhead\n");
-                        write!(f, "pickled session len: {:?}\n", &pickled.len());
+                        let _ = write!(f, "--storage overhead\n");
+                        let _ = write!(f, "pickled session len: {:?}\n", &pickled.len());
                     }
                 }
 
@@ -338,7 +338,7 @@ impl<C: CoreClient> Core<C> {
                         .unwrap();
                     let vec = self.send_timestamp_vec.lock().await;
                     for entry in vec.iter() {
-                        write!(f, "{:?}\n", entry);
+                        let _ = write!(f, "{:?}\n", entry);
                     }
                 } else if cur_count > 1 {
                     *self.benchmark_send.write().await = Some(cur_count - 1);
@@ -518,7 +518,7 @@ impl<C: CoreClient> Core<C> {
                             .unwrap();
                         let vec = self.recv_timestamp_vec.lock().await;
                         for entry in vec.iter() {
-                            write!(f, "{:?}\n", entry);
+                            let _ = write!(f, "{:?}\n", entry);
                         }
                     } else if cur_count > 1 {
                         *self.benchmark_recv.write().await = Some(cur_count - 1);
@@ -599,10 +599,10 @@ pub mod stream_client {
     impl CoreClient for StreamClient {
         async fn client_callback(
             &self,
-            seq: crate::core::SequenceNumber,
+            _seq: crate::core::SequenceNumber,
             sender: String,
             message: String,
-            bench: bool,
+            _bench: bool,
         ) {
             use futures::SinkExt;
             self.sender

diff --git a/client/core/src/crypto.rs b/client/core/src/crypto.rs
@@ -46,9 +46,9 @@ impl Crypto {
         mut pt: Vec<u8>,
     ) -> (Vec<u8>, [u8; 16], [u8; 32], [u8; 12]) {
         use aes_gcm::{
-            aead::{Aead, AeadInPlace, KeyInit, OsRng},
+            aead::{AeadInPlace, KeyInit},
             Aes256Gcm,
-            Nonce, // Or `Aes128Gcm`
+            //Nonce, // Or `Aes128Gcm`
         };
 
         // Convert the plain text to bytes and short-circuit if encryption is
@@ -87,9 +87,9 @@ impl Crypto {
         nonce: [u8; 12],
     ) -> Vec<u8> {
         use aes_gcm::{
-            aead::{Aead, AeadInPlace, KeyInit, OsRng},
+            aead::{AeadInPlace, KeyInit},
             Aes256Gcm,
-            Nonce, // Or `Aes128Gcm`
+            //Nonce, // Or `Aes128Gcm`
         };
 
         if self.turn_encryption_off {

diff --git a/client/core/src/hash_vectors.rs b/client/core/src/hash_vectors.rs
@@ -239,7 +239,7 @@ impl HashVectors {
             common_payload.recipients,
             common_payload.message.clone(),
         ) {
-            Ok(local_seq) => {
+            Ok(_local_seq) => {
                 let validation_payload = match (
                     recipient_payload.validation_seq,
                     recipient_payload.validation_digest,

diff --git a/client/core/src/server_comm.rs b/client/core/src/server_comm.rs
@@ -79,8 +79,8 @@ pub struct ServerCommImpl<C: CoreClient> {
 
 impl<C: CoreClient> ServerCommImpl<C> {
     pub async fn new<'a>(
-        ip_arg: Option<&'a str>,
-        port_arg: Option<&'a str>,
+        _ip_arg: Option<&'a str>,
+        _port_arg: Option<&'a str>,
         idkey: String,
         core_option: Option<Arc<Core<C>>>,
     ) -> Self {

diff --git a/client/tank/.cargo/config.toml b/client/tank/.cargo/config.toml
@@ -1,26 +1,36 @@
 [env]
+#TOOLCHAIN="/home/np/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64"
+#RANLIB="/home/np/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
+ANDROID_NDK="/Users/np/Library/Android/sdk/ndk/27.0.11718014"
+TOOLCHAIN="/Users/np/Library/Android/sdk/ndk/27.0.11718014/toolchains/llvm/prebuilt/darwin-x86_64"
+RANLIB="/Users/np/Library/Android/sdk/ndk/27.0.11718014/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-ranlib"
+
 #HOME="/home/np"
 #ANDROID_NDK_HOME="$HOME/Android/Sdk/ndk/25.2.9519653/"
-TOOLCHAIN="/home/np/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64"
 #TARGET="aarch64-linux-android"
 #API="33"
 #AR="$TOOLCHAIN/bin/llvm-ar"
 #CC="$TOOLCHAIN/bin/$TARGET$API-clang"
 #AS="$CC"
 #CXX="$TOOLCHAIN/bin/$TARGET$API-clang++"
 #LD="$TOOLCHAIN/bin/ld"
-RANLIB="/home/np/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib"
 #STRIP="$TOOLCHAIN/bin/llvm-strip"
 
 # Arm
-#[target.arm7-linux-androideabi]
+#[target.armv7-linux-androideabi]
 
 # Arm64
 [target.aarch64-linux-android]
-linker = "/home/np/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang"
+# linux
+#linker = "/home/np/Android/Sdk/ndk/25.2.9519653/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang"
+# macOS
+linker = "/Users/np/Library/Android/sdk/ndk/27.0.11718014/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android34-clang"
 
 # X86
 #[target.i686-linux-android]
 
 # X86_64
 #[target.x86_64-linux-android]
+
+[build]
+target-dir = "target"