diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-09-06 11:34:19 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-09-13 15:57:37 +0200 |
| commit | 05b3e986871d5352a7031eb9a5c486e2eeaf0a31 (patch) | |
| tree | 0d633d49f605dca1c7ff34dcacd5421f811f1654 | |
| parent | b2f08932f097081446a56c59305246367b62a6c7 (diff) | |
| download | mullvadvpn-05b3e986871d5352a7031eb9a5c486e2eeaf0a31.tar.xz mullvadvpn-05b3e986871d5352a7031eb9a5c486e2eeaf0a31.zip | |
Give invalidate_current_data a more specific name
| -rw-r--r-- | mullvad-daemon/src/device/mod.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mullvad-daemon/src/device/mod.rs b/mullvad-daemon/src/device/mod.rs index 1eb5614f82..22495bce9f 100644 --- a/mullvad-daemon/src/device/mod.rs +++ b/mullvad-daemon/src/device/mod.rs @@ -607,10 +607,10 @@ impl AccountManager { Self::drain_requests(&mut self.expiry_requests, || Ok(expiry)); } Err(Error::InvalidAccount) => { - self.invalidate_current_data(|| Error::InvalidAccount).await; + self.revoke_device(|| Error::InvalidAccount).await; } Err(Error::InvalidDevice) => { - self.invalidate_current_data(|| Error::InvalidDevice).await; + self.revoke_device(|| Error::InvalidDevice).await; } Err(err) => { log::error!("Failed to check account expiry: {}", err); @@ -665,10 +665,10 @@ impl AccountManager { } } Err(Error::InvalidAccount) => { - self.invalidate_current_data(|| Error::InvalidAccount).await; + self.revoke_device(|| Error::InvalidAccount).await; } Err(Error::InvalidDevice) => { - self.invalidate_current_data(|| Error::InvalidDevice).await; + self.revoke_device(|| Error::InvalidDevice).await; } Err(err) => { log::error!("Failed to validate device: {}", err); @@ -713,10 +713,10 @@ impl AccountManager { } } Err(Error::InvalidAccount) => { - self.invalidate_current_data(|| Error::InvalidAccount).await; + self.revoke_device(|| Error::InvalidAccount).await; } Err(Error::InvalidDevice) => { - self.invalidate_current_data(|| Error::InvalidDevice).await; + self.revoke_device(|| Error::InvalidDevice).await; } Err(err) => { self.drain_device_requests_with_err(err); @@ -758,7 +758,7 @@ impl AccountManager { }) } - async fn invalidate_current_data(&mut self, err_constructor: impl Fn() -> Error) { + async fn revoke_device(&mut self, err_constructor: impl Fn() -> Error) { log::debug!("Invalidating the current device"); if let Err(err) = self.cacher.write(&PrivateDeviceState::Revoked).await { |