diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-10-01 17:51:06 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-10-01 18:04:08 +0200 |
| commit | 63637a094a032a5641d150e83d6831e47cdf1a5b (patch) | |
| tree | 26601be45845a00e0d235d2de81f0613d11bec98 | |
| parent | bad36b9606f264478bdf5bf80406b8cff4a85d1c (diff) | |
| download | mullvadvpn-63637a094a032a5641d150e83d6831e47cdf1a5b.tar.xz mullvadvpn-63637a094a032a5641d150e83d6831e47cdf1a5b.zip | |
Don't let the wrapper be responsible for creating initial state
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/mod.rs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs index 87bc2b157a..f37a035ce0 100644 --- a/talpid-core/src/tunnel_state_machine/mod.rs +++ b/talpid-core/src/tunnel_state_machine/mod.rs @@ -151,8 +151,7 @@ impl TunnelStateMachine { NetworkSecurity::new(cache_dir).chain_err(|| ErrorKind::NetworkSecurityError)?; let mut shared_values = SharedTunnelStateValues { security }; - let initial_state = TunnelStateWrapper::new(&mut shared_values, ()); - + let (initial_state, _) = DisconnectedState::enter(&mut shared_values, ()); Ok(TunnelStateMachine { current_state: Some(initial_state), commands, @@ -309,15 +308,6 @@ state_wrapper! { } impl TunnelStateWrapper { - fn new( - shared_values: &mut SharedTunnelStateValues, - bootstrap: <DisconnectedState as TunnelState>::Bootstrap, - ) -> TunnelStateWrapper { - let (new_state, _transition) = DisconnectedState::enter(shared_values, bootstrap); - - new_state - } - fn handle_event( self, commands: &mut mpsc::UnboundedReceiver<TunnelCommand>, |