Refactor away the return val of setConfiguration

Signed-off-by: Mr-Kanister <[email protected]>
amosproj · Dec 6, 2024 · 0416cb3 · 0416cb3
1 parent f69dbbb
commit 0416cb3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 21 deletions.
diff --git a/frontend/client/src/main/java/de/amosproj3/ziofa/client/Client.kt b/frontend/client/src/main/java/de/amosproj3/ziofa/client/Client.kt
@@ -70,7 +70,7 @@ interface Client {
 
     suspend fun getConfiguration(): Configuration
 
-    suspend fun setConfiguration(configuration: Configuration): UInt
+    suspend fun setConfiguration(configuration: Configuration)
 
     suspend fun getOdexFiles(pid: UInt): Flow<String>
 

diff --git a/frontend/client/src/mock/java/de/amosproj3/ziofa/client/RustClient.kt b/frontend/client/src/mock/java/de/amosproj3/ziofa/client/RustClient.kt
@@ -77,10 +77,8 @@ object RustClient : Client {
         return configuration
     }
 
-    override suspend fun setConfiguration(configuration: Configuration): UInt {
+    override suspend fun setConfiguration(configuration: Configuration) {
         this.configuration = configuration
-
-        return 0u
     }
 
     override suspend fun initStream(): Flow<Event> = flow {

diff --git a/frontend/client/src/real/java/de.amosproj3.ziofa.client/RustClient.kt b/frontend/client/src/real/java/de.amosproj3.ziofa.client/RustClient.kt
@@ -104,7 +104,7 @@ class RustClient(private val inner: uniffi.client.Client) : Client {
 
     override suspend fun getConfiguration(): Configuration = inner.getConfiguration().into()
 
-    override suspend fun setConfiguration(configuration: Configuration): UInt =
+    override suspend fun setConfiguration(configuration: Configuration) =
         inner.setConfiguration(configuration.into())
 
     override suspend fun getOdexFiles(pid: UInt): Flow<String> =

diff --git a/rust/backend/daemon/src/server.rs b/rust/backend/daemon/src/server.rs
@@ -93,7 +93,7 @@ impl Ziofa for ZiofaImpl {
     async fn set_configuration(
         &self,
         request: Request<Configuration>,
-    ) -> Result<Response<SetConfigurationResponse>, Status> {
+    ) -> Result<Response<()>, Status> {
         let config = request.into_inner();
 
         // TODO: Implement function 'validate'
@@ -109,7 +109,7 @@ impl Ziofa for ZiofaImpl {
             .update_from_config(ebpf_guard.deref_mut(), &config)
             .map_err(EbpfErrorWrapper::from)?;
 
-        Ok(Response::new(SetConfigurationResponse { response_type: 0 }))
+        Ok(Response::new(()))
     }
 
     type InitStreamStream = Receiver<Result<Event, Status>>;

diff --git a/rust/client/src/bindings.rs b/rust/client/src/bindings.rs
@@ -137,7 +137,7 @@ impl Client {
         Ok(self.0.lock().await.get_configuration().await?)
     }
 
-    pub async fn set_configuration(&self, configuration: Configuration) -> Result<u32> {
+    pub async fn set_configuration(&self, configuration: Configuration) -> Result<()> {
         Ok(self.0.lock().await.set_configuration(configuration).await?)
     }
 

diff --git a/rust/client/src/client.rs b/rust/client/src/client.rs
@@ -101,13 +101,9 @@ impl Client {
         Ok(self.ziofa.get_configuration(()).await?.into_inner())
     }
 
-    pub async fn set_configuration(&mut self, configuration: Configuration) -> Result<u32> {
-        Ok(self
-            .ziofa
-            .set_configuration(configuration)
-            .await?
-            .into_inner()
-            .response_type)
+    pub async fn set_configuration(&mut self, configuration: Configuration) -> Result<()> {
+        self.ziofa.set_configuration(configuration).await?;
+        Ok(())
     }
 
     pub async fn init_stream(&mut self) -> Result<impl Stream<Item = Result<Event>>> {

diff --git a/rust/shared/proto/ziofa.proto b/rust/shared/proto/ziofa.proto
@@ -15,8 +15,8 @@ service Ziofa {
     rpc CheckServer(google.protobuf.Empty) returns (CheckServerResponse) {}
     rpc ListProcesses(google.protobuf.Empty) returns (ProcessList) {}
 
-    rpc GetConfiguration(google.protobuf.Empty) returns (config.Configuration){}
-    rpc SetConfiguration(config.Configuration) returns (SetConfigurationResponse){}
+    rpc GetConfiguration(google.protobuf.Empty) returns (config.Configuration) {}
+    rpc SetConfiguration(config.Configuration) returns (google.protobuf.Empty) {}
 
     rpc InitStream(google.protobuf.Empty) returns (stream Event) {}      // all Responses genereated by the ebpf-programms are send via this stream
 
@@ -64,10 +64,6 @@ message CmdlineData {
     repeated string args = 1;
 }
 
-message SetConfigurationResponse{
-    uint32 response_type = 1;
-}
-
 message Event {
     oneof event_data {
         VfsWriteEvent vfs_write = 1;