Rename Claim's key field to match same field in Transaction

src/accountant.rs

@@ -48,13 +48,8 @@ impl Accountant {
         entries
     }
 
-    pub fn deposit_signed(
+    pub fn deposit_signed(self: &mut Self, to: PublicKey, data: u64, sig: Signature) -> Result<()> {
-        self: &mut Self,
+        let event = Event::Claim { to, data, sig };
-        key: PublicKey,
-        data: u64,
-        sig: Signature,
-    ) -> Result<()> {
-        let event = Event::Claim { key, data, sig };
         if !self.historian.verify_event(&event) {
             return Err(AccountingError::InvalidEvent);
         }
@@ -62,12 +57,12 @@ impl Accountant {
             return Err(AccountingError::SendError);
         }
 
-        if self.balances.contains_key(&key) {
+        if self.balances.contains_key(&to) {
-            if let Some(x) = self.balances.get_mut(&key) {
+            if let Some(x) = self.balances.get_mut(&to) {
                 *x += data;
             }
         } else {
-            self.balances.insert(key, data);
+            self.balances.insert(to, data);
         }
 
         Ok(())

src/bin/demo.rs

@@ -12,7 +12,7 @@ fn create_log(hist: &Historian<Sha256Hash>) -> Result<(), SendError<Event<Sha256
     let data = Sha256Hash::default();
     let keypair = generate_keypair();
     let event0 = Event::Claim {
-        key: get_pubkey(&keypair),
+        to: get_pubkey(&keypair),
         data,
         sig: sign_serialized(&data, &keypair),
     };

src/event.rs

@@ -30,7 +30,7 @@ pub type Signature = GenericArray<u8, U64>;
 pub enum Event<T> {
     Tick,
     Claim {
-        key: PublicKey,
+        to: PublicKey,
         data: T,
         sig: Signature,
     },
@@ -92,9 +92,9 @@ pub fn get_signature<T>(event: &Event<T>) -> Option<Signature> {
 
 pub fn verify_event<T: Serialize>(event: &Event<T>) -> bool {
     use bincode::serialize;
-    if let Event::Claim { key, ref data, sig } = *event {
+    if let Event::Claim { to, ref data, sig } = *event {
         let mut claim_data = serialize(&data).unwrap();
-        if !verify_signature(&key, &claim_data, &sig) {
+        if !verify_signature(&to, &claim_data, &sig) {
             return false;
         }
     }

src/historian.rs

@@ -216,7 +216,7 @@ mod tests {
         let keypair = generate_keypair();
         let sig = sign_serialized(&hash(b"hello, world"), &keypair);
         let event0 = Event::Claim {
-            key: get_pubkey(&keypair),
+            to: get_pubkey(&keypair),
             data: hash(b"goodbye cruel world"),
             sig,
         };
@@ -228,10 +228,10 @@ mod tests {
     #[test]
     fn test_duplicate_event_signature() {
         let keypair = generate_keypair();
-        let key = get_pubkey(&keypair);
+        let to = get_pubkey(&keypair);
         let data = &hash(b"hello, world");
         let sig = sign_serialized(data, &keypair);
-        let event0 = Event::Claim { key, data, sig };
+        let event0 = Event::Claim { to, data, sig };
         let mut sigs = HashSet::new();
         assert!(verify_event_and_reserve_signature(&mut sigs, &event0));
         assert!(!verify_event_and_reserve_signature(&mut sigs, &event0));

src/log.rs

@@ -212,13 +212,13 @@ mod tests {
         // First, verify Claim events
         let keypair = generate_keypair();
         let event0 = Event::Claim {
-            key: get_pubkey(&keypair),
+            to: get_pubkey(&keypair),
             data: zero,
             sig: sign_serialized(&zero, &keypair),
         };
 
         let event1 = Event::Claim {
-            key: get_pubkey(&keypair),
+            to: get_pubkey(&keypair),
             data: one,
             sig: sign_serialized(&one, &keypair),
         };
@@ -239,7 +239,7 @@ mod tests {
         let keypair = generate_keypair();
         let data = hash(b"hello, world");
         let event0 = Event::Claim {
-            key: get_pubkey(&keypair),
+            to: get_pubkey(&keypair),
             data,
             sig: sign_serialized(&data, &keypair),
         };
@@ -252,7 +252,7 @@ mod tests {
     fn test_wrong_data_claim_attack() {
         let keypair = generate_keypair();
         let event0 = Event::Claim {
-            key: get_pubkey(&keypair),
+            to: get_pubkey(&keypair),
             data: hash(b"goodbye cruel world"),
             sig: sign_serialized(&hash(b"hello, world"), &keypair),
         };