backend: Remove useless version consts

As it is hardcoded in the implemented interfaces already
bilelmoussaoui · Aug 10, 2024 · e619487 · e619487
1 parent 0fef5ca
commit e619487
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 48 deletions.
diff --git a/src/backend/access.rs b/src/backend/access.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, num::NonZeroU32, sync::Arc};
+use std::{collections::HashMap, sync::Arc};
 
 use async_trait::async_trait;
 use futures_channel::{
@@ -23,8 +23,6 @@ use crate::{
 
 #[async_trait]
 pub trait AccessImpl {
-    const VERSION: NonZeroU32;
-
     async fn access_dialog(
         &self,
         app_id: AppID,
@@ -45,7 +43,7 @@ pub struct Access<T: AccessImpl + RequestImpl> {
 impl<T: AccessImpl + RequestImpl> Access<T> {
     pub async fn new(imp: T, backend: &Backend) -> zbus::Result<Self> {
         let (sender, receiver) = futures_channel::mpsc::unbounded();
-        let iface = AccessInterface::new(sender, T::VERSION);
+        let iface = AccessInterface::new(sender);
         backend.serve(iface).await?;
         let provider = Self {
             receiver: Arc::new(Mutex::new(receiver)),
@@ -114,14 +112,12 @@ enum Action {
 
 struct AccessInterface {
     sender: Arc<Mutex<Sender<Action>>>,
-    version: NonZeroU32,
 }
 
 impl AccessInterface {
-    pub fn new(sender: Sender<Action>, version: NonZeroU32) -> Self {
+    pub fn new(sender: Sender<Action>) -> Self {
         Self {
             sender: Arc::new(Mutex::new(sender)),
-            version,
         }
     }
 }
@@ -130,7 +126,7 @@ impl AccessInterface {
 impl AccessInterface {
     #[dbus_interface(property, name = "version")]
     fn version(&self) -> u32 {
-        self.version.into()
+        1 // TODO: Is this correct?
     }
 
     #[allow(clippy::too_many_arguments)]

diff --git a/src/backend/account.rs b/src/backend/account.rs
@@ -1,4 +1,4 @@
-use std::{num::NonZeroU32, sync::Arc};
+use std::sync::Arc;
 
 use async_trait::async_trait;
 use futures_channel::{
@@ -35,8 +35,6 @@ impl UserInformationOptions {
 
 #[async_trait]
 pub trait AccountImpl: RequestImpl {
-    const VERSION: NonZeroU32;
-
     async fn get_information(
         &self,
         app_id: AppID,
@@ -54,7 +52,7 @@ pub struct Account<T: AccountImpl + RequestImpl> {
 impl<T: AccountImpl + RequestImpl> Account<T> {
     pub async fn new(imp: T, backend: &Backend) -> zbus::Result<Self> {
         let (sender, receiver) = futures_channel::mpsc::unbounded();
-        let iface = AccountInterface::new(sender, T::VERSION);
+        let iface = AccountInterface::new(sender);
         backend.serve(iface).await?;
         let provider = Self {
             receiver: Arc::new(Mutex::new(receiver)),
@@ -112,14 +110,12 @@ enum Action {
 
 struct AccountInterface {
     sender: Arc<Mutex<Sender<Action>>>,
-    version: NonZeroU32,
 }
 
 impl AccountInterface {
-    pub fn new(sender: Sender<Action>, version: NonZeroU32) -> Self {
+    pub fn new(sender: Sender<Action>) -> Self {
         Self {
             sender: Arc::new(Mutex::new(sender)),
-            version,
         }
     }
 }
@@ -128,7 +124,7 @@ impl AccountInterface {
 impl AccountInterface {
     #[zbus(property, name = "version")]
     fn version(&self) -> u32 {
-        self.version.into()
+        1
     }
 
     #[zbus(name = "GetUserInformation")]

diff --git a/src/backend/screenshot.rs b/src/backend/screenshot.rs
@@ -1,4 +1,4 @@
-use std::{num::NonZeroU32, sync::Arc};
+use std::sync::Arc;
 
 use async_trait::async_trait;
 use futures_channel::{
@@ -49,8 +49,6 @@ pub struct ColorOptions;
 
 #[async_trait]
 pub trait ScreenshotImpl {
-    const VERSION: NonZeroU32;
-
     async fn screenshot(
         &self,
         app_id: AppID,
@@ -75,7 +73,7 @@ pub struct Screenshot<T: ScreenshotImpl + RequestImpl> {
 impl<T: ScreenshotImpl + RequestImpl> Screenshot<T> {
     pub async fn new(imp: T, backend: &Backend) -> zbus::Result<Self> {
         let (sender, receiver) = futures_channel::mpsc::unbounded();
-        let iface = ScreenshotInterface::new(sender, T::VERSION);
+        let iface = ScreenshotInterface::new(sender);
         backend.serve(iface).await?;
         let provider = Self {
             receiver: Arc::new(Mutex::new(receiver)),
@@ -169,14 +167,12 @@ enum Action {
 
 struct ScreenshotInterface {
     sender: Arc<Mutex<Sender<Action>>>,
-    version: NonZeroU32,
 }
 
 impl ScreenshotInterface {
-    pub fn new(sender: Sender<Action>, version: NonZeroU32) -> Self {
+    pub fn new(sender: Sender<Action>) -> Self {
         Self {
             sender: Arc::new(Mutex::new(sender)),
-            version,
         }
     }
 }
@@ -185,7 +181,7 @@ impl ScreenshotInterface {
 impl ScreenshotInterface {
     #[zbus(property, name = "version")]
     fn version(&self) -> u32 {
-        self.version.into()
+        2
     }
 
     #[zbus(name = "Screenshot")]

diff --git a/src/backend/secret.rs b/src/backend/secret.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, num::NonZeroU32, sync::Arc};
+use std::{collections::HashMap, sync::Arc};
 
 use async_trait::async_trait;
 use futures_channel::{
@@ -23,8 +23,6 @@ use crate::{
 
 #[async_trait]
 pub trait SecretImpl {
-    const VERSION: NonZeroU32;
-
     async fn retrieve(
         &self,
         app_id: AppID,
@@ -51,7 +49,7 @@ pub struct Secret<T: SecretImpl + RequestImpl> {
 impl<T: SecretImpl + RequestImpl> Secret<T> {
     pub async fn new(imp: T, backend: &Backend) -> zbus::Result<Self> {
         let (sender, receiver) = futures_channel::mpsc::unbounded();
-        let iface = SecretInterface::new(sender, T::VERSION);
+        let iface = SecretInterface::new(sender);
         backend.serve(iface).await?;
         let provider = Self {
             receiver: Arc::new(Mutex::new(receiver)),
@@ -96,22 +94,20 @@ impl<T: SecretImpl + RequestImpl> Secret<T> {
 
 struct SecretInterface {
     sender: Arc<Mutex<Sender<Action>>>,
-    version: NonZeroU32,
 }
 
 impl SecretInterface {
-    pub fn new(sender: Sender<Action>, version: NonZeroU32) -> Self {
+    pub fn new(sender: Sender<Action>) -> Self {
         Self {
             sender: Arc::new(Mutex::new(sender)),
-            version,
         }
     }
 }
 #[zbus::interface(name = "org.freedesktop.impl.portal.Secret")]
 impl SecretInterface {
     #[dbus_interface(property, name = "version")]
     fn version(&self) -> u32 {
-        self.version.into()
+        1
     }
 
     #[dbus_interface(out_args("response", "results"))]

diff --git a/src/backend/settings.rs b/src/backend/settings.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, num::NonZeroU32, sync::Arc};
+use std::{collections::HashMap, sync::Arc};
 
 use async_trait::async_trait;
 use futures_channel::{
@@ -12,8 +12,6 @@ use crate::{backend::Backend, desktop::settings::Namespace, zvariant::OwnedValue
 
 #[async_trait]
 pub trait SettingsImpl {
-    const VERSION: NonZeroU32;
-
     async fn read_all(&self, namespaces: Vec<String>) -> HashMap<String, Namespace>;
 
     async fn read(&self, namespace: &str, key: &str) -> OwnedValue;
@@ -27,7 +25,7 @@ pub struct Settings<T: SettingsImpl> {
 impl<T: SettingsImpl> Settings<T> {
     pub async fn new(imp: T, backend: &Backend) -> zbus::Result<Self> {
         let (sender, receiver) = futures_channel::mpsc::channel(10);
-        let iface = SettingsInterface::new(sender, T::VERSION);
+        let iface = SettingsInterface::new(sender);
         backend.serve(iface).await?;
         let provider = Self {
             receiver: Arc::new(Mutex::new(receiver)),
@@ -67,14 +65,12 @@ enum Action {
 
 struct SettingsInterface {
     sender: Arc<Mutex<Sender<Action>>>,
-    version: NonZeroU32,
 }
 
 impl SettingsInterface {
-    pub fn new(sender: Sender<Action>, version: NonZeroU32) -> Self {
+    pub fn new(sender: Sender<Action>) -> Self {
         Self {
             sender: Arc::new(Mutex::new(sender)),
-            version,
         }
     }
 }
@@ -83,7 +79,7 @@ impl SettingsInterface {
 impl SettingsInterface {
     #[zbus(property, name = "version")]
     fn version(&self) -> u32 {
-        self.version.into()
+        2
     }
 
     async fn read_all(&self, namespaces: Vec<String>) -> HashMap<String, Namespace> {

diff --git a/src/backend/wallpaper.rs b/src/backend/wallpaper.rs
@@ -1,4 +1,4 @@
-use std::{num::NonZeroU32, sync::Arc};
+use std::sync::Arc;
 
 use async_trait::async_trait;
 use futures_channel::{
@@ -45,8 +45,6 @@ impl WallpaperOptions {
 
 #[async_trait]
 pub trait WallpaperImpl {
-    const VERSION: NonZeroU32;
-
     async fn with_uri(
         &self,
         app_id: AppID,
@@ -65,7 +63,7 @@ pub struct Wallpaper<T: WallpaperImpl + RequestImpl> {
 impl<T: WallpaperImpl + RequestImpl> Wallpaper<T> {
     pub async fn new(imp: T, backend: &Backend) -> zbus::Result<Self> {
         let (sender, receiver) = futures_channel::mpsc::unbounded();
-        let iface = WallpaperInterface::new(sender, T::VERSION);
+        let iface = WallpaperInterface::new(sender);
         backend.serve(iface).await?;
         let provider = Self {
             receiver: Arc::new(Mutex::new(receiver)),
@@ -122,14 +120,12 @@ enum Action {
 
 struct WallpaperInterface {
     sender: Arc<Mutex<Sender<Action>>>,
-    version: NonZeroU32,
 }
 
 impl WallpaperInterface {
-    pub fn new(sender: Sender<Action>, version: NonZeroU32) -> Self {
+    pub fn new(sender: Sender<Action>) -> Self {
         Self {
             sender: Arc::new(Mutex::new(sender)),
-            version,
         }
     }
 }
@@ -138,7 +134,7 @@ impl WallpaperInterface {
 impl WallpaperInterface {
     #[zbus(property, name = "version")]
     fn version(&self) -> u32 {
-        self.version.into()
+        1
     }
 
     #[zbus(name = "SetWallpaperURI")]