From 46c19a578318cb0bbba31a265b54e5d4f5da8b91 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <garious@gmail.com>
Date: Fri, 25 May 2018 16:52:17 -0600
Subject: [PATCH] Rename sigverify modules

---
 src/lib.rs                                      | 4 ++--
 src/{ecdsa.rs => sigverify.rs}                  | 6 +++---
 src/{sig_verify_stage.rs => sigverify_stage.rs} | 4 ++--
 src/tpu.rs                                      | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{ecdsa.rs => sigverify.rs} (97%)
 rename src/{sig_verify_stage.rs => sigverify_stage.rs} (97%)

diff --git a/src/lib.rs b/src/lib.rs
index 48dedfbc7a..184da6fdee 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,6 @@
 pub mod bank;
 pub mod banking_stage;
 pub mod crdt;
-pub mod ecdsa;
 pub mod entry;
 pub mod entry_writer;
 #[cfg(feature = "erasure")]
@@ -22,8 +21,9 @@ pub mod request_stage;
 pub mod result;
 pub mod rpu;
 pub mod server;
-pub mod sig_verify_stage;
 pub mod signature;
+pub mod sigverify;
+pub mod sigverify_stage;
 pub mod streamer;
 pub mod thin_client;
 pub mod timing;
diff --git a/src/ecdsa.rs b/src/sigverify.rs
similarity index 97%
rename from src/ecdsa.rs
rename to src/sigverify.rs
index d8839ba477..1a859b8326 100644
--- a/src/ecdsa.rs
+++ b/src/sigverify.rs
@@ -143,8 +143,8 @@ pub fn ed25519_verify(batches: &Vec<SharedPackets>) -> Vec<Vec<u8>> {
 #[cfg(test)]
 mod tests {
     use bincode::serialize;
-    use ecdsa;
     use packet::{Packet, Packets, SharedPackets};
+    use sigverify;
     use std::sync::RwLock;
     use transaction::Transaction;
     use transaction::{memfind, test_tx};
@@ -154,7 +154,7 @@ mod tests {
         let tx = test_tx();
         let tx_bytes = serialize(&tx).unwrap();
         let packet = serialize(&tx).unwrap();
-        assert_matches!(memfind(&packet, &tx_bytes), Some(ecdsa::TX_OFFSET));
+        assert_matches!(memfind(&packet, &tx_bytes), Some(sigverify::TX_OFFSET));
         assert_matches!(memfind(&packet, &[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]), None);
     }
 
@@ -185,7 +185,7 @@ mod tests {
         let batches = vec![shared_packets.clone(), shared_packets.clone()];
 
         // verify packets
-        let ans = ecdsa::ed25519_verify(&batches);
+        let ans = sigverify::ed25519_verify(&batches);
 
         // check result
         let ref_ans = if modify_data { 0u8 } else { 1u8 };
diff --git a/src/sig_verify_stage.rs b/src/sigverify_stage.rs
similarity index 97%
rename from src/sig_verify_stage.rs
rename to src/sigverify_stage.rs
index ccb201e3ae..3750378df5 100644
--- a/src/sig_verify_stage.rs
+++ b/src/sigverify_stage.rs
@@ -1,9 +1,9 @@
 //! The `sig_verify_stage` implements the signature verification stage of the TPU.
 
-use ecdsa;
 use packet::SharedPackets;
 use rand::{thread_rng, Rng};
 use result::Result;
+use sigverify;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::{Arc, Mutex};
@@ -28,7 +28,7 @@ impl SigVerifyStage {
     }
 
     fn verify_batch(batch: Vec<SharedPackets>) -> Vec<(SharedPackets, Vec<u8>)> {
-        let r = ecdsa::ed25519_verify(&batch);
+        let r = sigverify::ed25519_verify(&batch);
         batch.into_iter().zip(r).collect()
     }
 
diff --git a/src/tpu.rs b/src/tpu.rs
index a0c473fc27..b813bd3275 100644
--- a/src/tpu.rs
+++ b/src/tpu.rs
@@ -7,7 +7,7 @@ use crdt::{Crdt, ReplicatedData};
 use hash::Hash;
 use packet;
 use record_stage::RecordStage;
-use sig_verify_stage::SigVerifyStage;
+use sigverify_stage::SigVerifyStage;
 use std::io::Write;
 use std::net::UdpSocket;
 use std::sync::atomic::AtomicBool;
@@ -43,13 +43,13 @@ impl Tpu {
             packet_sender,
         );
 
-        let sig_verify_stage = SigVerifyStage::new(exit.clone(), packet_receiver);
+        let sigverify_stage = SigVerifyStage::new(exit.clone(), packet_receiver);
 
         let blob_recycler = packet::BlobRecycler::default();
         let banking_stage = BankingStage::new(
             bank.clone(),
             exit.clone(),
-            sig_verify_stage.verified_receiver,
+            sigverify_stage.verified_receiver,
             packet_recycler.clone(),
         );
 
@@ -87,7 +87,7 @@ impl Tpu {
             t_listen,
             t_broadcast,
         ];
-        thread_hdls.extend(sig_verify_stage.thread_hdls.into_iter());
+        thread_hdls.extend(sigverify_stage.thread_hdls.into_iter());
         Tpu { thread_hdls }
     }
 }