use Key in SendMachine internals

remove unused .key in the KeyMachine struct: the key is only stored inside the state enum
magic-wormhole · May 26, 2018 · 5fc4882 · 5fc4882
1 parent c5f1dc8
commit 5fc4882
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/core/src/send.rs b/core/src/send.rs
@@ -1,4 +1,4 @@
-use events::Events;
+use events::{Key, Events};
 use key;
 // we process these
 use events::SendEvent;
@@ -9,14 +9,13 @@ use events::MailboxEvent::AddMessage as M_AddMessage;
 pub struct SendMachine {
     state: State,
     side: String,
-    key: Vec<u8>,
     queue: Vec<(String, Vec<u8>)>,
 }
 
 #[derive(Debug, PartialEq)]
 enum State {
     S0NoKey,
-    S1HaveVerifiedKey(Vec<u8>),
+    S1HaveVerifiedKey(Key),
 }
 
 enum QueueStatus {
@@ -30,7 +29,6 @@ impl SendMachine {
         SendMachine {
             state: State::S0NoKey,
             side: side.to_string(),
-            key: Vec::new(),
             queue: Vec::new(),
         }
     }
@@ -42,7 +40,7 @@ impl SendMachine {
         );
         let (newstate, actions, queue_status) = match self.state {
             State::S0NoKey => self.do_s0(event),
-            State::S1HaveVerifiedKey(ref key) => self.do_s1(key.to_vec(), event),
+            State::S1HaveVerifiedKey(ref key) => self.do_s1(&key, event),
         };
 
         // process the queue
@@ -58,11 +56,11 @@ impl SendMachine {
         actions
     }
 
-    fn drain(&self, key: Vec<u8>) -> Events {
+    fn drain(&self, key: Key) -> Events {
         let mut es = Events::new();
 
         for &(ref phase, ref plaintext) in &self.queue {
-            let data_key = key::derive_phase_key(&self.side, &key, phase);
+            let data_key = key::derive_phase_key(&self.side, &key.to_vec(), phase);
             let (_nonce, encrypted) = key::encrypt_data(data_key, plaintext);
             es.push(M_AddMessage(phase.to_string(), encrypted));
         }
@@ -72,11 +70,11 @@ impl SendMachine {
 
     fn deliver(
         &self,
-        key: Vec<u8>,
+        key: Key,
         phase: String,
         plaintext: Vec<u8>,
     ) -> Events {
-        let data_key = key::derive_phase_key(&self.side, &key, &phase);
+        let data_key = key::derive_phase_key(&self.side, &key.to_vec(), &phase);
         let (_nonce, encrypted) = key::encrypt_data(data_key, &plaintext);
         events![M_AddMessage(phase, encrypted)]
     }
@@ -85,8 +83,8 @@ impl SendMachine {
         use events::SendEvent::*;
         match event {
             GotVerifiedKey(ref key) => (
-                State::S1HaveVerifiedKey(key.to_vec()),
-                self.drain(key.to_vec()),
+                State::S1HaveVerifiedKey(key.clone()),
+                self.drain(key.clone()),
                 QueueStatus::Drain,
             ),
             // we don't have a verified key, yet we got messages to send, so queue it up.
@@ -100,7 +98,7 @@ impl SendMachine {
 
     fn do_s1(
         &self,
-        key: Vec<u8>,
+        key: &Key,
         event: SendEvent,
     ) -> (State, Events, QueueStatus) {
         use events::SendEvent::*;
@@ -110,7 +108,7 @@ impl SendMachine {
                 let deliver_events =
                     self.deliver(key.clone(), phase, plaintext);
                 (
-                    State::S1HaveVerifiedKey(key),
+                    State::S1HaveVerifiedKey(key.clone()),
                     deliver_events,
                     QueueStatus::NoAction,
                 )