From d7e4e5754846cd7ced4575e0a6fd4bd7dfe1a0b6 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Thu, 9 Aug 2018 09:03:08 -0600
Subject: [PATCH] Rename public_key variables to pubkey

---
 src/drone.rs     | 12 ++++++------
 src/signature.rs |  6 +++---
 src/sigverify.rs |  8 ++++----
 src/wallet.rs    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/drone.rs b/src/drone.rs
index cd2fed1dcb..f8c85b1d7a 100644
--- a/src/drone.rs
+++ b/src/drone.rs
@@ -23,7 +23,7 @@ pub const DRONE_PORT: u16 = 9900;
 pub enum DroneRequest {
     GetAirdrop {
         airdrop_request_amount: u64,
-        client_public_key: PublicKey,
+        client_pubkey: PublicKey,
     },
 }
 
@@ -111,16 +111,16 @@ impl Drone {
         let tx = match req {
             DroneRequest::GetAirdrop {
                 airdrop_request_amount,
-                client_public_key,
+                client_pubkey,
             } => {
                 info!(
                     "Requesting airdrop of {} to {:?}",
-                    airdrop_request_amount, client_public_key
+                    airdrop_request_amount, client_pubkey
                 );
                 request_amount = airdrop_request_amount;
                 Transaction::new(
                     &self.mint_keypair,
-                    client_public_key,
+                    client_pubkey,
                     airdrop_request_amount as i64,
                     last_id,
                 )
@@ -321,14 +321,14 @@ mod tests {
 
         let bob_req = DroneRequest::GetAirdrop {
             airdrop_request_amount: 50,
-            client_public_key: bob_pubkey,
+            client_pubkey: bob_pubkey,
         };
         let bob_sig = drone.send_airdrop(bob_req).unwrap();
         assert!(client.poll_for_signature(&bob_sig).is_ok());
 
         let carlos_req = DroneRequest::GetAirdrop {
             airdrop_request_amount: 5_000_000,
-            client_public_key: carlos_pubkey,
+            client_pubkey: carlos_pubkey,
         };
         let carlos_sig = drone.send_airdrop(carlos_req).unwrap();
         assert!(client.poll_for_signature(&carlos_sig).is_ok());
diff --git a/src/signature.rs b/src/signature.rs
index 42a21aeab7..fe060044eb 100644
--- a/src/signature.rs
+++ b/src/signature.rs
@@ -48,11 +48,11 @@ impl Signature {
     pub fn new(signature_slice: &[u8]) -> Self {
         Signature(GenericArray::clone_from_slice(&signature_slice))
     }
-    pub fn verify(&self, peer_public_key_bytes: &[u8], msg_bytes: &[u8]) -> bool {
-        let peer_public_key = Input::from(peer_public_key_bytes);
+    pub fn verify(&self, pubkey_bytes: &[u8], msg_bytes: &[u8]) -> bool {
+        let pubkey = Input::from(pubkey_bytes);
         let msg = Input::from(msg_bytes);
         let sig = Input::from(self.0.as_slice());
-        signature::verify(&signature::ED25519, peer_public_key, msg, sig).is_ok()
+        signature::verify(&signature::ED25519, pubkey, msg, sig).is_ok()
     }
 }
 
diff --git a/src/sigverify.rs b/src/sigverify.rs
index 5ebad8cbef..e411d8c61c 100644
--- a/src/sigverify.rs
+++ b/src/sigverify.rs
@@ -29,7 +29,7 @@ extern "C" {
         vecs: *const Elems,
         num: u32,          //number of vecs
         message_size: u32, //size of each element inside the elems field of the vec
-        public_key_offset: u32,
+        pubkey_offset: u32,
         signature_offset: u32,
         signed_message_offset: u32,
         signed_message_len_offset: u32,
@@ -50,8 +50,8 @@ fn verify_packet(packet: &Packet) -> u8 {
     let msg_start = TX_OFFSET + SIGNED_DATA_OFFSET;
     let sig_start = TX_OFFSET + SIG_OFFSET;
     let sig_end = sig_start + size_of::<Signature>();
-    let pub_key_start = TX_OFFSET + PUB_KEY_OFFSET;
-    let pub_key_end = pub_key_start + size_of::<PublicKey>();
+    let pubkey_start = TX_OFFSET + PUB_KEY_OFFSET;
+    let pubkey_end = pubkey_start + size_of::<PublicKey>();
 
     if packet.meta.size <= msg_start {
         return 0;
@@ -60,7 +60,7 @@ fn verify_packet(packet: &Packet) -> u8 {
     let msg_end = packet.meta.size;
     signature::verify(
         &signature::ED25519,
-        untrusted::Input::from(&packet.data[pub_key_start..pub_key_end]),
+        untrusted::Input::from(&packet.data[pubkey_start..pubkey_end]),
         untrusted::Input::from(&packet.data[msg_start..msg_end]),
         untrusted::Input::from(&packet.data[sig_start..sig_end]),
     ).is_ok() as u8
diff --git a/src/wallet.rs b/src/wallet.rs
index bb3219a975..527c41d02b 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -13,7 +13,7 @@ pub fn request_airdrop(
     let mut stream = TcpStream::connect(drone_addr)?;
     let req = DroneRequest::GetAirdrop {
         airdrop_request_amount: tokens,
-        client_public_key: *id,
+        client_pubkey: *id,
     };
     let tx = serialize(&req).expect("serialize drone request");
     stream.write_all(&tx).unwrap();