diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-09-01 13:58:33 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-09-01 13:58:33 +0200 |
| commit | be42b66a39ea97653414b32443cd49e858846bde (patch) | |
| tree | f2d286b1cda1af5825e54990eb31de2442bc6575 | |
| parent | da5205bb189c74d2d15200cba0164c9dba484812 (diff) | |
| parent | 3b528ccafdb0e75f941f83fc0b6ae451a7826d2a (diff) | |
| download | mullvadvpn-be42b66a39ea97653414b32443cd49e858846bde.tar.xz mullvadvpn-be42b66a39ea97653414b32443cd49e858846bde.zip | |
Merge branch 'remove-unused-api-constant'
| -rw-r--r-- | mullvad-jni/src/lib.rs | 4 | ||||
| -rw-r--r-- | mullvad-rpc/src/lib.rs | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index bface5c2ca..78cee57d1e 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -92,8 +92,8 @@ impl From<Result<VoucherSubmission, daemon_interface::Error>> for VoucherSubmiss Ok(submission) => VoucherSubmissionResult::Ok(submission), Err(daemon_interface::Error::RpcError(RestError::ApiError(_, code))) => { match code.as_str() { - "INVALID_VOUCHER" => VoucherSubmissionResult::InvalidVoucher, - "VOUCHER_USED" => VoucherSubmissionResult::VoucherAlreadyUsed, + mullvad_rpc::INVALID_VOUCHER => VoucherSubmissionResult::InvalidVoucher, + mullvad_rpc::VOUCHER_USED => VoucherSubmissionResult::VoucherAlreadyUsed, _ => VoucherSubmissionResult::RpcError, } } diff --git a/mullvad-rpc/src/lib.rs b/mullvad-rpc/src/lib.rs index 793a0f241c..796cb56553 100644 --- a/mullvad-rpc/src/lib.rs +++ b/mullvad-rpc/src/lib.rs @@ -29,6 +29,11 @@ mod relay_list; pub use hyper::StatusCode; pub use relay_list::RelayListProxy; +/// Error code returned by the Mullvad API if the voucher has alreaby been used. +pub const VOUCHER_USED: &str = "VOUCHER_USED"; + +/// Error code returned by the Mullvad API if the voucher code is invalid. +pub const INVALID_VOUCHER: &str = "INVALID_VOUCHER"; const API_HOST: &str = "api.mullvad.net"; pub const API_IP_CACHE_FILENAME: &str = "api-ip-address.txt"; @@ -124,9 +129,6 @@ struct AccountResponse { token: AccountToken, expires: DateTime<Utc>, } -pub const VOUCHER_USED: &str = "VOUCHER_USED"; -pub const INVALID_VOUCHER: &str = "INVALID_VOUCHER"; -pub const MISSING_ARGUMENT: &str = "MISSING_ARGUMENT"; impl AccountsProxy { pub fn new(handle: rest::MullvadRestHandle) -> Self { |