fixed small bug where a clients batch could not be set to none

build/includes/summa_actor/client/client.hpp

@@ -25,7 +25,7 @@ class Client {
         // ####################################################################
         //                              Setters
         // ####################################################################
-        void setBatch(Batch batch);
+        void setBatch(std::optional<Batch> batch);
         // ####################################################################
         //                              Methods
         // ####################################################################

build/includes/summa_actor/client/client_container.hpp

@@ -25,7 +25,7 @@ class Client_Container {
         //                              Setters
         // ####################################################################
         
-        void setBatchForClient(caf::actor client_ref, Batch batch);
+        void setBatchForClient(caf::actor client_ref, std::optional<Batch> batch);
         
         // ####################################################################
         //                              Methods

build/source/actors/summa_actor/client/client.cpp

@@ -29,7 +29,7 @@ std::optional<Batch> Client::getBatch() {
 // ####################################################################
 //                              Setters
 // ####################################################################
-void Client::setBatch(Batch batch) {
+void Client::setBatch(std::optional<Batch> batch) {
     this->current_batch = batch;
 }
 

build/source/actors/summa_actor/client/client_container.cpp

@@ -29,10 +29,14 @@ std::optional<Client> Client_Container::getClient(caf::actor_addr client_ref) {
 //                              Setters
 // ####################################################################
 
-void Client_Container::setBatchForClient(caf::actor client_ref, Batch batch) {
+void Client_Container::setBatchForClient(caf::actor client_ref, std::optional<Batch> batch) {
     for(auto client = begin(this->client_list); client != end(this->client_list); ++client) {
         if (client_ref == client->getActor()) {
-            client->setBatch(batch);
+            if (batch.has_value()) {
+                client->setBatch(batch.value());
+            } else {
+                client->setBatch({});
+            }
             break;
         }
     }

build/source/actors/summa_actor/summa_server.cpp

@@ -17,6 +17,7 @@ behavior summa_server_init(stateful_actor<summa_server_state>* self, Distributed
             self->state.client_container.removeClient(client.value());
             notifyBackupServersOfRemovedClient(self, client.value());
             checkForIdleClients(self);
+
         } else {
             aout(self) << "Lost Backup Server\n";
             findAndRemoveLostBackupServer(self, dm.source);
@@ -79,7 +80,7 @@ behavior summa_server(stateful_actor<summa_server_state>* self) {
                 
                 std::optional<Batch> batch = self->state.batch_container.getUnsolvedBatch();
                 if (batch.has_value()) {
-                    self->state.client_container.setBatchForClient(client_actor, batch.value());
+                    self->state.client_container.setBatchForClient(client_actor, batch);
                     aout(self) << "SENDING: " << batch.value().toString() << "\n";
                     self->send(client_actor, batch.value());
                     for (auto& backup_server : self->state.backup_servers_list) {
@@ -120,7 +121,7 @@ behavior summa_server(stateful_actor<summa_server_state>* self) {
             
             if (new_batch.has_value()) {
                 // send clients new batch and update backup servers
-                self->state.client_container.setBatchForClient(client_actor, new_batch.value());
+                self->state.client_container.setBatchForClient(client_actor, new_batch);
                 self->send(client_actor, new_batch.value());
                 for (auto& backup_server : self->state.backup_servers_list) {
                     caf::actor backup_server_actor = std::get<0>(backup_server);
@@ -209,12 +210,15 @@ void findAndRemoveLostBackupServer(stateful_actor<summa_server_state>* self, act
 }
 
 void checkForIdleClients(stateful_actor<summa_server_state>* self) {
+    aout(self) << "Looking for an idle Client\n";
     std::optional<Client> client = self->state.client_container.getIdleClient();
     if (client.has_value()) {
+        aout(self) << "Found an idle Client\n";
         std::optional<Batch> new_batch = self->state.batch_container.getUnsolvedBatch();
         if (new_batch.has_value()) {
             // send clients new batch and update backup servers
-            self->state.client_container.setBatchForClient(client.value().getActor(), new_batch.value());
+            aout(self) << "Found a batch to assign\n";
+            self->state.client_container.setBatchForClient(client.value().getActor(), new_batch);
             self->send(client.value().getActor(), new_batch.value());
             for (auto& backup_server : self->state.backup_servers_list) {
                 caf::actor backup_server_actor = std::get<0>(backup_server);