Use upstream spiral-rs again instead of our fork

They have implemented the gist of our fork, and also parameter and
query compression (saves a factor of ~2)

Cargo.toml

@@ -16,7 +16,7 @@ curve25519-dalek = { package = "curve25519-dalek-ng", version = "3", default-fea
 lazy_static = "1"
 sha2 = "0.9"
 subtle = { package = "subtle-ng", version = "2.4" }
-spiral-rs = { git = "https://git-crysp.uwaterloo.ca/iang/spiral-rs-fork/", branch = "client_mt" }
+spiral-rs = { git = "https://github.com/menonsamir/spiral-rs/", rev = "176e396d" }
 rayon = "1.5"
 bincode = "1"
 serde = "1"

src/client.rs

@@ -12,9 +12,6 @@ use rayon::prelude::*;
 
 use subtle::Choice;
 
-use rand::SeedableRng;
-use rand_chacha::ChaCha20Rng;
-
 use curve25519_dalek::scalar::Scalar;
 
 use crate::dbentry_decrypt;
@@ -64,7 +61,7 @@ impl Client {
         let (outgoing_resp_send, outgoing_resp) = sync_channel(0);
         spawn(move || {
             let spiral_params = params::get_spiral_params(r);
-            let mut spiral_client = spiral_rs::client::Client::init(&spiral_params, ChaCha20Rng::from_entropy);
+            let mut spiral_client = spiral_rs::client::Client::init(&spiral_params);
             let num_records = 1 << r;
             let num_records_mask = num_records - 1;
             let spiral_blocking_factor = spiral_params.db_item_size / mem::size_of::<DbEntry>();