diff --git a/src/accountant.rs b/src/accountant.rs index 0c03ae17ee..f99e986fb8 100644 --- a/src/accountant.rs +++ b/src/accountant.rs @@ -48,13 +48,8 @@ impl Accountant { entries } - pub fn deposit_signed( - self: &mut Self, - key: PublicKey, - data: u64, - sig: Signature, - ) -> Result<()> { - let event = Event::Claim { key, data, sig }; + pub fn deposit_signed(self: &mut Self, to: PublicKey, data: u64, sig: Signature) -> Result<()> { + let event = Event::Claim { to, 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 let Some(x) = self.balances.get_mut(&key) { + if self.balances.contains_key(&to) { + if let Some(x) = self.balances.get_mut(&to) { *x += data; } } else { - self.balances.insert(key, data); + self.balances.insert(to, data); } Ok(()) diff --git a/src/bin/demo.rs b/src/bin/demo.rs index c7ce456951..cb09ee52ac 100644 --- a/src/bin/demo.rs +++ b/src/bin/demo.rs @@ -12,7 +12,7 @@ fn create_log(hist: &Historian) -> Result<(), SendError; pub enum Event { Tick, Claim { - key: PublicKey, + to: PublicKey, data: T, sig: Signature, }, @@ -92,9 +92,9 @@ pub fn get_signature(event: &Event) -> Option { pub fn verify_event(event: &Event) -> 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; } } diff --git a/src/historian.rs b/src/historian.rs index c01947c1dc..bfbca2c8b9 100644 --- a/src/historian.rs +++ b/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)); diff --git a/src/log.rs b/src/log.rs index 2f24dc2b45..77d0584b1c 100644 --- a/src/log.rs +++ b/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), };