Rename RelayConstraints -> RelaySettings

14 files changed, 40 insertions, 40 deletions

diff --git a/app/app.js b/app/app.js
index 5cdf7e78d9..a69e9dc919 100644
--- a/app/app.js
+++ b/app/app.js
@@ -28,7 +28,7 @@ ipcRenderer.on('backend-info', (_event, args) => {
   backend.sync();
   backend.autologin()
     .then( () => {
-      return backend.syncRelayConstraints();
+      return backend.syncRelaySettings();
     })
     .then( () => {
       const { settings } = store.getState();
diff --git a/app/components/Connect.js b/app/components/Connect.js
index 1dc135c745..2569e4b4b3 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -94,8 +94,8 @@ export default class Connect extends Component {
   }
 
   _getServerInfo() {
-    const { relayConstraints } = this.props.settings;
-    if (relayConstraints.host === 'any') {
+    const { relaySettings } = this.props.settings;
+    if (relaySettings.host === 'any') {
       return {
         name: 'Automatic',
         country: 'Automatic',
@@ -104,7 +104,7 @@ export default class Connect extends Component {
       };
     }
 
-    return this.props.getServerInfo(relayConstraints.host);
+    return this.props.getServerInfo(relaySettings.host);
   }
 
   renderMap(): React.Element<*> {
diff --git a/app/components/SelectLocation.js b/app/components/SelectLocation.js
index c6325ae2a5..b5f395b7ba 100644
--- a/app/components/SelectLocation.js
+++ b/app/components/SelectLocation.js
@@ -24,7 +24,7 @@ export default class SelectLocation extends Component {
   }
 
   isSelected(server: string) {
-    const { host } = this.props.settings.relayConstraints;
+    const { host } = this.props.settings.relaySettings;
     return server === host;
   }
 
diff --git a/app/containers/AdvancedSettingsPage.js b/app/containers/AdvancedSettingsPage.js
index ecb78eb218..632ce089be 100644
--- a/app/containers/AdvancedSettingsPage.js
+++ b/app/containers/AdvancedSettingsPage.js
@@ -5,7 +5,7 @@ import settingsActions from '../redux/settings/actions';
 import log from 'electron-log';
 
 const mapStateToProps = (state) => {
-  const contraints = state.settings.relayConstraints;
+  const contraints = state.settings.relaySettings;
   return {
     protocol: anyToAuto(contraints.protocol),
     port: anyToAuto(contraints.port),
@@ -42,7 +42,7 @@ const mapDispatchToProps = (dispatch, props) => {
         }},
       };
 
-      backend.updateRelayConstraints(update)
+      backend.updateRelaySettings(update)
         .then( () => dispatch(settingsActions.updateRelay({
           port: typeof(portConstraint) === 'object' ? portConstraint.only : portConstraint,
           protocol: typeof(protConstraint) === 'object' ? protConstraint.only : protConstraint,
diff --git a/app/containers/SelectLocationPage.js b/app/containers/SelectLocationPage.js
index 7ca2f1eb0a..82954349e4 100644
--- a/app/containers/SelectLocationPage.js
+++ b/app/containers/SelectLocationPage.js
@@ -21,7 +21,7 @@ const mapDispatchToProps = (dispatch, props) => {
           }},
         };
 
-        backend.updateRelayConstraints(update)
+        backend.updateRelaySettings(update)
           .then( () => dispatch(settingsActions.updateRelay({
             host: preferredServer,
           })))
diff --git a/app/lib/backend.js b/app/lib/backend.js
index b18df8250a..105af65fd0 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -11,7 +11,7 @@ import { push } from 'react-router-redux';
 import { defaultServer } from '../config';
 
 import type { ReduxStore } from '../redux/store';
-import type { AccountToken, BackendState, RelayConstraintsUpdate } from './ipc-facade';
+import type { AccountToken, BackendState, RelaySettingsUpdate } from './ipc-facade';
 import type { ConnectionState } from '../redux/connection/reducers';
 
 export type ErrorType = 'NO_CREDIT' | 'NO_INTERNET' | 'INVALID_ACCOUNT' | 'NO_ACCOUNT';
@@ -269,7 +269,7 @@ export class Backend {
     let setHostPromise = () => Promise.resolve();
     if (host) {
       this._store.dispatch(connectionActions.connectingTo(host || 'unknown'));
-      setHostPromise = () => this._ipc.updateRelayConstraints({
+      setHostPromise = () => this._ipc.updateRelaySettings({
         host: { only: host },
         tunnel: { openvpn: {
         }},
@@ -303,17 +303,17 @@ export class Backend {
       });
   }
 
-  updateRelayConstraints(relayConstraints: RelayConstraintsUpdate): Promise<void> {
+  updateRelaySettings(relaySettings: RelaySettingsUpdate): Promise<void> {
     return this._ensureAuthenticated()
       .then( () => {
-        return this._ipc.updateRelayConstraints(relayConstraints);
+        return this._ipc.updateRelaySettings(relaySettings);
       });
   }
 
-  syncRelayConstraints(): Promise<void> {
+  syncRelaySettings(): Promise<void> {
     return this._ensureAuthenticated()
       .then( () => {
-        return this._ipc.getRelayContraints();
+        return this._ipc.getRelaySettings();
       })
       .then( constraints => {
         log.debug('Got constraints from backend', constraints);
diff --git a/app/lib/ipc-facade.js b/app/lib/ipc-facade.js
index 107cb3419d..29f24c341b 100644
--- a/app/lib/ipc-facade.js
+++ b/app/lib/ipc-facade.js
@@ -27,7 +27,7 @@ export type BackendState = {
   state: SecurityState,
   target_state: SecurityState,
 };
-type RelayConstraints = {
+type RelaySettings = {
   host: 'any' | { only: string },
   tunnel: {
     openvpn: {
@@ -36,7 +36,7 @@ type RelayConstraints = {
     },
   },
 };
-export type RelayConstraintsUpdate = {
+export type RelaySettingsUpdate = {
   host?: 'any' | { only: string },
   tunnel: {
     openvpn: {
@@ -48,7 +48,7 @@ export type RelayConstraintsUpdate = {
 const Constraint = (v) => oneOf(string, object({
   only: v,
 }));
-const RelayConstraintsSchema = object({
+const RelaySettingsSchema = object({
   host: Constraint(string),
   tunnel: object({
     openvpn: object({
@@ -64,8 +64,8 @@ export interface IpcFacade {
   getAccountData(AccountToken): Promise<AccountData>,
   getAccount(): Promise<?AccountToken>,
   setAccount(accountToken: ?AccountToken): Promise<void>,
-  updateRelayConstraints(RelayConstraintsUpdate): Promise<void>,
-  getRelayContraints(): Promise<RelayConstraints>,
+  updateRelaySettings(RelaySettingsUpdate): Promise<void>,
+  getRelayContraints(): Promise<RelaySettings>,
   connect(): Promise<void>,
   disconnect(): Promise<void>,
   shutdown(): Promise<void>,
@@ -125,17 +125,17 @@ export class RealIpc implements IpcFacade {
     return;
   }
 
-  updateRelayConstraints(relayConstraints: RelayConstraintsUpdate): Promise<void> {
-    return this._ipc.send('update_relay_constraints', [relayConstraints])
+  updateRelaySettings(relaySettings: RelaySettingsUpdate): Promise<void> {
+    return this._ipc.send('update_relay_settings', [relaySettings])
       .then(this._ignoreResponse);
   }
 
-  getRelayContraints(): Promise<RelayConstraints> {
-    return this._ipc.send('get_relay_constraints')
+  getRelayContraints(): Promise<RelaySettings> {
+    return this._ipc.send('get_relay_settings')
       .then( raw => {
         try {
-          const validated: any = validate(RelayConstraintsSchema, raw);
-          return (validated: RelayConstraints);
+          const validated: any = validate(RelaySettingsSchema, raw);
+          return (validated: RelaySettings);
         } catch (e) {
           throw new InvalidReply(raw, e);
         }
diff --git a/app/redux/settings/actions.js b/app/redux/settings/actions.js
index 6bb6b0ed71..4cc4910e01 100644
--- a/app/redux/settings/actions.js
+++ b/app/redux/settings/actions.js
@@ -1,15 +1,15 @@
 // @flow
 
-import type { RelayConstraints } from './reducers';
+import type { RelaySettings } from './reducers';
 
 export type UpdateRelayAction = {
   type: 'UPDATE_RELAY',
-  relay: RelayConstraints,
+  relay: RelaySettings,
 };
 
 export type SettingsAction = UpdateRelayAction;
 
-function updateRelay(relay: RelayConstraints): UpdateRelayAction {
+function updateRelay(relay: RelaySettings): UpdateRelayAction {
   return {
     type: 'UPDATE_RELAY',
     relay: relay,
diff --git a/app/redux/settings/reducers.js b/app/redux/settings/reducers.js
index e16f25a068..fbc2b388af 100644
--- a/app/redux/settings/reducers.js
+++ b/app/redux/settings/reducers.js
@@ -4,18 +4,18 @@ import { defaultServer } from '../../config';
 
 import type { ReduxAction } from '../store';
 
-export type RelayConstraints = {
+export type RelaySettings = {
     host: string,
     port: 'any' | number,
     protocol: 'any' | 'tcp' | 'udp',
 };
 
 export type SettingsReduxState = {
-  relayConstraints: RelayConstraints
+  relaySettings: RelaySettings
 };
 
 const initialState: SettingsReduxState = {
-  relayConstraints: {
+  relaySettings: {
     host: defaultServer,
     port: 'any',
     protocol: 'any',
@@ -26,8 +26,8 @@ export default function(state: SettingsReduxState = initialState, action: ReduxA
 
   if (action.type === 'UPDATE_RELAY') {
     return { ...state,
-      relayConstraints: {
-        ...state.relayConstraints,
+      relaySettings: {
+        ...state.relaySettings,
         ...action.relay,
       },
     };
diff --git a/test/components/Connect.spec.js b/test/components/Connect.spec.js
index 4b84b3b8da..9567ab9fb7 100644
--- a/test/components/Connect.spec.js
+++ b/test/components/Connect.spec.js
@@ -107,7 +107,7 @@ describe('components/Connect', () => {
 
     component.setProps({
       settings: {
-        relayConstraints: {
+        relaySettings: {
           host: 'se1.mullvad.net',
         },
       },
@@ -186,7 +186,7 @@ const defaultProps = {
 
   accountExpiry: '',
   settings: {
-    relayConstraints: {
+    relaySettings: {
       host: 'www.example.com',
       port: 'any',
       protocol: 'any',
diff --git a/test/components/SelectLocation.spec.js b/test/components/SelectLocation.spec.js
index 28c9299807..e182e74822 100644
--- a/test/components/SelectLocation.spec.js
+++ b/test/components/SelectLocation.spec.js
@@ -10,7 +10,7 @@ import type { SelectLocationProps } from '../../app/components/SelectLocation';
 
 describe('components/SelectLocation', () => {
   const state: SettingsReduxState = {
-    relayConstraints: {
+    relaySettings: {
       host: 'any',
       port: 'any',
       protocol: 'any',
diff --git a/test/components/Settings.spec.js b/test/components/Settings.spec.js
index 5d29aa0dd6..18c409ee70 100644
--- a/test/components/Settings.spec.js
+++ b/test/components/Settings.spec.js
@@ -35,7 +35,7 @@ describe('components/Settings', () => {
   };
 
   const settingsState: SettingsReduxState = {
-    relayConstraints: {
+    relaySettings: {
       host: 'any',
       port: 'any',
       protocol: 'any',
diff --git a/test/connect.spec.js b/test/connect.spec.js
index 586df45980..c3ad664b02 100644
--- a/test/connect.spec.js
+++ b/test/connect.spec.js
@@ -7,11 +7,11 @@ import { IpcChain } from './helpers/IpcChain';
 
 describe('connect', () => {
 
-  it('should invoke update_relay_constraints and then connect in the backend', (done) => {
+  it('should invoke update_relay_settings and then connect in the backend', (done) => {
     const { store, mockIpc, backend } = setupBackendAndStore();
 
     const chain = new IpcChain(mockIpc);
-    chain.require('updateRelayConstraints')
+    chain.require('updateRelaySettings')
       .withInputValidation(
         relayEndpoint => {
           if (relayEndpoint) {
diff --git a/test/mocks/ipc.js b/test/mocks/ipc.js
index db5d6e3d8c..ef6e58a984 100644
--- a/test/mocks/ipc.js
+++ b/test/mocks/ipc.js
@@ -28,7 +28,7 @@ export function newMockIpc() {
 
     setAccount: () => Promise.resolve(),
 
-    updateRelayConstraints: () => Promise.resolve(),
+    updateRelaySettings: () => Promise.resolve(),
 
     getRelayContraints: () => Promise.resolve({
       host: { only: 'www.example.com' },