Merge branch 'pilip/remove-revocation' into 'master'

Pilip/remove revocation

See merge request TankerHQ/sdk-rust!93

Author: blastrock

src/core.rs

@@ -58,13 +58,15 @@ impl Core {
     /// The current device's ID.
     ///
     /// The Tanker status must be `Ready`.
+    #[deprecated(since = "2.27.0")]
     pub fn device_id(&self) -> Result<String, Error> {
         unsafe { block_on(CTankerLib::get().device_id(self.ctanker)) }
     }
 
     /// The user's devices list.
     ///
     /// The Tanker status must be `Ready`.
+    #[deprecated(since = "2.27.0")]
     pub async fn device_list(&self) -> Result<Vec<Device>, Error> {
         unsafe { CTankerLib::get().device_list(self.ctanker).await }
     }
@@ -336,18 +338,6 @@ impl Core {
         }
     }
 
-    /// Revokes one of the user's devices.
-    ///
-    /// The Tanker status must be `Ready`.
-    #[deprecated(since = "2.8.0")]
-    pub async fn revoke_device(&self, device_id: &str) -> Result<(), Error> {
-        unsafe {
-            CTankerLib::get()
-                .revoke_device(self.ctanker, device_id)
-                .await
-        }
-    }
-
     /// Create an encryption session that will allow performing multiple encryption operations with a reduced number of keys.
     ///
     /// # Arguments

src/ctanker.rs

@@ -528,27 +528,6 @@ impl CTankerLib {
         fut.await
     }
 
-    pub async unsafe fn revoke_device(
-        &self,
-        ctanker: CTankerPtr,
-        device_id: &str,
-    ) -> Result<(), Error> {
-        let cdevice_id = CString::new(device_id).map_err(|_| {
-            Error::new(
-                ErrorCode::InvalidArgument,
-                "device_id is not a valid CString".into(),
-            )
-        })?;
-
-        let fut = unsafe {
-            CFuture::new(tanker_call!(
-                self,
-                tanker_revoke_device(ctanker.0, cdevice_id.as_ptr(),)
-            ))
-        };
-        fut.await
-    }
-
     pub async unsafe fn encryption_session_open(
         &self,
         ctanker: CTankerPtr,

tests/tanker_tests.rs

@@ -59,28 +59,18 @@ async fn start_stop_session() -> Result<(), Error> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn self_revoke() -> Result<(), Error> {
-    let app = TestApp::get().await;
-    let tanker = app.start_anonymous(&app.create_identity(None)).await?;
-
-    #[allow(deprecated)]
-    tanker.revoke_device(&tanker.device_id()?).await?;
-    let err = tanker.encrypt(b"F", &Default::default()).await.unwrap_err();
-    assert_eq!(err.code(), ErrorCode::DeviceRevoked);
-
-    tanker.stop().await
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn has_correct_device_list() -> Result<(), Error> {
     let app = TestApp::get().await;
     let tanker = app.start_anonymous(&app.create_identity(None)).await?;
 
+    #[allow(deprecated)]
     let list = tanker.device_list().await?;
     assert_eq!(list.len(), 1);
     assert!(!list[0].revoked);
-    assert_eq!(list[0].id, tanker.device_id().unwrap());
+    #[allow(deprecated)]
+    let device_id = tanker.device_id().unwrap();
+    assert_eq!(list[0].id, device_id);
 
     tanker.stop().await
 }