Replace big_array with serde_as, cargo fmt likes things to be alphabetical

crates/lox-library/Cargo.toml

@@ -12,7 +12,6 @@ zkp = "0.8"
 bincode = "1"
 rand = "0.7"
 serde = "1"
-serde-big-array = "0.3.2"
 serde_with = "1.9.1"
 sha2 = "0.9"
 lazy_static = "1"

crates/lox-library/src/bridge_table.rs

@@ -18,17 +18,12 @@ use curve25519_dalek::ristretto::CompressedRistretto;
 use curve25519_dalek::ristretto::RistrettoBasepointTable;
 use curve25519_dalek::scalar::Scalar;
 use rand::RngCore;
-use serde::{Serialize, Deserialize};
-use serde_big_array::big_array;
+use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
 use std::collections::{HashMap, HashSet};
 use std::convert::TryInto;
 use subtle::ConstantTimeEq;
 
-big_array! {
-    BigArray;
-    +202,
-}
-
 /// Each bridge information line is serialized into this many bytes
 pub const BRIDGE_BYTES: usize = 220;
 
@@ -42,6 +37,7 @@ pub const MAX_BRIDGES_PER_BUCKET: usize = 3;
 pub const MIN_BUCKET_REACHABILITY: usize = 2;
 
 /// A bridge information line
+#[serde_as]
 #[derive(Serialize, Deserialize, Copy, Clone, Hash, Eq, PartialEq, Debug)]
 pub struct BridgeLine {
     /// IPv4 or IPv6 address
@@ -50,7 +46,7 @@ pub struct BridgeLine {
     pub port: u16,
     /// other protocol information, including pluggable transport,
     /// public key, etc.
-    #[serde(with = "BigArray")]
+    #[serde_as(as = "[_; BRIDGE_BYTES - 18]")]
     pub info: [u8; BRIDGE_BYTES - 18],
 }
 

crates/lox-library/src/proto/blockage_migration.rs

@@ -43,7 +43,7 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use super::super::cred;
 use super::super::dup_filter::SeenType;
@@ -95,7 +95,6 @@ pub struct State {
     blockages: Scalar,
 }
 
-
 #[derive(Serialize, Deserialize)]
 pub struct Response {
     // The new attributes; the trust_level and invites_remaining are

crates/lox-library/src/proto/check_blockage.rs

@@ -37,7 +37,7 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize,Deserialize};
+use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 
 use std::collections::HashMap;
@@ -92,7 +92,7 @@ pub struct Response {
     // A table of encrypted Migration credentials; the encryption keys
     // are formed from the possible values of Qk (the decrypted form of
     // EncQk)
-   #[serde_as(as = "Vec<(_,[_; migration_table::ENC_MIGRATION_BYTES])>")]
+    #[serde_as(as = "Vec<(_,[_; migration_table::ENC_MIGRATION_BYTES])>")]
     enc_migration_table: HashMap<[u8; 16], [u8; migration_table::ENC_MIGRATION_BYTES]>,
 }
 

crates/lox-library/src/proto/issue_invite.rs

@@ -54,7 +54,7 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use super::super::cred;
 use super::super::dup_filter::SeenType;

crates/lox-library/src/proto/level_up.rs

@@ -47,7 +47,7 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use super::super::cred;
 use super::super::dup_filter::SeenType;

crates/lox-library/src/proto/migration.rs

@@ -39,7 +39,7 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use super::super::cred;
 use super::super::dup_filter::SeenType;

crates/lox-library/src/proto/open_invite.rs

@@ -22,8 +22,8 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize, Deserialize};
-use serde_big_array::big_array;
+use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
 
 use super::super::bridge_table;
 use super::super::bridge_table::BridgeLine;
@@ -33,12 +33,11 @@ use super::super::OPENINV_LENGTH;
 use super::super::{BridgeAuth, BridgeDb, IssuerPubKey};
 use super::super::{CMZ_A, CMZ_A_TABLE, CMZ_B, CMZ_B_TABLE};
 
-big_array! { BigArray; }
-
 /// The request message for this protocol
+#[serde_as]
 #[derive(Serialize, Deserialize)]
 pub struct Request {
-    #[serde(with = "BigArray")]
+    #[serde_as(as = "[_; OPENINV_LENGTH]")]
     invite: [u8; OPENINV_LENGTH],
     D: RistrettoPoint,
     EncIdClient: (RistrettoPoint, RistrettoPoint),

crates/lox-library/src/proto/redeem_invite.rs

@@ -30,7 +30,7 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 use super::super::cred;
 use super::super::dup_filter::SeenType;

crates/lox-library/src/proto/trust_promotion.rs

@@ -36,7 +36,7 @@ use zkp::CompactProof;
 use zkp::ProofError;
 use zkp::Transcript;
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 
 use std::collections::HashMap;