diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-27 21:24:15 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-28 19:18:45 +0000 |
| commit | a4c73a9f1a84dd7e3b666cffde680a55e2a3bb80 (patch) | |
| tree | 1e936791b5e3bb9ed034dd7983cc3b231cb9564c | |
| parent | 84935bdd79d1460d37d90513f00f032afd68b876 (diff) | |
| download | mullvadvpn-a4c73a9f1a84dd7e3b666cffde680a55e2a3bb80.tar.xz mullvadvpn-a4c73a9f1a84dd7e3b666cffde680a55e2a3bb80.zip | |
Rename `StateTransition` event into `TunnelState`
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 2 | ||||
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 2 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/status.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 2 | ||||
| -rw-r--r-- | mullvad-types/src/lib.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index d0b1d2eff4..2c467a0d05 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -332,7 +332,7 @@ const settingsSchema = partialObject({ const daemonEventSchema = oneOf( object({ - state_transition: tunnelStateSchema, + tunnel_state: tunnelStateSchema, }), object({ settings: settingsSchema, diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index fbac6df9dd..ec52d0ad5f 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -70,7 +70,7 @@ export interface IProxyEndpoint { } export type DaemonEvent = - | { stateTransition: TunnelState } + | { tunnelState: TunnelState } | { settings: ISettings } | { relayList: IRelayList } | { wireguardKey: KeygenEvent }; diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs index 31e96ff207..12ad4d65be 100644 --- a/mullvad-cli/src/cmds/status.rs +++ b/mullvad-cli/src/cmds/status.rs @@ -39,7 +39,7 @@ impl Command for Status { .map_err(Error::CantSubscribe)?; for event in subscription.wait() { match event? { - DaemonEvent::StateTransition(new_state) => { + DaemonEvent::TunnelState(new_state) => { print_state(&new_state); use self::TunnelState::*; match new_state { diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index a2f0eb726b..103e39b25e 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -282,7 +282,7 @@ impl EventListener for ManagementInterfaceEventBroadcaster { /// Sends a new state update to all `new_state` subscribers of the management interface. fn notify_new_state(&self, new_state: TunnelState) { log::debug!("Broadcasting new state: {:?}", new_state); - self.notify(DaemonEvent::StateTransition(new_state)); + self.notify(DaemonEvent::TunnelState(new_state)); } /// Sends settings to all `settings` subscribers of the management interface. diff --git a/mullvad-types/src/lib.rs b/mullvad-types/src/lib.rs index bb9fa3bb17..448befd16f 100644 --- a/mullvad-types/src/lib.rs +++ b/mullvad-types/src/lib.rs @@ -27,7 +27,7 @@ pub use crate::custom_tunnel::*; #[serde(rename_all = "snake_case")] pub enum DaemonEvent { /// The daemon transitioned into a new state. - StateTransition(states::TunnelState), + TunnelState(states::TunnelState), /// The daemon settings changed. Settings(settings::Settings), |